pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/misc/plan9port
Module Name: pkgsrc
Committed By: vins
Date: Tue Jan 28 17:41:20 UTC 2025
Modified Files:
pkgsrc/misc/plan9port: Makefile distinfo
pkgsrc/misc/plan9port/patches: patch-src_cmd_rio_mkfile
Added Files:
pkgsrc/misc/plan9port/patches: patch-src_cmd_compress_mkfile
patch-src_cmd_fossil_mkfile patch-src_cmd_venti_srv_mkfile
Log Message:
misc/plan9port: fix broken build.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/plan9port/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/plan9port/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/misc/plan9port/patches/patch-src_cmd_compress_mkfile \
pkgsrc/misc/plan9port/patches/patch-src_cmd_fossil_mkfile \
pkgsrc/misc/plan9port/patches/patch-src_cmd_venti_srv_mkfile
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/misc/plan9port/patches/patch-src_cmd_rio_mkfile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/misc/plan9port/Makefile
diff -u pkgsrc/misc/plan9port/Makefile:1.10 pkgsrc/misc/plan9port/Makefile:1.11
--- pkgsrc/misc/plan9port/Makefile:1.10 Tue Jan 28 13:37:39 2025
+++ pkgsrc/misc/plan9port/Makefile Tue Jan 28 17:41:20 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2025/01/28 13:37:39 vins Exp $
+# $NetBSD: Makefile,v 1.11 2025/01/28 17:41:20 vins Exp $
DISTNAME= plan9port-20240717
+PKGREVISION= 1
CATEGORIES= misc plan9
MASTER_SITES= ${MASTER_SITE_GITHUB:=9fans/}
GITHUB_TAG= a2567fcac9851e5cc965a236679f568b0e79cff2
@@ -21,6 +22,8 @@ RELRO_SUPPORTED= no
PTHREAD_AUTO_VARS= yes
BUILDLINK_TRANSFORM+= rm:-lpthread
+PLAN9_TARGET= ${PREFIX}/plan9
+
REPLACE_BASH+= bin/macedit
REPLACE_BASH+= mac/9term.app/Contents/MacOS/9term
REPLACE_BASH+= mac/Plumb.app/Contents/MacOS/plumb
@@ -32,30 +35,40 @@ REPLACE_PERL+= unix/man/fixurls
REPLACE_INTERPRETER+= rc
REPLACE.rc.old= .*/bin/rc
-REPLACE.rc.new= ${PREFIX}/plan9/bin/rc
-REPLACE_FILES.rc+= bin/wintext
-REPLACE_FILES.rc+= acid/transcript
-REPLACE_FILES.rc+= acid/window
-REPLACE_FILES.rc+= src/cmd/9660/mk9660.rc
-REPLACE_FILES.rc+= src/cmd/dict/egfix
-REPLACE_FILES.rc+= src/cmd/dict/egfix2
-REPLACE_FILES.rc+= src/cmd/dict/gefix
-REPLACE_FILES.rc+= src/cmd/dict/getneeds
-REPLACE_FILES.rc+= src/cmd/fossil/conf.rc
-REPLACE_FILES.rc+= src/cmd/lp/lp.rc
-REPLACE_FILES.rc+= src/cmd/lp/lpsend.rc
-REPLACE_FILES.rc+= src/cmd/map/map.rc
-REPLACE_FILES.rc+= src/cmd/map/mapdemo.rc
-REPLACE_FILES.rc+= src/cmd/netfiles/netfileget
-REPLACE_FILES.rc+= src/cmd/netfiles/netfileput
-REPLACE_FILES.rc+= src/cmd/netfiles/netfilestat
-REPLACE_FILES.rc+= src/cmd/spell/spell.rc
-REPLACE_FILES.rc+= src/cmd/upas/filterkit/pipefrom.sample
-REPLACE_FILES.rc+= src/cmd/upas/misc/mail.rc
-REPLACE_FILES.rc+= src/cmd/upas/misc/qmail
-REPLACE_FILES.rc+= src/cmd/upas/misc/remotemail
-REPLACE_FILES.rc+= src/cmd/venti/srv/conf.rc
-REPLACE_FILES.rc+= src/cmd/venti/srv/tester
+REPLACE.rc.new= ${PLAN9_TARGET}/bin/rc
+REPLACE_FILES.rc+= bin/9.rc bin/9fs bin/Getdir bin/adict \
+ bin/doctype bin/ipso bin/lookman bin/man \
+ bin/mount bin/quote1 bin/quote2 bin/sig \
+ bin/soelim bin/spell bin/src bin/ssam \
+ bin/stack bin/troff2png bin/u.rc bin/unmount \
+ bin/upas/isspam bin/upas/msgcat bin/upas/spam \
+ bin/upas/spambox bin/upas/unspam \
+ bin/upas/unspambox acid/transcript acid/window \
+ bin/vmount bin/vwhois bin/wintext bin/yesterday \
+ dist/debian/mkpkg dist/debian/mkrep \
+ dist/manweb dist/mkdirlist dist/mkfilelist \
+ dist/publish dist/troff/tfont \
+ mail/lib/qmail mail/lib/remotemail \
+ mail/lib/validateattachment \
+ man/mkindex man/secindex \
+ src/cmd/9660/mk9660.rc src/cmd/dict/egfix \
+ src/cmd/dict/egfix2 src/cmd/dict/gefix \
+ src/cmd/dict/getneeds src/cmd/fossil/conf.rc \
+ src/cmd/lp/lp.rc src/cmd/lp/lpsend.rc \
+ lp/bin/* lp/daemon/* lp/process/* lp/stat/* \
+ lp/kill/generic lp/sched/FIFO lp/spooler/* \
+ src/cmd/map/map.rc src/cmd/map/mapdemo.rc \
+ src/cmd/netfiles/netfileget \
+ src/cmd/netfiles/netfileput \
+ src/cmd/netfiles/netfilestat \
+ src/cmd/postscript/printfont/printfont.rc \
+ src/cmd/spell/spell.rc \
+ src/cmd/upas/misc/mail.rc \
+ src/cmd/upas/misc/qmail \
+ src/cmd/upas/misc/remotemail \
+ src/cmd/upas/filterkit/pipefrom.sample \
+ src/cmd/venti/srv/conf.rc \
+ src/cmd/venti/srv/tester
SUBST_CLASSES+= cc
SUBST_STAGE.cc= pre-configure
@@ -71,8 +84,6 @@ SUBST_FILES.prefix+= INSTALL plan9.sh ac
SUBST_VARS.prefix= PREFIX X11BASE
SUBST_MESSAGE.prefix= Replacing PREFIX placeholders.
-PLAN9_TARGET= ${PREFIX}/plan9
-
EGDIR= ${PREFIX}/share/examples/profile.d
CONF_FILES+= ${EGDIR}/plan9.sh \
${PKG_SYSCONFDIR}/profile.d/plan9.sh
@@ -160,7 +171,17 @@ do-install:
${RUN}${CHMOD} -x ${PLAN9_BUILD}/man/fonts
post-install:
-# Run acme as a standalone application.
+# install venti/fossil conf scripts.
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/cmd/venti/srv/conf.rc \
+ ${PLAN9_BUILD}/bin/venti/conf
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/cmd/fossil/conf.rc \
+ ${PLAN9_BUILD}/bin/fossil/conf
+# symlink the `compress' utility to its counterpart(s).
+.for z in uncompress zcat
+ ${RUN}${LN} -sf ${PLAN9_TARGET}/bin/compress \
+ ${PLAN9_BUILD}/bin/${z}
+.endfor
+# Allow acme to be run as a standalone application.
${INSTALL_SCRIPT} ${WRKSRC}/acme.sh \
${DESTDIR}${PREFIX}/bin/acme
${INSTALL_DATA} ${FILESDIR}/acme.desktop \
Index: pkgsrc/misc/plan9port/distinfo
diff -u pkgsrc/misc/plan9port/distinfo:1.5 pkgsrc/misc/plan9port/distinfo:1.6
--- pkgsrc/misc/plan9port/distinfo:1.5 Sun Aug 4 20:13:07 2024
+++ pkgsrc/misc/plan9port/distinfo Tue Jan 28 17:41:20 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2024/08/04 20:13:07 vins Exp $
+$NetBSD: distinfo,v 1.6 2025/01/28 17:41:20 vins Exp $
BLAKE2s (plan9port-20240717-a2567fcac9851e5cc965a236679f568b0e79cff2.tar.gz) = 46c53ef9ae5043e5546bf49a1eca8093a1abd4237f0b5526e6c1b69fe4e5cf5d
SHA512 (plan9port-20240717-a2567fcac9851e5cc965a236679f568b0e79cff2.tar.gz) =
fecc317d80155dd5f07346ab2a448a0ab336a615c7f9877daeff1d010545a0360bce53b4fc5d60e3466e7db760d84657b89ff4e803f75c7129d86af99c005a7e
@@ -6,5 +6,8 @@ Size (plan9port-20240717-a2567fcac9851e5
SHA1 (patch-INSTALL) = a20664c816a3c242bb6ca3484bccb84350843122
SHA1 (patch-bin_9c) = 65184d75f4ff87718093f9e85e43adf8018ea366
SHA1 (patch-bin_9l) = e6daeac87657ed3e25e0f0db403d973f60d544d2
+SHA1 (patch-src_cmd_compress_mkfile) = 9aaffb579741554555f606977c9f0e717a4c5309
SHA1 (patch-src_cmd_devdraw_mkwsysrules.sh) = b81252ff054868622e07e743e436ddaad540b9e0
-SHA1 (patch-src_cmd_rio_mkfile) = b2584bf14a71efb7af4bebba763035d21b38a194
+SHA1 (patch-src_cmd_fossil_mkfile) = ff13ed2961d8e4eae7f3abf0457fd01e16385c0b
+SHA1 (patch-src_cmd_rio_mkfile) = 504067dbade77eac548ae2706c6e159fb3b91832
+SHA1 (patch-src_cmd_venti_srv_mkfile) = 0e49822506d6496294669e26283c518078aef8d9
Index: pkgsrc/misc/plan9port/patches/patch-src_cmd_rio_mkfile
diff -u pkgsrc/misc/plan9port/patches/patch-src_cmd_rio_mkfile:1.1 pkgsrc/misc/plan9port/patches/patch-src_cmd_rio_mkfile:1.2
--- pkgsrc/misc/plan9port/patches/patch-src_cmd_rio_mkfile:1.1 Tue Dec 6 14:29:25 2022
+++ pkgsrc/misc/plan9port/patches/patch-src_cmd_rio_mkfile Tue Jan 28 17:41:20 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_cmd_rio_mkfile,v 1.1 2022/12/06 14:29:25 vins Exp $
+$NetBSD: patch-src_cmd_rio_mkfile,v 1.2 2025/01/28 17:41:20 vins Exp $
-Properly honors LDFLAGS.
+Properly honor LDFLAGS.
--- src/cmd/rio/mkfile.orig 2020-06-22 15:22:27.000000000 +0000
+++ src/cmd/rio/mkfile
Added files:
Index: pkgsrc/misc/plan9port/patches/patch-src_cmd_compress_mkfile
diff -u /dev/null pkgsrc/misc/plan9port/patches/patch-src_cmd_compress_mkfile:1.1
--- /dev/null Tue Jan 28 17:41:20 2025
+++ pkgsrc/misc/plan9port/patches/patch-src_cmd_compress_mkfile Tue Jan 28 17:41:20 2025
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_cmd_compress_mkfile,v 1.1 2025/01/28 17:41:20 vins Exp $
+
+Do not install multiple copies of the same binary.
+
+--- src/cmd/compress/mkfile.orig 2025-01-28 14:09:21.281350403 +0000
++++ src/cmd/compress/mkfile
+@@ -1,15 +1,7 @@
+ <$PLAN9/src/mkhdr
+
+ TARG=\
+- compress \
+- zcat \
+- uncompress
+-
+-$O.uncompress:Q: $O.compress
+- cp $prereq $target
+-
+-$O.zcat:Q: $O.compress
+- cp $prereq $target
++ compress
+
+ <$PLAN9/src/mkmany
+
Index: pkgsrc/misc/plan9port/patches/patch-src_cmd_fossil_mkfile
diff -u /dev/null pkgsrc/misc/plan9port/patches/patch-src_cmd_fossil_mkfile:1.1
--- /dev/null Tue Jan 28 17:41:20 2025
+++ pkgsrc/misc/plan9port/patches/patch-src_cmd_fossil_mkfile Tue Jan 28 17:41:20 2025
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_cmd_fossil_mkfile,v 1.1 2025/01/28 17:41:20 vins Exp $
+
+Prevent PLIST issues by installing the script directly.
+
+--- src/cmd/fossil/mkfile.orig 2024-06-17 13:28:40.000000000 +0000
++++ src/cmd/fossil/mkfile
+@@ -1,7 +1,7 @@
+ <$PLAN9/src/mkhdr
+ BIN=$BIN/fossil
+
+-TARG=fossil flchk flfmt conf last view
++TARG=fossil flchk flfmt last view
+
+ LIBFILES=\
+ 9p\
+@@ -66,15 +66,6 @@ $O.flfmt: flfmt9660.$O
+
+ flfmt%.$O: flfmt9660.h
+
+-$O.conf:DQ: conf.rc
+- {
+- echo '#!/usr/local/plan9/bin/rc'
+- echo '# THIS FILE IS AUTOMATICALLY GENERATED'
+- echo '# FROM /usr/local/plan9/src/cmd/fossil/conf.rc. DO NOT EDIT.'
+- echo
+- sed 1d conf.rc
+- } >$target && chmod +x $target
+-
+ clean:
+ rm -f $LIB
+
Index: pkgsrc/misc/plan9port/patches/patch-src_cmd_venti_srv_mkfile
diff -u /dev/null pkgsrc/misc/plan9port/patches/patch-src_cmd_venti_srv_mkfile:1.1
--- /dev/null Tue Jan 28 17:41:20 2025
+++ pkgsrc/misc/plan9port/patches/patch-src_cmd_venti_srv_mkfile Tue Jan 28 17:41:20 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_cmd_venti_srv_mkfile,v 1.1 2025/01/28 17:41:20 vins Exp $
+
+Prevent PLIST issues by installing the script directly.
+
+--- src/cmd/venti/srv/mkfile.orig 2024-06-17 13:28:40.000000000 +0000
++++ src/cmd/venti/srv/mkfile
+@@ -55,7 +55,6 @@ TARG=\
+ checkarenas\
+ checkindex\
+ clumpstats\
+- conf\
+ findscore\
+ fixarenas\
+ fmtarenas\
+@@ -88,12 +87,3 @@ $SLIB: $LIBOFILES
+
+ acid:D: lumpcache.acid
+ cat $prereq >$target
+-
+-$O.conf:DQ: conf.rc
+- {
+- echo '#!/usr/local/plan9/bin/rc'
+- echo '# THIS FILE IS AUTOMATICALLY GENERATED'
+- echo '# FROM /usr/local/plan9/src/cmd/venti/srv/conf.rc. DO NOT EDIT.'
+- echo
+- sed 1d conf.rc
+- } >$target && chmod +x $target
Home |
Main Index |
Thread Index |
Old Index