CVS commit: pkgsrc/lang/smalltalk

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Sat Sep 19 15:27:15 UTC 2020

Modified Files:
        pkgsrc/lang/smalltalk: Makefile distinfo
        pkgsrc/lang/smalltalk/patches: patch-ah

Log Message:
(lang/smalltalk) adhoc fix for problem: sh: paxctl: not found


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 pkgsrc/lang/smalltalk/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/smalltalk/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/smalltalk/patches/patch-ah

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

Modified files:

Index: pkgsrc/lang/smalltalk/Makefile
diff -u pkgsrc/lang/smalltalk/Makefile:1.116 pkgsrc/lang/smalltalk/Makefile:1.117
--- pkgsrc/lang/smalltalk/Makefile:1.116        Mon Aug 17 20:19:21 2020
+++ pkgsrc/lang/smalltalk/Makefile      Sat Sep 19 15:27:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2020/08/17 20:19:21 leot Exp $
+# $NetBSD: Makefile,v 1.117 2020/09/19 15:27:15 mef Exp $
 
 DISTNAME=      smalltalk-3.2.5
 PKGREVISION=   16
@@ -28,6 +28,12 @@ IGNORE_LIBTOOLIZE=   lib/smalltalk/libc.la
 INFO_FILES=            YES
 TEST_TARGET=           check
 
+SUBST_CLASSES+=                paxctl
+SUBST_FILES.paxctl=    Makefile.in
+SUBST_STAGE.paxctl=    pre-configure
+SUBST_MESSAGE.paxctl=  Give paxctl path to Makefile.in after patch
+SUBST_SED.paxctl=      -e 's,@PAXCTL@,${TOOLS_PLATFORM.paxctl},'
+
 REPLACE_PERL=          packages/vfs/deb packages/vfs/mailfs
 REPLACE_SED=           examples/pepe.sed examples/xml.sed
 

Index: pkgsrc/lang/smalltalk/distinfo
diff -u pkgsrc/lang/smalltalk/distinfo:1.28 pkgsrc/lang/smalltalk/distinfo:1.29
--- pkgsrc/lang/smalltalk/distinfo:1.28 Fri Dec 29 03:56:42 2017
+++ pkgsrc/lang/smalltalk/distinfo      Sat Sep 19 15:27:15 2020
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.28 2017/12/29 03:56:42 dholland Exp $
+$NetBSD: distinfo,v 1.29 2020/09/19 15:27:15 mef Exp $
 
 SHA1 (smalltalk-3.2.5.tar.gz) = 4dd77b769131527add276ded01666e089da3b8b1
 RMD160 (smalltalk-3.2.5.tar.gz) = 04cc87b31e8288fc6a8ce756612d40d91ce40cde
 SHA512 (smalltalk-3.2.5.tar.gz) = 385e5fba2acb8870759e5178282210c09c45685d0cf776bc50f4ed10c9afacf9164547ba8099ea3ed9a92a2a253aa9c2b011a7a9f2dff47ea9cfdf3b42029ebc
 Size (smalltalk-3.2.5.tar.gz) = 5779293 bytes
 SHA1 (patch-ae) = 0de0e6bed47d32e1c3088100c153054461e4f33b
-SHA1 (patch-ah) = ff72f65fe5e8aa71a729898525b756ca59b78767
+SHA1 (patch-ah) = 76366578593fd7afbf34d8215c1f3692e610f661
 SHA1 (patch-libgst_cint.c) = 51354b41f8edde0e42abcd5f8d0246d4f1025c6e
 SHA1 (patch-libgst_input.c) = 06168ed6decd6d42838e76ada81717e3f599d733
 SHA1 (patch-snprintfv_snprintfv_format.c) = 03eed55ade8f78ae1cf73b82df9d18629314945b

Index: pkgsrc/lang/smalltalk/patches/patch-ah
diff -u pkgsrc/lang/smalltalk/patches/patch-ah:1.5 pkgsrc/lang/smalltalk/patches/patch-ah:1.6
--- pkgsrc/lang/smalltalk/patches/patch-ah:1.5  Fri Dec 29 03:56:42 2017
+++ pkgsrc/lang/smalltalk/patches/patch-ah      Sat Sep 19 15:27:15 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.5 2017/12/29 03:56:42 dholland Exp $
+$NetBSD: patch-ah,v 1.6 2020/09/19 15:27:15 mef Exp $
 
 - Link against pthreads.
 - Run paxctl +am after linking gst and gst-tool so they don't crash
@@ -28,11 +28,11 @@ when subsequently run during the build.
  gst$(EXEEXT): $(gst_OBJECTS) $(gst_DEPENDENCIES) $(EXTRA_gst_DEPENDENCIES) 
        @rm -f gst$(EXEEXT)
        $(gst_LINK) $(gst_OBJECTS) $(gst_LDADD) $(LIBS)
-+      paxctl +am .libs/gst || true
++      @PAXCTL@ +am .libs/gst || true
  gst-tool$(EXEEXT): $(gst_tool_OBJECTS) $(gst_tool_DEPENDENCIES) $(EXTRA_gst_tool_DEPENDENCIES) 
        @rm -f gst-tool$(EXEEXT)
        $(gst_tool_LINK) $(gst_tool_OBJECTS) $(gst_tool_LDADD) $(LIBS)
-+      paxctl +am .libs/gst-tool || true
++      @PAXCTL@  +am .libs/gst-tool || true
  winewrapper$(EXEEXT): $(winewrapper_OBJECTS) $(winewrapper_DEPENDENCIES) $(EXTRA_winewrapper_DEPENDENCIES) 
        @rm -f winewrapper$(EXEEXT)
        $(LINK) $(winewrapper_OBJECTS) $(winewrapper_LDADD) $(LIBS)