[pkgsrc/trunk]: pkgsrc/x11/tk83 Fixed wrong use of WRKSRC. Converted explicit...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/tk83 Fixed wrong use of WRKSRC. Converted explicit...
From: rillig <rillig%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:33:35 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/556f7274c39c
branches:  trunk
changeset: 502489:556f7274c39c
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Nov 05 03:27:55 2005 +0000

description:
Fixed wrong use of WRKSRC. Converted explicit use of ${SED} to the SUBST
framework.

diffstat:

 x11/tk83/Makefile         |  72 ++++++++++++++++++++++++----------------------
 x11/tk83/distinfo         |  12 +++---
 x11/tk83/patches/patch-aa |   6 +-
 x11/tk83/patches/patch-ab |   6 +-
 x11/tk83/patches/patch-ac |   6 +-
 x11/tk83/patches/patch-ad |   6 +-
 x11/tk83/patches/patch-ae |   6 +-
 7 files changed, 58 insertions(+), 56 deletions(-)

diffs (203 lines):

diff -r ebcde9125108 -r 556f7274c39c x11/tk83/Makefile
--- a/x11/tk83/Makefile Sat Nov 05 03:21:35 2005 +0000
+++ b/x11/tk83/Makefile Sat Nov 05 03:27:55 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/04 07:05:30 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/05 03:27:55 rillig Exp $
 
 DISTNAME=      tk8.3.4
 PKGNAME=       tk-8.3.4
@@ -13,9 +13,16 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-WRKSRC=                        ${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=         yes
+CONFIGURE_DIRS=                unix
 CONFIGURE_ARGS+=       --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
+
+SUBST_CLASSES+=                tk834
+SUBST_STAGE.tk834=     post-build
+SUBST_FILES.tk834=     unix/tkConfig.sh
+SUBST_SED.tk834+=      -e "s|${WRKSRC}/unix|${PREFIX}/lib|"
+SUBST_SED.tk834+=      -e "s|${WRKSRC}|${PREFIX}/include/tk|"
+
 MAKE_ENV+=             TOUCH="${TOUCH}"
 
 USE_LIBTOOL=           yes
@@ -31,7 +38,7 @@
 # linked to a longer filename.
 #
 post-patch:
-       @cd ${WRKSRC};                                                  \
+       @cd ${WRKSRC}/unix;                                             \
        ${MV} -f mkLinks mkLinks.tmp;                                   \
        ${GREP} -v "^exit 0" mkLinks.tmp > mkLinks;                     \
        ${CAT} mkLinks.tmp                                              \
@@ -44,16 +51,11 @@
        ${CHMOD} +x mkLinks;
 
 post-build:
-       cd ${WRKSRC}; for file in                                       \
+       cd ${WRKSRC}/unix; for file in                                  \
                tkUnixInit.o libtk83.so wish;                           \
        do                                                              \
                ${TOUCH} $${file};                                      \
        done
-       ${SED}                                                          \
-               -e "s|${WRKSRC}|${PREFIX}/lib|"                         \
-               -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}/include/tk|"     \
-               ${WRKSRC}/tkConfig.sh > ${WRKSRC}/tkConfig.sh.tmp &&    \
-               ${MV} ${WRKSRC}/tkConfig.sh.tmp ${WRKSRC}/tkConfig.sh
 
 post-install:
        ${RM} -f ${PREFIX}/bin/wish
@@ -61,32 +63,32 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/include/tk
        ${INSTALL_DATA_DIR} ${PREFIX}/include/tk/generic
        ${INSTALL_DATA_DIR} ${PREFIX}/include/tk/unix
