From 68f3df2f1d92bcc9ff35d865ae2291fda20ddee8 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 19 Aug 2008 16:14:24 +0000 Subject: Use pax instead of requiring GNU tar. DESTDIR support Fix unbalanced ' in configure. --- lang/tcl-tclX/Makefile | 19 ++++++++++--------- lang/tcl-tclX/distinfo | 10 +++++----- lang/tcl-tclX/patches/patch-aa | 21 +++++++++++++++------ lang/tcl-tclX/patches/patch-ab | 4 ++-- lang/tcl-tclX/patches/patch-ac | 13 +++++++++++-- lang/tcl-tclX/patches/patch-af | 4 ++-- 6 files changed, 45 insertions(+), 26 deletions(-) (limited to 'lang') diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile index d31d94ed325..6c64e56d4c5 100644 --- a/lang/tcl-tclX/Makefile +++ b/lang/tcl-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2007/01/07 09:13:57 rillig Exp $ +# $NetBSD: Makefile,v 1.37 2008/08/19 16:14:24 joerg Exp $ # DISTNAME= tclx8.3.5-src @@ -17,10 +17,11 @@ CONFLICTS+= tclX-[0-9]* BUILDLINK_API_DEPENDS.tcl+= tcl>=8.4.7 PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix -USE_TOOLS+= gtar USE_LIBTOOL= yes +USE_TOOLS+= pax GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shared \ --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \ @@ -36,10 +37,10 @@ WRKSRC.tcl_cmd= \ PKGSRC_TCL_SRC_DIR= ${WRKSRC.tcl_cmd:sh} CONFIGURE_ENV+= PKGSRC_TCL_SRC_DIR=${PKGSRC_TCL_SRC_DIR:Q} -MAKE_ENV+= GTAR=${GTAR:Q} CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} \ +MAKE_ENV+= CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} \ SHAREMODE=${SHAREMODE:Q} SHAREOWN=${SHAREOWN:Q} \ - SHAREGRP=${SHAREGRP:Q} \ - TCLX_PREFIX=${PREFIX:Q} + SHAREGRP=${SHAREGRP:Q} TCLX_PREFIX=${PREFIX:Q} \ + INSTALL_ROOT=${DESTDIR} INSTALLATION_DIRS= bin include @@ -55,10 +56,10 @@ post-build: cd ${WRKSRC}/../tcl/unix && ${MAKE_ENV} ${MAKE} buildhelp post-install: - ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} - ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type f -print | ${XARGS} ${CHMOD} ${DOCMODE} - @${RM} ${PREFIX}/${PKGMANDIR}/man3/TkX_Main.3 - @${RM} ${PREFIX}/${PKGMANDIR}/man3/Tkx_Init.3 + ${FIND} ${DESTDIR}${PREFIX}/lib/tcl/tclX8.3/help -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} + ${FIND} ${DESTDIR}${PREFIX}/lib/tcl/tclX8.3/help -type f -print | ${XARGS} ${CHMOD} ${DOCMODE} + @${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/TkX_Main.3 + @${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/Tkx_Init.3 # the above links are installed based on the contents of the man page. # we don't want to modify the man page, as it is also used by ../tk-tclX, # so... diff --git a/lang/tcl-tclX/distinfo b/lang/tcl-tclX/distinfo index 4380eb4e8d3..a41a01b790d 100644 --- a/lang/tcl-tclX/distinfo +++ b/lang/tcl-tclX/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.11 2006/01/11 21:32:02 joerg Exp $ +$NetBSD: distinfo,v 1.12 2008/08/19 16:14:24 joerg Exp $ SHA1 (tclx8.3.5-src.tar.gz) = 74092449684d11dd73a4cb91fa3e1442e9e21d47 RMD160 (tclx8.3.5-src.tar.gz) = b501c1c48b54950ea7fb6d3d6d27ef3e7d58c5a5 Size (tclx8.3.5-src.tar.gz) = 434281 bytes -SHA1 (patch-aa) = 76d55ef477bb12ec0d02dbf77a572e64de0f8be6 -SHA1 (patch-ab) = cd8a0cda70af84d3f283e96eb4f0b2c0ca102ede -SHA1 (patch-ac) = d3e27f11ad3c74ad8e52a8db0b931129345160a4 +SHA1 (patch-aa) = a60aee24d56a1b46ecdc0767a788b4ce8d6dee6c +SHA1 (patch-ab) = 947f311b01f8eb4fb5fcf442210d70ca14f17ee0 +SHA1 (patch-ac) = c42669fab43b253b6fb07b04e8fc41099062a014 SHA1 (patch-ad) = 252a21da464267d7c7d45e168a89b29a40273359 SHA1 (patch-ae) = a43144f37706245779362026073e09d8505a3d3f -SHA1 (patch-af) = 64810cf27a40dcc6f9c12b94295e0b61db2e24a3 +SHA1 (patch-af) = eff862b092a3593dfe299dd33e7492076ee56812 SHA1 (patch-ag) = 6c8876699bfe325b3370bb554d4727e05fc64b8b SHA1 (patch-ah) = 37f883b17e3cec0266f9cd8c60cece521e59f56a SHA1 (patch-ai) = 07572c47a3ee375f89488dbbfe52697091beccfb diff --git a/lang/tcl-tclX/patches/patch-aa b/lang/tcl-tclX/patches/patch-aa index c2ff4f38f16..b52e3c3336b 100644 --- a/lang/tcl-tclX/patches/patch-aa +++ b/lang/tcl-tclX/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2004/05/13 22:06:03 minskim Exp $ +$NetBSD: patch-aa,v 1.4 2008/08/19 16:14:24 joerg Exp $ ---- Common.mk.in.orig 2000-06-14 02:48:25.000000000 -0500 +--- Common.mk.in.orig 2000-06-14 09:48:25.000000000 +0200 +++ Common.mk.in @@ -36,7 +36,8 @@ TKX_FULL_VERSION = @TKX_FULL_VERSION@ #------------------------------------------------------------------------------ @@ -12,7 +12,16 @@ $NetBSD: patch-aa,v 1.3 2004/05/13 22:06:03 minskim Exp $ CFLAGS = @CFLAGS@ @TCL_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@ SYSCFLAGS = @SYSCFLAGS@ RANLIB = @RANLIB@ -@@ -73,8 +74,7 @@ bldbasedir = @bldbasedir@ +@@ -64,8 +65,6 @@ XLDLIBS= + # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix + # when installing files. This is normally passed on the command line. + +-INSTALL_ROOT = +- + #------------------------------------------------------------------------------ + # Build and install directories. + srcbasedir = @srcbasedir@ +@@ -73,8 +72,7 @@ bldbasedir = @bldbasedir@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -22,7 +31,7 @@ $NetBSD: patch-aa,v 1.3 2004/05/13 22:06:03 minskim Exp $ TKX_PREFIX="${prefix}" TKX_EXEC_PREFIX="${exec_prefix}" -@@ -133,8 +133,8 @@ TCL_BUILD_STUB_LIB_SPEC = @TCL_BUILD_S +@@ -133,8 +131,8 @@ TCL_BUILD_STUB_LIB_SPEC = @TCL_BUILD_S TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@ @@ -33,7 +42,7 @@ $NetBSD: patch-aa,v 1.3 2004/05/13 22:06:03 minskim Exp $ #------------------------------------------------------------------------------ # Configuration information from tkConfig.sh. -@@ -161,11 +161,11 @@ TK_UNIX_DIR = ${TK_SRC_DIR}/unix +@@ -161,11 +159,11 @@ TK_UNIX_DIR = ${TK_SRC_DIR}/unix #------------------------------------------------------------------------------ # Location of directories in TclX source and build trees. # @@ -49,7 +58,7 @@ $NetBSD: patch-aa,v 1.3 2004/05/13 22:06:03 minskim Exp $ TCLX_GENERIC_DIR = ${srcbasedir}/tcl/generic TCLX_UNIX_SRC_DIR = ${srcbasedir}/tcl/unix -@@ -190,13 +190,13 @@ COMPAT_DIR = ${srcbasedir}/tcl/c +@@ -190,13 +188,13 @@ COMPAT_DIR = ${srcbasedir}/tcl/c #------------------------------------------------------------------------------ # Installation directories. diff --git a/lang/tcl-tclX/patches/patch-ab b/lang/tcl-tclX/patches/patch-ab index 8752d164d98..8d60caac9f5 100644 --- a/lang/tcl-tclX/patches/patch-ab +++ b/lang/tcl-tclX/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2004/05/13 22:06:04 minskim Exp $ +$NetBSD: patch-ab,v 1.5 2008/08/19 16:14:24 joerg Exp $ --- ../tcl/unix/Makefile.in.orig 2000-08-09 21:21:48.000000000 -0500 +++ ../tcl/unix/Makefile.in @@ -82,7 +82,7 @@ $NetBSD: patch-ab,v 1.4 2004/05/13 22:06:04 minskim Exp $ + ${BSD_INSTALL_DATA} ${TCLX_GENERIC_DIR}/tclExtend.h ${INSTALL_ROOT}${TCLX_INST_INCL} + ${BSD_INSTALL_DATA} ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c ${INSTALL_ROOT}${TCLX_INST_RUNTIME} + ${BSD_INSTALL_DATA_DIR} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help -+ cd ${HELP_DIR} && ${GTAR} cf - . | (cd ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help && ${GTAR} xf -) ++ cd ${HELP_DIR} && pax -r -w . ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help install-runtime: diff --git a/lang/tcl-tclX/patches/patch-ac b/lang/tcl-tclX/patches/patch-ac index 42efea26bf3..4b3d5ad8063 100644 --- a/lang/tcl-tclX/patches/patch-ac +++ b/lang/tcl-tclX/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.5 2004/05/16 18:52:11 minskim Exp $ +$NetBSD: patch-ac,v 1.6 2008/08/19 16:14:24 joerg Exp $ ---- configure.orig 2002-11-01 20:48:14.000000000 -0600 +--- configure.orig 2002-11-02 03:48:14.000000000 +0100 +++ configure @@ -799,6 +799,7 @@ echo "configure:794: checking for existe echo "$ac_t""file not found" 1>&6 @@ -18,6 +18,15 @@ $NetBSD: patch-ac,v 1.5 2004/05/16 18:52:11 minskim Exp $ # These are substituted into the run scripts +@@ -1677,7 +1679,7 @@ echo "configure:1668: checking system ve + # results, and the version is kept in special file). + + if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then +- system=MP-RAS-`awk '{print }' /etc/.relid'` ++ system=MP-RAS-`awk '{print }' /etc/.relid` + fi + if test "`uname -s`" = "AIX" ; then + system=AIX-`uname -v`.`uname -r` @@ -1894,7 +1896,7 @@ fi DL_LIBS="" LDFLAGS="-Wl,-D,08000000" diff --git a/lang/tcl-tclX/patches/patch-af b/lang/tcl-tclX/patches/patch-af index 0431ce08fea..7e250a95447 100644 --- a/lang/tcl-tclX/patches/patch-af +++ b/lang/tcl-tclX/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.5 2004/05/13 22:06:04 minskim Exp $ +$NetBSD: patch-af,v 1.6 2008/08/19 16:14:24 joerg Exp $ --- ../tk/unix/Makefile.in.orig 2000-08-09 21:21:48.000000000 -0500 +++ ../tk/unix/Makefile.in @@ -99,7 +99,7 @@ $NetBSD: patch-af,v 1.5 2004/05/13 22:06:04 minskim Exp $ + ${BSD_INSTALL_DATA} ${TKX_UNIX_SRC_DIR}/tkXAppInit.c \ ${INSTALL_ROOT}${TKX_INST_RUNTIME} + ${BSD_INSTALL_DATA_DIR} ${INSTALL_ROOT}${TKX_INST_RUNTIME:S|/tkX|/tclX|}/help -+ cd ${HELP_DIR} && ${GTAR} cf - . | (cd ${INSTALL_ROOT}${TKX_INST_RUNTIME:S|/tkX|/tclX|}/help && ${GTAR} xf -) ++ cd ${HELP_DIR} && pax -r -w . cd ${INSTALL_ROOT}${TKX_INST_RUNTIME:S|/tkX|/tclX|}/help + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTALL_ROOT}${TKX_INST_RUNTIME:S|/tkX|/tclX|}/help install-runtime: -- cgit v1.2.3