[pkgsrc/trunk]: pkgsrc/x11/tk Fix up some Makefile logic that got broken by t...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/tk Fix up some Makefile logic that got broken by t...
From: danw <danw%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:51:20 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/844782ef5887
branches:  trunk
changeset: 472400:844782ef5887
user:      danw <danw%pkgsrc.org@localhost>
date:      Fri Apr 09 23:39:00 2004 +0000

description:
Fix up some Makefile logic that got broken by the libtool patches (and
prevented it from building on some platforms). Ensure that the built
library is named libtk84 (as opposed to libtk8.4) on all platforms.

diffstat:

 x11/tk/Makefile         |   11 +---
 x11/tk/buildlink2.mk    |    7 +-
 x11/tk/buildlink3.mk    |    7 +-
 x11/tk/distinfo         |    6 +-
 x11/tk/patches/patch-aa |   51 +++++++++++++++--
 x11/tk/patches/patch-ab |  133 +++++++++++++++++++++--------------------------
 6 files changed, 116 insertions(+), 99 deletions(-)

diffs (truncated from 606 to 300 lines):

diff -r 3d26b1fa1172 -r 844782ef5887 x11/tk/Makefile
--- a/x11/tk/Makefile   Fri Apr 09 23:37:28 2004 +0000
+++ b/x11/tk/Makefile   Fri Apr 09 23:39:00 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2004/03/25 22:49:15 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2004/04/09 23:39:00 danw Exp $
 
 DISTNAME=      tk8.4.6-src
 PKGNAME=       tk-8.4.6
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -46,13 +46,6 @@
        ${RM} -f mkLinks.tmp;                                           \
        ${CHMOD} +x mkLinks;
 
-pre-install:
-       cd ${WRKSRC}; for file in                                       \
-               tkUnixInit.o libtk84.so wish;                           \
-       do                                                              \
-               ${TOUCH} $${file};                                      \
-       done
-
 post-install:
        cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}
        ${RM} -rf ${WRKDIR}/man
diff -r 3d26b1fa1172 -r 844782ef5887 x11/tk/buildlink2.mk
--- a/x11/tk/buildlink2.mk      Fri Apr 09 23:37:28 2004 +0000
+++ b/x11/tk/buildlink2.mk      Fri Apr 09 23:39:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/03/24 15:24:36 jwise Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/04/09 23:39:00 danw Exp $
 
 .if !defined(TK_BUILDLINK2_MK)
 TK_BUILDLINK2_MK=      # defined
@@ -22,10 +22,11 @@
 .include "../../lang/tcl/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 
-# Make "-ltk" resolve into "-ltk84", so that we don't need to patch so
-# many Makefiles.
+# Make "-ltk" and "-ltk8.4" resolve into "-ltk84", so that we don't
+# need to patch so many Makefiles.
 #
 BUILDLINK_TRANSFORM+=          l:tk:tk84
+BUILDLINK_TRANSFORM+=          l:tk8.4:tk84
 
 BUILDLINK_TARGETS+=    tk-buildlink
 
diff -r 3d26b1fa1172 -r 844782ef5887 x11/tk/buildlink3.mk
--- a/x11/tk/buildlink3.mk      Fri Apr 09 23:37:28 2004 +0000
+++ b/x11/tk/buildlink3.mk      Fri Apr 09 23:39:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/03/24 15:24:36 jwise Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/04/09 23:39:00 danw Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=     ${TK_BUILDLINK3_MK}+
@@ -16,10 +16,11 @@
 
 BUILDLINK_FILES.tk=    bin/wish*
 #
-# Make "-ltk" resolve into "-ltk84", so that we don't need to patch so
-# many Makefiles.
+# Make "-ltk" and "-ltk8.4" resolve into "-ltk84", so that we don't
+# need to patch so many Makefiles.
 #
 BUILDLINK_TRANSFORM+=  l:tk:tk84
+BUILDLINK_TRANSFORM+=  l:tk8.4:tk84
 
 .endif # TK_BUILDLINK3_MK
 
diff -r 3d26b1fa1172 -r 844782ef5887 x11/tk/distinfo
--- a/x11/tk/distinfo   Fri Apr 09 23:37:28 2004 +0000
+++ b/x11/tk/distinfo   Fri Apr 09 23:39:00 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2004/03/25 22:49:15 jlam Exp $
+$NetBSD: distinfo,v 1.16 2004/04/09 23:39:00 danw Exp $
 
 SHA1 (tk8.4.6-src.tar.gz) = a0b2f364be20c3e312d1ba582d3a1b4b4b1d4d88
 Size (tk8.4.6-src.tar.gz) = 3230760 bytes