-       ${INSTALL_DATA} ${WRKSRC}/../generic/default.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/ks_names.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tk.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tk3d.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkButton.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkCanvas.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkColor.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkDecls.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkFileFilter.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkFont.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkInitScript.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkInt.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkIntDecls.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkIntPlatDecls.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkIntXlibDecls.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkMenu.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkMenubutton.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkPlatDecls.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkPort.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkScale.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkScrollbar.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkSelect.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../generic/tkText.h ${PREFIX}/include/tk/generic
-       ${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixDefault.h ${PREFIX}/include/tk/unix
-       ${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixInt.h ${PREFIX}/include/tk/unix
-       ${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixPort.h ${PREFIX}/include/tk/unix
+       ${INSTALL_DATA} ${WRKSRC}/generic/default.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/ks_names.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tk.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tk3d.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkButton.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkCanvas.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkColor.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkDecls.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkFileFilter.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkFont.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkInitScript.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkInt.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkIntDecls.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkIntPlatDecls.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkIntXlibDecls.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkMenu.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkMenubutton.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkPlatDecls.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkPort.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkScale.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkScrollbar.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkSelect.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/generic/tkText.h ${PREFIX}/include/tk/generic
+       ${INSTALL_DATA} ${WRKSRC}/unix/tkUnixDefault.h ${PREFIX}/include/tk/unix
+       ${INSTALL_DATA} ${WRKSRC}/unix/tkUnixInt.h ${PREFIX}/include/tk/unix
+       ${INSTALL_DATA} ${WRKSRC}/unix/tkUnixPort.h ${PREFIX}/include/tk/unix
 
 .include "../../lang/tcl83/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff -r ebcde9125108 -r 556f7274c39c x11/tk83/distinfo
--- a/x11/tk83/distinfo Sat Nov 05 03:21:35 2005 +0000
+++ b/x11/tk83/distinfo Sat Nov 05 03:27:55 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2005/09/22 15:01:58 wiz Exp $
+$NetBSD: distinfo,v 1.7 2005/11/05 03:27:55 rillig Exp $
 
 SHA1 (tk8.3.4.tar.gz) = d52bf5cedb73e9b817ba8d6a2b00701f4f82fad2
 RMD160 (tk8.3.4.tar.gz) = f154fd9b2eedcff732b9cdabee48bd9af1b3dd26
 Size (tk8.3.4.tar.gz) = 2589635 bytes
-SHA1 (patch-aa) = 41749b2d76a3bb87d39d472dfa3c2237a623bc89
-SHA1 (patch-ab) = 481d7f57b3a1aed2d63986f6f46181d340484310
-SHA1 (patch-ac) = 4c8775d0da14eb2a6ea1822f668a6d6a9023dc0d
-SHA1 (patch-ad) = 1815fc19986674cb2ea03a8d60cd1514ff47fba9
-SHA1 (patch-ae) = 5b025cd75326a491c7c886de2eab81e9d6712c20
+SHA1 (patch-aa) = eac3c87f6fa921f046e59588e8d77dde336985c7
+SHA1 (patch-ab) = 7e48a48a9c8258b3220c9fcd4718fb8ee830153c
+SHA1 (patch-ac) = b7e3a2fefafd00d3d00499117fe7dc42fb6ad429
+SHA1 (patch-ad) = 7aaab1728ad13ddbbf4483780f818996a09a67f9
+SHA1 (patch-ae) = 9ab780fbfcc18606423abf4a1ae8816a39856dbf
diff -r ebcde9125108 -r 556f7274c39c x11/tk83/patches/patch-aa
--- a/x11/tk83/patches/patch-aa Sat Nov 05 03:21:35 2005 +0000
+++ b/x11/tk83/patches/patch-aa Sat Nov 05 03:27:55 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2005/05/10 16:17:07 agc Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/05 03:27:56 rillig Exp $
 
---- Makefile.in.orig   2001-10-20 01:24:40.000000000 +0100
-+++ Makefile.in        2005-05-10 17:01:34.000000000 +0100
+--- unix/Makefile.in.orig      2001-10-20 01:24:40.000000000 +0100
++++ unix/Makefile.in   2005-05-10 17:01:34.000000000 +0100
 @@ -76,7 +76,7 @@
  # The directory containing the Tcl sources and headers appropriate
  # for this version of Tk ("srcdir" will be replaced or has already
diff -r ebcde9125108 -r 556f7274c39c x11/tk83/patches/patch-ab
--- a/x11/tk83/patches/patch-ab Sat Nov 05 03:21:35 2005 +0000
+++ b/x11/tk83/patches/patch-ab Sat Nov 05 03:27:55 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2005/09/21 14:49:09 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2005/11/05 03:27:56 rillig Exp $
 
---- configure.orig     2001-10-20 02:24:40.000000000 +0200
-+++ configure
+--- unix/configure.orig        2001-10-20 02:24:40.000000000 +0200
++++ unix/configure
 @@ -1746,6 +1746,7 @@ fi
  
      do64bit_ok=no
diff -r ebcde9125108 -r 556f7274c39c x11/tk83/patches/patch-ac
--- a/x11/tk83/patches/patch-ac Sat Nov 05 03:21:35 2005 +0000
+++ b/x11/tk83/patches/patch-ac Sat Nov 05 03:27:55 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2005/09/21 14:49:09 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2005/11/05 03:27:56 rillig Exp $
 
---- tcl.m4.orig        2001-10-20 00:24:40.000000000 +0000
-+++ tcl.m4
+--- unix/tcl.m4.orig   2001-10-20 00:24:40.000000000 +0000
++++ unix/tcl.m4
 @@ -602,6 +602,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
  
      do64bit_ok=no
diff -r ebcde9125108 -r 556f7274c39c x11/tk83/patches/patch-ad
--- a/x11/tk83/patches/patch-ad Sat Nov 05 03:21:35 2005 +0000
+++ b/x11/tk83/patches/patch-ad Sat Nov 05 03:27:55 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
+$NetBSD: patch-ad,v 1.2 2005/11/05 03:27:56 rillig Exp $
 
---- configure.in.orig  Sat Oct 20 02:24:40 2001
-+++ configure.in
+--- unix/configure.in.orig     Sat Oct 20 02:24:40 2001
++++ unix/configure.in
 @@ -220,6 +220,10 @@
  fi
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
diff -r ebcde9125108 -r 556f7274c39c x11/tk83/patches/patch-ae
--- a/x11/tk83/patches/patch-ae Sat Nov 05 03:21:35 2005 +0000
+++ b/x11/tk83/patches/patch-ae Sat Nov 05 03:27:55 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2005/09/21 14:49:09 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2005/11/05 03:27:56 rillig Exp $
 
---- tkUnixPort.h.orig  2001-10-13 01:25:10.000000000 +0000
-+++ tkUnixPort.h
+--- unix/tkUnixPort.h.orig     2001-10-13 01:25:10.000000000 +0000
++++ unix/tkUnixPort.h
 @@ -123,8 +123,10 @@
   * Not all systems declare the errno variable in errno.h. so this
   * file does it explicitly.
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc/convertlit Fixed wrong use of WRKSRC. gcc-2.9...
Next by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/lib Add new files.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc/convertlit Fixed wrong use of WRKSRC. gcc-2.9...
Next by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/lib Add new files.
Indexes:
Home | Main Index | Thread Index | Old Index