[pkgsrc/trunk]: pkgsrc bl3ify

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc bl3ify
From: jlam <jlam%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:19:40 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/271c58002a98
branches:  trunk
changeset: 465733:271c58002a98
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jan 05 11:17:10 2004 +0000

description:
bl3ify

diffstat:

 converters/libiconv/Makefile |    6 +-
 devel/gettext-lib/Makefile   |    8 +-
 devel/gmake/Makefile         |    8 +-
 devel/readline/Makefile      |    6 +-
 lang/tcl/Makefile            |    9 +-
 lang/tcl/distinfo            |    6 +-
 lang/tcl/patches/patch-ab    |  395 +++---------------------------------------
 lang/tcl/patches/patch-ae    |   24 +-
 net/socks4/Makefile          |    8 +-
 net/socks5/Makefile          |    6 +-
 x11/tk/Makefile              |    8 +-
 x11/tk/distinfo              |    4 +-
 x11/tk/patches/patch-aa      |    4 +-
 13 files changed, 92 insertions(+), 400 deletions(-)

diffs (truncated from 805 to 300 lines):

diff -r ab0e90ea847a -r 271c58002a98 converters/libiconv/Makefile
--- a/converters/libiconv/Makefile      Mon Jan 05 11:16:31 2004 +0000
+++ b/converters/libiconv/Makefile      Mon Jan 05 11:17:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/07/28 10:11:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/05 11:17:10 jlam Exp $
 #
 
 DISTNAME=              libiconv-1.9.1
@@ -10,7 +10,9 @@
 HOMEPAGE=              http://www.gnu.org/software/libiconv/
 COMMENT=               Character set conversion library
 
-USE_BUILDLINK2=                YES
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
diff -r ab0e90ea847a -r 271c58002a98 devel/gettext-lib/Makefile
--- a/devel/gettext-lib/Makefile        Mon Jan 05 11:16:31 2004 +0000
+++ b/devel/gettext-lib/Makefile        Mon Jan 05 11:17:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2003/09/25 03:00:57 danw Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/05 11:17:10 jlam Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -15,7 +15,9 @@
 
 CONFLICTS=             gettext<=0.10.35
 
-USE_BUILDLINK2=                # defined
+PKG_INSTALLATION_TYPES=        overview pkgviews
+
+USE_BUILDLINK3=                # defined
 USE_LIBTOOL=           # defined
 LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
 
@@ -37,5 +39,5 @@
 CPPFLAGS+=             -D_INTL_REDIRECT_MACROS=1 -DSTATIC=static
 .endif
 
-.include "../../converters/libiconv/buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ab0e90ea847a -r 271c58002a98 devel/gmake/Makefile
--- a/devel/gmake/Makefile      Mon Jan 05 11:16:31 2004 +0000
+++ b/devel/gmake/Makefile      Mon Jan 05 11:17:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2003/08/09 10:44:42 seb Exp $
+# $NetBSD: Makefile,v 1.52 2004/01/05 11:18:13 jlam Exp $
 
 DISTNAME=      make-3.80
 PKGNAME=       gmake-3.80
@@ -10,7 +10,9 @@
 HOMEPAGE=      http://www.gnu.org/software/make/make.html
 COMMENT=       GNU version of 'make' utility
 
-USE_BUILDLINK2=                YES
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=                YES
 GNU_CONFIGURE=         YES
 USE_PKGLOCALEDIR=      YES
 TEXINFO_REQD=          4.0
@@ -42,5 +44,5 @@
        ${LN} -sf ${GNU_PROGRAM_PREFIX}make ${PREFIX}/bin/gmake
 .endif
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ab0e90ea847a -r 271c58002a98 devel/readline/Makefile
--- a/devel/readline/Makefile   Mon Jan 05 11:16:31 2004 +0000
+++ b/devel/readline/Makefile   Mon Jan 05 11:17:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/09/19 05:18:35 dent Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/05 11:19:13 jlam Exp $
 #
 
 DISTNAME=      readline-4.3
@@ -14,7 +14,9 @@
 HOMEPAGE=      http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 COMMENT=       GNU library that can recall and edit previous input
 
-USE_BUILDLINK2=                # defined
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=                # defined
 GNU_CONFIGURE=         # defined
 USE_LIBTOOL=           # defined
 
diff -r ab0e90ea847a -r 271c58002a98 lang/tcl/Makefile
--- a/lang/tcl/Makefile Mon Jan 05 11:16:31 2004 +0000
+++ b/lang/tcl/Makefile Mon Jan 05 11:17:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/10/08 03:13:21 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/05 11:22:13 jlam Exp $
 #
 
 DISTNAME=              tcl8.3.4
@@ -16,11 +16,13 @@
 
 CONFLICTS+=            tclman80-[0-9]*
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
 GNU_CONFIGURE=         yes
 MAKE_ENV+=             TOUCH="${TOUCH}"
 TEST_TARGET=           test
 
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 USE_LIBTOOL=           yes
 
 INSTALL_TARGET=                install
@@ -32,6 +34,9 @@
 #
 CONFIGURE_ARGS+=       --mandir=${WRKDIR}/man
 