-SHA1 (patch-aa) = 8d5ef8ca0667c1cec570b8b661d3c3cabf0c44e1
-SHA1 (patch-ab) = a64ea12d46f1e5a7893ac7489c0815f7e1f6fabb
+SHA1 (patch-aa) = 60fd440a16607a9000fd16b1a6f6461d2d717fdd
+SHA1 (patch-ab) = 1673dd6d9e5a7bfd3e85004f34da1c28f3258353
 SHA1 (patch-ac) = 055e64d4a3a1e93f6e122ebdad270fb1490fe381
 SHA1 (patch-ad) = 2f65cb36160794991d940bb3ffc9a754dcd9febc
diff -r 3d26b1fa1172 -r 844782ef5887 x11/tk/patches/patch-aa
--- a/x11/tk/patches/patch-aa   Fri Apr 09 23:37:28 2004 +0000
+++ b/x11/tk/patches/patch-aa   Fri Apr 09 23:39:00 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2004/03/25 22:49:15 jlam Exp $
+$NetBSD: patch-aa,v 1.11 2004/04/09 23:39:00 danw Exp $
 
 --- Makefile.in.orig   Mon Mar  1 19:04:48 2004
 +++ Makefile.in
@@ -31,7 +31,15 @@
  INSTALL_LIBRARY               = ${INSTALL}
  INSTALL_DATA          = ${INSTALL} -m 644
  
-@@ -234,7 +234,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
+@@ -208,6 +208,7 @@ TK_STUB_LIB_FLAG   = @TK_STUB_LIB_FLAG@
+ #TK_STUB_LIB_FLAG     = -ltkstub
+ 
+ TK_LIB_FILE           = @TK_LIB_FILE@
++TK_LA_FILE            = ${TK_LIB_FILE:C/@SHLIB_SUFFIX@/.la/}
+ #TK_LIB_FILE          = libtk.a
+ 
+ # Generic lib name used in rules that apply to tcl and tk
+@@ -234,7 +235,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
  # The values of the symbolis normally set by the configure script.
  
  STLIB_LD              = @STLIB_LD@
@@ -40,7 +48,7 @@
  SHLIB_LD_FLAGS                = @SHLIB_LD_FLAGS@
  SHLIB_LD_LIBS         = @SHLIB_LD_LIBS@
  TK_SHLIB_LD_EXTRAS    = @TK_SHLIB_LD_EXTRAS@
-@@ -274,7 +274,8 @@ TOOL_DIR           = @TCL_SRC_DIR@/tools
+@@ -274,7 +275,8 @@ TOOL_DIR           = @TCL_SRC_DIR@/tools
  # should be compressed and linked with softlinks
  MKLINKS_FLAGS           = @MKLINKS_FLAGS@
  
@@ -50,16 +58,36 @@
  
  CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
  -I${UNIX_DIR} -I${GENERIC_DIR} \
-@@ -422,7 +423,7 @@ objs: ${OBJS}
+@@ -390,7 +392,7 @@ DEMOPROGS = browse hello ixset rmt rolod
+ 
+ all: binaries libraries doc
+ 
+-binaries: ${LIB_FILE} ${STUB_LIB_FILE} wish
++binaries: ${TK_LA_FILE} ${STUB_LIB_FILE} wish
+ 
+ libraries:
+ 
+@@ -402,7 +404,7 @@ doc: $(SRC_DIR)/doc/man.macros
+ 
+ # The following target is configured by autoconf to generate either
+ # a shared library or non-shared library for Tk.
+-${LIB_FILE}: ${OBJS}
++${TK_LA_FILE}: ${OBJS}
+       rm -f $@
+       @MAKE_LIB@
+ 
+@@ -421,8 +423,8 @@ tkLibObjs:
+ objs: ${OBJS}
  
  
- wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
+-wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
 -      $(CC) $(LDFLAGS) $(WISH_OBJS) \
++wish: $(WISH_OBJS) $(TK_LA_FILE) $(TK_STUB_LIB_FILE)
 +      $(LD) $(LDFLAGS) $(WISH_OBJS) \
                @TK_BUILD_LIB_SPEC@ \
                $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish
  
-@@ -436,7 +437,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
+@@ -436,7 +438,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
        $(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR)
  
  tktest-real:
@@ -68,7 +96,7 @@
                @TK_BUILD_LIB_SPEC@ \
                $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest
  
-@@ -445,7 +446,7 @@ tktest-real:
+@@ -445,7 +447,7 @@ tktest-real:
  # lib location logic from tktest, and it is not clear where this
  # test.o object file comes from.
  xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
