SOURCES: blt-DESTDIR.patch, blt-acfix.patch, blt-excl.patch, blt-n...
bszx
bszx at pld-linux.org
Sat Jul 23 20:51:15 CEST 2005
Author: bszx Date: Sat Jul 23 18:51:15 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated to 2.4z
---- Files affected:
SOURCES:
blt-DESTDIR.patch (1.2 -> 1.3) , blt-acfix.patch (1.1 -> 1.2) , blt-excl.patch (1.1 -> 1.2) , blt-nolibnsl.patch (1.1 -> 1.2) , blt-norpath.patch (1.1 -> 1.2) , blt-tcltk84.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/blt-DESTDIR.patch
diff -u SOURCES/blt-DESTDIR.patch:1.2 SOURCES/blt-DESTDIR.patch:1.3
--- SOURCES/blt-DESTDIR.patch:1.2 Fri Jan 5 08:59:49 2001
+++ SOURCES/blt-DESTDIR.patch Sat Jul 23 20:51:10 2005
@@ -1,191 +1,28 @@
-diff -Nru blt2.4u/Makefile.in blt2.4u.new/Makefile.in
---- blt2.4u/Makefile.in Thu May 18 02:00:14 2000
-+++ blt2.4u.new/Makefile.in Fri Jan 5 08:48:53 2001
-@@ -45,16 +45,14 @@
-
- install-dirs:
- @for i in $(instdirs) ; do \
-- if test ! -d $$i ; then \
-- echo " mkdir $$i" ; \
-- mkdir $$i ; \
-- fi ; \
-+ echo " mkdir -p $(DESTDIR)$$i" ; \
-+ mkdir -p $(DESTDIR)$$i ; \
- done
-
- install-readme:
-- $(INSTALL_DATA) $(srcdir)/README $(scriptdir)
-- $(INSTALL_DATA) $(srcdir)/PROBLEMS $(scriptdir)
-- $(INSTALL_DATA) $(srcdir)/NEWS $(scriptdir)
-+ $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(scriptdir)
-+ $(INSTALL_DATA) $(srcdir)/PROBLEMS $(DESTDIR)$(scriptdir)
-+ $(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(scriptdir)
-
- clean:
- (cd src; $(MAKE) clean)
-diff -Nru blt2.4u/demos/Makefile.in blt2.4u.new/demos/Makefile.in
---- blt2.4u/demos/Makefile.in Fri Jun 23 02:40:05 2000
-+++ blt2.4u.new/demos/Makefile.in Fri Jan 5 08:46:46 2001
-@@ -46,31 +46,31 @@
-
- inst-scripts:
- for i in $(srcdir)/scripts/*.tcl ; do \
-- $(INSTALL) $$i $(destdir)/scripts ; \
-+ $(INSTALL) $$i $(DESTDIR)$(destdir)/scripts ; \
- done
- for i in $(demos) ; do \
-- $(INSTALL) $(srcdir)/$$i $(destdir)/$$i ; \
-+ $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(destdir)/$$i ; \
- done
-
- inst-bitmaps:
- for i in $(srcdir)/bitmaps/*.xbm ; do \
-- $(INSTALL_DATA) $$i $(destdir)/bitmaps ; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(destdir)/bitmaps ; \
- done
- for i in $(srcdir)/bitmaps/hand/*.xbm ; do \
-- $(INSTALL_DATA) $$i $(destdir)/bitmaps/hand ; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(destdir)/bitmaps/hand ; \
- done
- for i in $(srcdir)/bitmaps/fish/*.xbm ; do \
-- $(INSTALL_DATA) $$i $(destdir)/bitmaps/fish ; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(destdir)/bitmaps/fish ; \
- done
-
- inst-images:
- for i in $(srcdir)/images/*.gif $(srcdir)/images/*.ps ; do \
-- $(INSTALL_DATA) $$i $(destdir)/images ; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(destdir)/images ; \
- done
-
- inst-dirs:
- @for i in $(instdirs) ; do \
-- if test -d "$$i" ; then : ; else mkdir "$$i" ; fi ; \
-+ mkdir -p "$(DESTDIR)$$i" ; \
- done
-
- clean:
-diff -Nru blt2.4u/library/Makefile.in blt2.4u.new/library/Makefile.in
---- blt2.4u/library/Makefile.in Fri May 5 06:49:36 2000
-+++ blt2.4u.new/library/Makefile.in Fri Jan 5 08:47:13 2001
-@@ -32,21 +32,21 @@
+diff -uNdr blt2.4z-old/Makefile.in blt2.4z/Makefile.in
+--- blt2.4z-old/Makefile.in 2002-02-19 01:11:43.000000000 +0100
++++ blt2.4z/Makefile.in 2005-07-23 19:30:59.000000000 +0200
+@@ -47,9 +47,9 @@
+ (cd library; $(MAKE) install)
+ (cd man; $(MAKE) install)
+ (cd demos; $(MAKE) install)
+- $(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir)
+- $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir)
+- $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir)
++ $(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir)
++ $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir)
++ $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir)
mkdirs:
@for i in $(instdirs) ; do \
-- if test -d $$i ; then : ; else mkdir $$i ; fi ; \
-+ mkdir -p $(DESTDIR)$$i ; \
- done
-
- dragdrop: mkdirs
- for i in $(ddFiles) ; do \
-- $(INSTALL_DATA) $(srcdir)/dd_protocols/$$i $(scriptdir)/dd_protocols ; \
-+ $(INSTALL_DATA) $(srcdir)/dd_protocols/$$i $(DESTDIR)$(scriptdir)/dd_protocols ; \
- done
-
- files: mkdirs
+diff -uNdr blt2.4z-old/library/Makefile.in blt2.4z/library/Makefile.in
+--- blt2.4z-old/library/Makefile.in 2002-07-15 01:33:24.000000000 +0200
++++ blt2.4z/library/Makefile.in 2005-07-23 19:32:16.000000000 +0200
+@@ -58,7 +58,7 @@
for i in $(miscFiles) ; do \
-- $(INSTALL_DATA) $(srcdir)/$$i $(scriptdir) ; \
-+ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(scriptdir) ; \
+ $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
done
-
- package: mkdirs pkgIndex.tcl
- $(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
-+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(scriptdir)
-
- pkgIndex:
- rm -f pkgIndex.tcl
-diff -Nru blt2.4u/man/Makefile.in blt2.4u.new/man/Makefile.in
---- blt2.4u/man/Makefile.in Tue Feb 8 22:40:26 2000
-+++ blt2.4u.new/man/Makefile.in Fri Jan 5 08:47:44 2001
-@@ -28,14 +28,12 @@
-
- install-manuals: $(MANPAGES)
- for i in *.n ; do \
-- $(INSTALL_DATA) $$i $(sectiondir); \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(sectiondir); \
- done
-
- install-dirs:
- @for i in $(instdirs) ; do \
-- if test ! -d $$i ; then \
-- mkdir $$i ; \
-- fi ; \
-+ mkdir -p $(DESTDIR)$$i ; \
- done
-
- .SUFFIXES: .n .man
-diff -Nru blt2.4u/src/Makefile.in blt2.4u.new/src/Makefile.in
---- blt2.4u/src/Makefile.in Fri May 5 06:49:36 2000
-+++ blt2.4u.new/src/Makefile.in Fri Jan 5 08:48:09 2001
-@@ -143,30 +143,28 @@
- install: install_dirs install_lib install_demo install_headers
-
- install_demo: $(bltwish) $(bltsh)
-- $(INSTALL) -m 0755 $(bltwish) $(bindir)
-- $(INSTALL) -m 0755 $(bltsh) $(bindir)
-+ $(INSTALL) -m 0755 $(bltwish) $(DESTDIR)$(bindir)
-+ $(INSTALL) -m 0755 $(bltsh) $(DESTDIR)$(bindir)
-
- install_lib: $(lib_a)
-- $(INSTALL_DATA) $(lib_a) $(libdir)/$(libvers_a)
-- (cd $(libdir); $(RM) $(lib_a) ; $(LN_S) $(libvers_a) $(lib_a))
-- $(RANLIB) $(libdir)/$(libvers_a)
-- $(INSTALL_DATA) $(tcl_only_lib_a) $(libdir)/$(tcl_only_libvers_a)
-- (cd $(libdir); $(RM) $(tcl_only_lib_a) ; $(LN_S) $(tcl_only_libvers_a) $(tcl_only_lib_a))
-- $(RANLIB) $(libdir)/$(tcl_only_libvers_a)
-+ $(INSTALL_DATA) $(lib_a) $(DESTDIR)$(libdir)/$(libvers_a)
-+ (cd $(DESTDIR)$(libdir); $(RM) $(lib_a) ; $(LN_S) $(libvers_a) $(lib_a))
-+ $(RANLIB) $(DESTDIR)$(libdir)/$(libvers_a)
-+ $(INSTALL_DATA) $(tcl_only_lib_a) $(DESTDIR)$(libdir)/$(tcl_only_libvers_a)
-+ (cd $(DESTDIR)$(libdir); $(RM) $(tcl_only_lib_a) ; $(LN_S) $(tcl_only_libvers_a) $(tcl_only_lib_a))
-+ $(RANLIB) $(DESTDIR)$(libdir)/$(tcl_only_libvers_a)
- (cd shared; $(MAKE) install)
++ $(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir)
- install_dirs:
- @for i in $(instdirs) ; do \
-- if test ! -d $$i ; then \
-- echo " mkdir $$i" ; \
-- mkdir $$i ; \
-- fi ; \
-+ echo " mkdir -p $(DESTDIR)$$i" ; \
-+ mkdir -p $(DESTDIR)$$i ; \
- done
-
- install_headers:
- @for i in $(headers) ; do \
-- echo "installing $(incdir)/$$i..." ; \
-- $(INSTALL_DATA) -m 0444 $(srcdir)/$$i $(incdir) ; \
-+ echo "installing $(DESTDIR)$(incdir)/$$i..." ; \
-+ $(INSTALL_DATA) -m 0444 $(srcdir)/$$i $(DESTDIR)$(incdir) ; \
- done
-
- lint:
-diff -Nru blt2.4u/src/shared/Makefile.in blt2.4u.new/src/shared/Makefile.in
---- blt2.4u/src/shared/Makefile.in Fri Jun 23 02:40:06 2000
-+++ blt2.4u.new/src/shared/Makefile.in Fri Jan 5 08:48:30 2001
-@@ -124,19 +124,17 @@
- install: install_dirs install_lib install_demo
-
- install_demo: $(bltwish)
-- $(INSTALL) -m 0755 bltwish$(version) $(bindir)
-- $(INSTALL) -m 0755 bltsh$(version) $(bindir)
-+ $(INSTALL) -m 0755 bltwish$(version) $(DESTDIR)$(bindir)
-+ $(INSTALL) -m 0755 bltsh$(version) $(DESTDIR)$(bindir)
-
- install_lib: $(lib_so)
-- $(INSTALL) -m 0755 $(lib_so) $(libdir)
-- $(INSTALL) -m 0755 $(tcl_only_lib_so) $(libdir)
-+ $(INSTALL) -m 0755 $(lib_so) $(DESTDIR)$(libdir)
-+ $(INSTALL) -m 0755 $(tcl_only_lib_so) $(DESTDIR)$(libdir)
-
- install_dirs:
+ mkdirs:
@for i in $(instdirs) ; do \
-- if test ! -d $$i ; then \
-- echo " mkdir $$i" ; \
-- mkdir $$i ; \
-- fi ; \
-+ echo " mkdir $(DESTDIR)$$i" ; \
-+ mkdir -p $(DESTDIR)$$i ; \
- done
-
- clean:
================================================================
Index: SOURCES/blt-acfix.patch
diff -u SOURCES/blt-acfix.patch:1.1 SOURCES/blt-acfix.patch:1.2
--- SOURCES/blt-acfix.patch:1.1 Wed Mar 5 00:31:23 2003
+++ SOURCES/blt-acfix.patch Sat Jul 23 20:51:10 2005
@@ -11,9 +11,9 @@
[$2]
EOF
eval $ac_link
---- blt2.4u/configure.in.orig Fri Jun 23 02:40:05 2000
-+++ blt2.4u/configure.in Tue Mar 4 20:32:04 2003
-@@ -58,6 +58,9 @@
+--- blt2.4z/configure.in.orig 2002-10-04 07:33:23.000000000 +0200
++++ blt2.4z/configure.in 2005-07-23 19:08:32.000000000 +0200
+@@ -65,6 +65,9 @@
AC_ARG_WITH(gnu_ld, [ --with-gnu-ld Use GNU linker],
blt_with_gnu_ld="yes")
@@ -21,9 +21,9 @@
+AC_PROG_CPP
+AC_PROG_EGREP
AC_CANONICAL_SYSTEM
+ AC_PREFIX_PROGRAM(wish)
- # -----------------------------------------------------------------------
-@@ -87,29 +90,9 @@
+@@ -95,24 +98,6 @@
# 4. default to cc
#
@@ -44,12 +44,20 @@
-if test "x${CC}" = "x" ; then
- CC=cc
-fi
--AC_MSG_RESULT([$CC])
+-
+ case $target in
+ *-*-cygwin*|*-*-mingw*)
+ if test "${blt_enable_cygwin}" = "no" ; then
+@@ -121,12 +106,8 @@
+ ;;
+ esac
+-AC_MSG_RESULT([$CC])
+-
unset blt_cv_prog_cc
AC_CACHE_VAL(blt_cv_prog_cc, blt_cv_prog_cc=$CC)
-AC_SUBST(CC)
-AC_PROG_CPP
if test "x${GCC}" != "x" ; then
- BLT_HAVE_GCC="yes"
+ blt_have_gcc="yes"
else
================================================================
Index: SOURCES/blt-excl.patch
diff -u SOURCES/blt-excl.patch:1.1 SOURCES/blt-excl.patch:1.2
--- SOURCES/blt-excl.patch:1.1 Fri Jan 5 09:00:23 2001
+++ SOURCES/blt-excl.patch Sat Jul 23 20:51:10 2005
@@ -17,7 +17,7 @@
int fd;
size_t length = (contents == NULL) ? 0 : strlen(contents);
-- tmpnam(fileName);
+- mkstemp(fileName);
- fd = OpenFile(fileName, O_RDWR | O_CREAT | O_TRUNC);
+ strcpy(fileName, "/tmp/bltXXXXXX");
+ fd = mkstemp(fileName);
================================================================
Index: SOURCES/blt-nolibnsl.patch
diff -u SOURCES/blt-nolibnsl.patch:1.1 SOURCES/blt-nolibnsl.patch:1.2
--- SOURCES/blt-nolibnsl.patch:1.1 Wed Mar 5 00:31:23 2003
+++ SOURCES/blt-nolibnsl.patch Sat Jul 23 20:51:10 2005
@@ -1,17 +1,11 @@
---- blt2.4u/configure.in.orig Tue Mar 4 20:32:04 2003
-+++ blt2.4u/configure.in Tue Mar 4 20:51:14 2003
-@@ -795,14 +795,12 @@
- # -lsocket
+--- blt2.4z/configure.in.orig 2005-07-23 19:10:46.000000000 +0200
++++ blt2.4z/configure.in 2005-07-23 19:12:48.000000000 +0200
+@@ -188,8 +188,6 @@
+ # Libraries: Check for libraries used
#
# -----------------------------------------------------------------------
-AC_CHECK_LIB(socket, main)
-
- # -----------------------------------------------------------------------
- #
- # -lnsl
- #
- # -----------------------------------------------------------------------
-AC_CHECK_LIB(nsl, main)
-
+ AC_CHECK_LIB(m, main)
# -----------------------------------------------------------------------
- #
+ #
================================================================
Index: SOURCES/blt-norpath.patch
diff -u SOURCES/blt-norpath.patch:1.1 SOURCES/blt-norpath.patch:1.2
--- SOURCES/blt-norpath.patch:1.1 Tue Jun 17 21:12:45 2003
+++ SOURCES/blt-norpath.patch Sat Jul 23 20:51:10 2005
@@ -1,14 +1,11 @@
---- blt2.4u/configure.in.orig 2003-06-17 20:39:16.000000000 +0200
-+++ blt2.4u/configure.in 2003-06-17 20:41:39.000000000 +0200
-@@ -1055,9 +1055,9 @@
- *-linux*)
+--- blt2.4z/configure.in.orig 2005-07-23 19:20:23.000000000 +0200
++++ blt2.4z/configure.in 2005-07-23 19:22:51.000000000 +0200
+@@ -1178,7 +1178,7 @@
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC}"
-- SHLIB_LD_FLAGS="-rdynamic -shared -Wl,-E -Wl,-soname,${libName}.so -Wl,-rpath,${LD_RUN_PATH}"
-+ SHLIB_LD_FLAGS="-rdynamic -shared -Wl,-E -Wl,-soname,${libName}.so"
+ SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
+- LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
++ LD_RUN_PATH=""
-- LDFLAGS="-Wl,-rpath,${LD_RUN_PATH}"
-+ LDFLAGS=""
+ LDFLAGS=""
EXTRA_LIB_SPECS="-ldl"
- ;;
-
================================================================
Index: SOURCES/blt-tcltk84.patch
diff -u SOURCES/blt-tcltk84.patch:1.1 SOURCES/blt-tcltk84.patch:1.2
--- SOURCES/blt-tcltk84.patch:1.1 Tue Jun 17 00:30:05 2003
+++ SOURCES/blt-tcltk84.patch Sat Jul 23 20:51:10 2005
@@ -166,17 +166,6 @@
{
Hierbox *hboxPtr;
Tk_Window tkwin;
---- blt2.4u/src/bltHiertable.c.orig 2000-06-23 02:40:05.000000000 +0200
-+++ blt2.4u/src/bltHiertable.c 2003-06-17 00:06:37.000000000 +0200
-@@ -4865,7 +4865,7 @@
- ClientData clientData; /* Main window associated with interpreter. */
- Tcl_Interp *interp; /* Current interpreter. */
- int argc; /* Number of arguments. */
-- char **argv; /* Argument strings. */
-+ CONST84 char **argv; /* Argument strings. */
- {
- Hiertable *htabPtr;
- Tcl_CmdInfo cmdInfo;
--- blt2.4u/src/bltHtext.c.orig 2000-05-25 23:40:56.000000000 +0200
+++ blt2.4u/src/bltHtext.c 2003-06-17 00:08:30.000000000 +0200
@@ -2222,8 +2222,8 @@
@@ -312,15 +301,6 @@
}
--- blt2.4u/src/tkFrame.c.orig 2000-03-07 21:35:38.000000000 +0100
+++ blt2.4u/src/tkFrame.c 2003-06-17 00:17:01.000000000 +0200
-@@ -240,8 +240,6 @@
-
- EXTERN Tk_Window TkCreateMainWindow _ANSI_ARGS_((Tcl_Interp * interp,
- char * screenName, char * baseName));
--EXTERN void TkSetClassProcs _ANSI_ARGS_((Tk_Window tkwin, void *procs,
-- ClientData instanceData));
- EXTERN void TkpSetMainMenubar _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin,
- char * menuName));
- EXTERN int TkpUseWindow _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin,
@@ -274,7 +272,7 @@
* interpreter. */
Tcl_Interp *interp; /* Current interpreter. */
@@ -339,15 +319,6 @@
{
return TkCreateFrame(clientData, interp, argc, argv, 1, (char *)NULL);
}
-@@ -497,7 +495,7 @@
- /*
- * Store backreference to frame widget in window structure.
- */
-- TkSetClassProcs(new, NULL, (ClientData)framePtr);
-+ Tk_SetClassProcs(new, NULL, (ClientData)framePtr);
- #endif
-
- mask = ExposureMask | StructureNotifyMask | FocusChangeMask;
--- blt2.4u/src/bltTed.c.orig 2000-05-25 23:40:57.000000000 +0200
+++ blt2.4u/src/bltTed.c 2003-06-17 00:13:40.000000000 +0200
@@ -1813,7 +1813,7 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/blt-DESTDIR.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/blt-acfix.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/blt-excl.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/blt-nolibnsl.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/blt-norpath.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/blt-tcltk84.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list