From 6000dc11d67ff423b58575fca494eb0d939b5582 Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Sat, 25 Sep 2004 06:43:03 +0000 Subject: - fix up the patched makefiles a bit so that libtool libs are correctly in the all target. This prevents the libs from being created over and over. - fix up the libitk.so library so that the itk part of this package actually works. --- lang/tcl-itcl-current/distinfo | 10 +++++----- lang/tcl-itcl-current/patches/patch-aa | 8 +++----- lang/tcl-itcl-current/patches/patch-ab | 31 ++++++++++++++++++------------- lang/tcl-itcl-current/patches/patch-ac | 8 +++----- lang/tcl-itcl-current/patches/patch-ad | 30 +++++++++++++++++------------- 5 files changed, 46 insertions(+), 41 deletions(-) (limited to 'lang') diff --git a/lang/tcl-itcl-current/distinfo b/lang/tcl-itcl-current/distinfo index 4d146fc404b..bcd4031ad4a 100644 --- a/lang/tcl-itcl-current/distinfo +++ b/lang/tcl-itcl-current/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $ +$NetBSD: distinfo,v 1.2 2004/09/25 06:43:03 dmcmahill Exp $ SHA1 (tcl-itcl-20040920.tar.gz) = 469d8df8d7b506e7d175eb5a15fe68b5a60e95c6 Size (tcl-itcl-20040920.tar.gz) = 1133945 bytes -SHA1 (patch-aa) = 181176465cd8891710dcd029c09fd0350e8dc47c -SHA1 (patch-ab) = f6c9ef0d8a63d46459106438f6841d715a0cd209 -SHA1 (patch-ac) = 436198562c52f6b6b8e84ba812ba4ce7e8e93eb5 -SHA1 (patch-ad) = 0b30aabd3afc00020bfd0779997672e3cca929c6 +SHA1 (patch-aa) = 0bd0534d1d8bb4578334f43d9e72712673ba7a27 +SHA1 (patch-ab) = 05a86eb12eb9bf5b1d2b5cc0349fb919263dedcb +SHA1 (patch-ac) = 3c66d00e9d794f23491616bb2fec105c318561ee +SHA1 (patch-ad) = 8eb6769fb919ba51ee72664818c5e31e45e518d9 SHA1 (patch-ae) = 595d5fa2c322a6726af21f87cb5a74feadb9d515 SHA1 (patch-ag) = 5b21951b82de53875efd5289dd87abae8bb11073 SHA1 (patch-ah) = 58985a1b21625fc00dbbfe4e793dcbb2f7ef2929 diff --git a/lang/tcl-itcl-current/patches/patch-aa b/lang/tcl-itcl-current/patches/patch-aa index 372935730f7..b653a215c67 100644 --- a/lang/tcl-itcl-current/patches/patch-aa +++ b/lang/tcl-itcl-current/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.2 2004/09/25 06:43:04 dmcmahill Exp $ --- itcl/configure.orig Wed Sep 8 01:23:50 2004 +++ itcl/configure @@ -11,14 +11,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $ TCL_GENERIC_DIR_NATIVE='${TCL_TOP_DIR_NATIVE}/generic' TCL_UNIX_DIR_NATIVE='${TCL_TOP_DIR_NATIVE}/unix' TCL_WIN_DIR_NATIVE='${TCL_TOP_DIR_NATIVE}/win' -@@ -8591,8 +8591,8 @@ fi +@@ -8591,7 +8591,7 @@ fi MAKE_STUB_LIB="\${STLIB_LD} -out:\$@ \$(PKG_STUB_OBJECTS)" else MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(PKG_OBJECTS)" - MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(PKG_OBJECTS) \${SHLIB_LD_FLAGS} \${SHLIB_LD_LIBS}" -- MAKE_STUB_LIB="\${STLIB_LD} \$@ \$(PKG_STUB_OBJECTS)" + MAKE_SHARED_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${PKG_OBJECTS:.o=.lo} \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS} -version-info 0:0" -+ MAKE_STUB_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${PKG_STUB_OBJECTS:.o=.lo} \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS} -version-info 0:0" + MAKE_STUB_LIB="\${STLIB_LD} \$@ \$(PKG_STUB_OBJECTS)" fi - if test "${SHARED_BUILD}" = "1" ; then diff --git a/lang/tcl-itcl-current/patches/patch-ab b/lang/tcl-itcl-current/patches/patch-ab index a45e9b6d851..f324d55ab9d 100644 --- a/lang/tcl-itcl-current/patches/patch-ab +++ b/lang/tcl-itcl-current/patches/patch-ab @@ -1,7 +1,16 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.2 2004/09/25 06:43:04 dmcmahill Exp $ --- itcl/Makefile.in.orig Tue Aug 17 17:47:18 2004 +++ itcl/Makefile.in +@@ -58,7 +58,7 @@ PKG_HEADERS = @PKG_HEADERS@ + PKG_LIB_FILE = @PKG_LIB_FILE@ + PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@ + +-lib_BINARIES = $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE) ++lib_BINARIES = ${PKG_LIB_FILE:C/\.so.*/.la/} ${PKG_STUB_LIB_FILE} + BINARIES = $(lib_BINARIES) + + SHELL = @SHELL@ @@ -77,19 +77,19 @@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) @@ -40,25 +49,21 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $ STLIB_LD = @STLIB_LD@ TCL_DEFS = @TCL_DEFS@ TCL_BIN_DIR = @TCL_BIN_DIR@ -@@ -231,12 +231,10 @@ depend: - $(PKG_LIB_FILE): $(PKG_OBJECTS) +@@ -228,15 +228,13 @@ depend: + # source files above. + #======================================================================== + +-$(PKG_LIB_FILE): $(PKG_OBJECTS) ++${PKG_LIB_FILE:C/\.so.*/.la/}: $(PKG_OBJECTS) -rm -f $(PKG_LIB_FILE) ${MAKE_LIB} - $(RANLIB) $(PKG_LIB_FILE) - $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS) +-$(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS) ++${PKG_STUB_LIB_FILE}: $(PKG_STUB_OBJECTS) -rm -f $(PKG_STUB_LIB_FILE) ${MAKE_STUB_LIB} - $(RANLIB_STUB) $(PKG_STUB_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. -@@ -292,7 +290,7 @@ distclean: clean - - install-lib-binaries: - @mkdir -p $(DESTDIR)$(pkglibdir) -- @list='$(lib_BINARIES)'; for p in $$list; do \ -+ @list='${PKG_LIB_FILE:C/\.so.*/.la/} ${PKG_STUB_LIB_FILE:C/\.so.*/.la/} $(lib_BINARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ diff --git a/lang/tcl-itcl-current/patches/patch-ac b/lang/tcl-itcl-current/patches/patch-ac index 7481f9ec0f9..e97b01eaa8e 100644 --- a/lang/tcl-itcl-current/patches/patch-ac +++ b/lang/tcl-itcl-current/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.2 2004/09/25 06:43:04 dmcmahill Exp $ --- itk/configure.orig Wed Sep 8 01:23:51 2004 +++ itk/configure @@ -11,17 +11,15 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $ TCL_GENERIC_DIR_NATIVE='${TCL_TOP_DIR_NATIVE}/generic' TCL_UNIX_DIR_NATIVE='${TCL_TOP_DIR_NATIVE}/unix' TCL_WIN_DIR_NATIVE='${TCL_TOP_DIR_NATIVE}/win' -@@ -9338,8 +9338,8 @@ fi +@@ -9338,7 +9338,7 @@ fi MAKE_STUB_LIB="\${STLIB_LD} -out:\$@ \$(PKG_STUB_OBJECTS)" else MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(PKG_OBJECTS)" - MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(PKG_OBJECTS) \${SHLIB_LD_FLAGS} \${SHLIB_LD_LIBS}" -- MAKE_STUB_LIB="\${STLIB_LD} \$@ \$(PKG_STUB_OBJECTS)" + MAKE_SHARED_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${PKG_OBJECTS:.o=.lo} \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS} -version-info 0:0" -+ MAKE_STUB_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${PKG_STUB_OBJECTS:.o=.lo} \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS} -version-info 0:0" + MAKE_STUB_LIB="\${STLIB_LD} \$@ \$(PKG_STUB_OBJECTS)" fi - if test "${SHARED_BUILD}" = "1" ; then @@ -9407,7 +9407,7 @@ fi if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${itcl_STUB_LIB_PATH}`\"" diff --git a/lang/tcl-itcl-current/patches/patch-ad b/lang/tcl-itcl-current/patches/patch-ad index 2d4aa41c3b7..8d07b449baf 100644 --- a/lang/tcl-itcl-current/patches/patch-ad +++ b/lang/tcl-itcl-current/patches/patch-ad @@ -1,7 +1,16 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $ +$NetBSD: patch-ad,v 1.2 2004/09/25 06:43:04 dmcmahill Exp $ --- itk/Makefile.in.orig Tue Aug 17 17:47:18 2004 +++ itk/Makefile.in +@@ -77,7 +77,7 @@ ITK_WIN_DIR_NATIVE = @ITK_WIN_DIR_NATIVE + PKG_LIB_FILE = @PKG_LIB_FILE@ + PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@ + +-lib_BINARIES = $(PKG_LIB_FILE) ++lib_BINARIES = ${PKG_LIB_FILE:C/\.so.*/.la/} + BINARIES = $(lib_BINARIES) + + SHELL = @SHELL@ @@ -96,19 +96,19 @@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) @@ -36,12 +45,16 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $ +SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ -SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -+SHLIB_LD_LIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltk84 -ltcl84 -lX11 -lm ++SHLIB_LD_LIBS = ../itcl/itclStubLib.lo -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltk84 -ltcl84 -lX11 -lm STLIB_LD = @STLIB_LD@ TCL_DEFS = @TCL_DEFS@ TCL_BIN_DIR = @TCL_BIN_DIR@ -@@ -256,12 +256,10 @@ depend: - $(PKG_LIB_FILE): $(PKG_OBJECTS) +@@ -253,15 +253,13 @@ depend: + # source files above. + #======================================================================== + +-$(PKG_LIB_FILE): $(PKG_OBJECTS) ++${PKG_LIB_FILE:C/\.so.*/.la/}: $(PKG_OBJECTS) -rm -f $(PKG_LIB_FILE) ${MAKE_LIB} - $(RANLIB) $(PKG_LIB_FILE) @@ -53,12 +66,3 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $ #======================================================================== # We need to enumerate the list of .c to .o lines here. -@@ -317,7 +315,7 @@ distclean: clean - - install-lib-binaries: - @mkdir -p $(DESTDIR)$(pkglibdir) -- @list='$(lib_BINARIES)'; for p in $$list; do \ -+ @list='${PKG_LIB_FILE:C/\.so.*/.la/} ${PKG_STUB_LIB_FILE:C/\.so.*/.la/} $(lib_BINARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ -- cgit v1.2.3