@@ -77,3 +105,12 @@
                @TK_BUILD_LIB_SPEC@ \
                $(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
  
+@@ -507,7 +509,7 @@ install-strip:
+ # some ranlibs write to current directory, and this might not always be
+ # possible (e.g. if installing as root).
+ 
+-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
++install-binaries: $(TK_LA_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
+       @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
+           do \
+           if [ ! -d $$i ] ; then \
diff -r 3d26b1fa1172 -r 844782ef5887 x11/tk/patches/patch-ab
--- a/x11/tk/patches/patch-ab   Fri Apr 09 23:37:28 2004 +0000
+++ b/x11/tk/patches/patch-ab   Fri Apr 09 23:39:00 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
+$NetBSD: patch-ab,v 1.16 2004/04/09 23:39:00 danw Exp $
 
 --- configure.orig     Mon Mar  1 19:04:48 2004
 +++ configure
-@@ -2071,6 +2071,7 @@ fi
+@@ -2071,12 +2071,13 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -10,6 +10,13 @@
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
+     TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
+     ECHO_VERSION='`echo ${VERSION}`'
+-    TCL_LIB_VERSIONS_OK=ok
++    TCL_LIB_VERSIONS_OK=nodots
+     CFLAGS_DEBUG=-g
+     CFLAGS_OPTIMIZE=-O
+     if test "$GCC" = "yes" ; then
 @@ -2140,7 +2141,7 @@ fi
            SHLIB_SUFFIX=".so"
  
@@ -113,19 +120,16 @@
            CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
            LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
            SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
-@@ -2495,7 +2496,10 @@ fi
+@@ -2495,7 +2496,7 @@ fi
            CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
            LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
            EXTRA_CFLAGS=""
 -          LDFLAGS=""
 +          LD_FLAGS=""
-+          UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+          SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+          TCL_LIB_VERSIONS_OK=nodots
            ;;
        IRIX-6.*)
            SHLIB_CFLAGS=""
-@@ -2508,7 +2512,7 @@ fi
+@@ -2508,7 +2509,7 @@ fi
            LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
            if test "$GCC" = "yes" ; then
                EXTRA_CFLAGS="-mabi=n32"
@@ -134,20 +138,16 @@
            else
                case $system in
                    IRIX-6.3)
-@@ -2519,8 +2523,11 @@ fi
+@@ -2519,7 +2520,7 @@ fi
                        EXTRA_CFLAGS="-n32"
                        ;;
                esac
 -              LDFLAGS="-n32"
 +              LD_FLAGS="-n32"
            fi
-+          UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+          SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+          TCL_LIB_VERSIONS_OK=nodots
            ;;
        IRIX64-6.*)
-           SHLIB_CFLAGS=""
-@@ -2529,7 +2536,7 @@ fi
+@@ -2529,7 +2530,7 @@ fi
            SHLIB_SUFFIX=".so"
            DL_OBJS="tclLoadDl.o"
            DL_LIBS=""
@@ -156,7 +156,7 @@
            CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
            LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  
-@@ -2542,9 +2549,12 @@ fi
+@@ -2542,7 +2543,7 @@ fi
                    do64bit_ok=yes
                    SHLIB_LD="ld -64 -shared -rdata_shared"
                    EXTRA_CFLAGS="-64"
@@ -164,13 +164,8 @@
 +                  LD_FLAGS="-64"
                fi
            fi
-+          UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+          SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+          TCL_LIB_VERSIONS_OK=nodots
            ;;
-       Linux*)
-           SHLIB_CFLAGS="-fPIC"
-@@ -2561,7 +2571,7 @@ fi
+@@ -2561,7 +2562,7 @@ fi
                SHLIB_LD="${CC} -shared"
                DL_OBJS="tclLoadDl.o"
                DL_LIBS="-ldl"
@@ -179,7 +174,7 @@
                CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
                LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
            else
-@@ -2597,7 +2607,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2597,7 +2598,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
                    SHLIB_LD="ld -shared"
                    DL_OBJS="tclLoadDld.o"
                    DL_LIBS="-ldld"
@@ -188,17 +183,7 @@
                    CC_SEARCH_FLAGS=""
                    LD_SEARCH_FLAGS=""
  else
-@@ -2626,6 +2636,9 @@ fi
- EOF
- 
-
Prev by Date: [pkgsrc/trunk]: pkgsrc/biology/chemtool Disable gnome support explicitly. Ot...
Next by Date: [pkgsrc/trunk]: pkgsrc/biology/chemtool bl3ify and enable pkgviews installation.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/biology/chemtool Disable gnome support explicitly. Ot...
Next by Thread: [pkgsrc/trunk]: pkgsrc/biology/chemtool bl3ify and enable pkgviews installation.
Indexes:
Home | Main Index | Thread Index | Old Index