CVS commit: pkgsrc/devel/py-newt

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon May 22 16:40:37 UTC 2023

Modified Files:
        pkgsrc/devel/py-newt: Makefile distinfo
        pkgsrc/devel/py-newt/patches: patch-configure.ac

Log Message:
Find Tcl in any PREFIX.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-newt/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-newt/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-newt/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-newt/Makefile
diff -u pkgsrc/devel/py-newt/Makefile:1.19 pkgsrc/devel/py-newt/Makefile:1.20
--- pkgsrc/devel/py-newt/Makefile:1.19  Sun Nov  3 10:18:28 2019
+++ pkgsrc/devel/py-newt/Makefile       Mon May 22 16:40:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/11/03 10:18:28 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2023/05/22 16:40:37 schmonz Exp $
 
 DISTNAME=      newt-0.52.16
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -25,6 +25,11 @@ pre-configure:
        cd ${WRKSRC}; \
        aclocal && autoconf
 
+SUBST_CLASSES+=                prefix
+SUBST_STAGE.prefix=    pre-configure
+SUBST_FILES.prefix=    configure.ac
+SUBST_VARS.prefix=     PREFIX
+
 SUBST_CLASSES+=                inst-po
 SUBST_STAGE.inst-po=   pre-build
 SUBST_FILES.inst-po=   po/Makefile

Index: pkgsrc/devel/py-newt/distinfo
diff -u pkgsrc/devel/py-newt/distinfo:1.6 pkgsrc/devel/py-newt/distinfo:1.7
--- pkgsrc/devel/py-newt/distinfo:1.6   Thu Jan 27 08:10:07 2022
+++ pkgsrc/devel/py-newt/distinfo       Mon May 22 16:40:37 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2022/01/27 08:10:07 wiz Exp $
+$NetBSD: distinfo,v 1.7 2023/05/22 16:40:37 schmonz Exp $
 
 BLAKE2s (newt-0.52.16.tar.gz) = ef3dd1dab5ec4695901d21493661e5ff338a1267fdcdfb9b1eb479b324823e23
 SHA512 (newt-0.52.16.tar.gz) = 38cf5aa6660a3ee0409ed0767c02d777a4a2c28a000a359bb735da5abf8ee38f375ef333d10865a1eb3828497b6c58d2f3f6011c7b7e7c2360612b985dcf3d25
 Size (newt-0.52.16.tar.gz) = 183487 bytes
 SHA1 (patch-Makefile.in) = 6c029323ba411aff1f137149ee21cffb7decdb4a
-SHA1 (patch-configure.ac) = 8c685e25e89503cb5e62362c8b8132931d4c6184
+SHA1 (patch-configure.ac) = c3b51c273bb929eb8975e06ed990d342a37daf9c
 SHA1 (patch-po_Makefile) = dfa6352d1f10246bd7d2f9cd4f256394dc1a674a

Index: pkgsrc/devel/py-newt/patches/patch-configure.ac
diff -u pkgsrc/devel/py-newt/patches/patch-configure.ac:1.1 pkgsrc/devel/py-newt/patches/patch-configure.ac:1.2
--- pkgsrc/devel/py-newt/patches/patch-configure.ac:1.1 Wed Jan  1 06:55:23 2014
+++ pkgsrc/devel/py-newt/patches/patch-configure.ac     Mon May 22 16:40:37 2023
@@ -1,7 +1,8 @@
-$NetBSD: patch-configure.ac,v 1.1 2014/01/01 06:55:23 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.2 2023/05/22 16:40:37 schmonz Exp $
 
 * For newer Autotools
 * Detect Python version in another way
+* Find Tcl in any pkgsrc PREFIX
 
 --- configure.ac.orig  2013-08-06 15:46:42.000000000 +0000
 +++ configure.ac
@@ -21,3 +22,12 @@ $NetBSD: patch-configure.ac,v 1.1 2014/0
    AC_MSG_RESULT([$PYTHONVERS])
  fi
  AC_SUBST([PYTHONVERS])
+@@ -78,7 +79,7 @@ else
+       `ls -d /usr/lib64 2>/dev/null` \
+       `ls -d /usr/local/lib 2>/dev/null` \
+       `ls -d /usr/contrib/lib 2>/dev/null` \
+-      `ls -d /usr/pkg/lib 2>/dev/null` \
++      `ls -d @PREFIX@/lib 2>/dev/null` \
+       `ls -d /usr/local/lib/tcl8.5 2>/dev/null` \
+       `ls -d /usr/local/lib/tcl8.4 2>/dev/null` \
+       `ls -d /usr/lib/tcl8.5 2>/dev/null` \