+# Add ${VIEWBASE}/lib/tcl to the list of locations for Tcl packages.
+CONFIGURE_ENV+=                TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
diff -r ab0e90ea847a -r 271c58002a98 lang/tcl/distinfo
--- a/lang/tcl/distinfo Mon Jan 05 11:16:31 2004 +0000
+++ b/lang/tcl/distinfo Mon Jan 05 11:17:10 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2003/10/08 03:13:21 jschauma Exp $
+$NetBSD: distinfo,v 1.15 2004/01/05 11:22:13 jlam Exp $
 
 SHA1 (tcl8.3.4.tar.gz) = b179f1f51b322b7045cf152b73df4f3d01da82ec
 Size (tcl8.3.4.tar.gz) = 2654756 bytes
 SHA1 (patch-aa) = 3e9fa9427f40a4c6b1f97bcda58fefe9d5cf20ce
-SHA1 (patch-ab) = c5c0092bdcb0f7d5d44a36b5c3e05af805987e5b
+SHA1 (patch-ab) = 0350ffd17fe5e88d3e179b960d374248b41f9ad5
 SHA1 (patch-ac) = d1e1b6ed334ff424140a678ed098504cc14614e8
-SHA1 (patch-ae) = a0237d220cf0f8475614497cabaae738621a7729
+SHA1 (patch-ae) = 5eee14adec88cf0cac5715fe0cfe7420b9b83774
 SHA1 (patch-af) = e19764a58f5ddd6b5b62e785ae305069c535f865
diff -r ab0e90ea847a -r 271c58002a98 lang/tcl/patches/patch-ab
--- a/lang/tcl/patches/patch-ab Mon Jan 05 11:16:31 2004 +0000
+++ b/lang/tcl/patches/patch-ab Mon Jan 05 11:17:10 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.18 2003/10/08 03:13:21 jschauma Exp $
+$NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $
 
---- configure.orig     Fri Oct 19 20:24:15 2001
-+++ configure  Tue Oct  7 21:40:04 2003
-@@ -4776,6 +4776,7 @@
+--- configure.orig     Fri Oct 19 17:24:15 2001
++++ configure
+@@ -4776,6 +4776,7 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -10,165 +10,7 @@
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -4795,7 +4796,7 @@
-     # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:4799: checking for $ac_word" >&5
-+echo "configure:4800: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4900,7 +4901,7 @@
-           # known GMT value.
- 
-           echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
--echo "configure:4904: checking for gettimeofday in -lbsd" >&5
-+echo "configure:4905: checking for gettimeofday in -lbsd" >&5
- ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4908,7 +4909,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lbsd  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4912 "configure"
-+#line 4913 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4919,7 +4920,7 @@
- gettimeofday()
- ; return 0; }
- EOF
--if { (eval echo configure:4923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4981,7 +4982,7 @@
-       HP-UX-*.11.*)
-           SHLIB_SUFFIX=".sl"
-           echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
--echo "configure:4985: checking for shl_load in -ldld" >&5
-+echo "configure:4986: checking for shl_load in -ldld" >&5
- ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4989,7 +4990,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldld  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4993 "configure"
-+#line 4994 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5000,7 +5001,7 @@
- shl_load()
- ; return 0; }
- EOF
--if { (eval echo configure:5004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5043,7 +5044,7 @@
-       HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
-           SHLIB_SUFFIX=".sl"
-           echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
--echo "configure:5047: checking for shl_load in -ldld" >&5
-+echo "configure:5048: checking for shl_load in -ldld" >&5
- ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5051,7 +5052,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldld  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5055 "configure"
-+#line 5056 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5062,7 +5063,7 @@
- shl_load()
- ; return 0; }
- EOF
--if { (eval echo configure:5066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5123,6 +5124,9 @@
-           DL_OBJS="tclLoadDl.o"
-           DL_LIBS=""
-           LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-+          UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+          SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+          TCL_LIB_VERSIONS_OK=nodots
-           if test "$GCC" = "yes" ; then
-               EXTRA_CFLAGS="-mabi=n32"
-               LDFLAGS="-mabi=n32"
-@@ -5148,6 +5152,9 @@
-           DL_LIBS=""
-           LDFLAGS=""
-           LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-+          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"
-@@ -5166,20 +5173,23 @@
-               DL_LIBS="-ldl"
-               LDFLAGS="-rdynamic"
-               LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-+              UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+              SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+              TCL_LIB_VERSIONS_OK=nodots
-           else
-               ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for dld.h""... $ac_c" 1>&6
--echo "configure:5173: checking for dld.h" >&5
-+echo "configure:5174: checking for dld.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5178 "configure"
-+#line 5179 "configure"
- #include "confdefs.h"
- #include <dld.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:5184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/perl58 Add a patch from my local repository.
Next by Date: [pkgsrc/trunk]: pkgsrc bl3ify
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/perl58 Add a patch from my local repository.
Next by Thread: [pkgsrc/trunk]: pkgsrc bl3ify
Indexes:
Home | Main Index | Thread Index | Old Index