Date: Sun, 24 Jan 2010 08:28:23 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/143154: [PATCH] net/xpvm: use $SUB_FILES to dynamically update pkg-message, make plist DATADIR safe Message-ID: <201001240828.o0O8SNci009662@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001240840.o0O8e61E010318@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143154
>Category: ports
>Synopsis: [PATCH] net/xpvm: use $SUB_FILES to dynamically update pkg-message, make plist DATADIR safe
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 24 08:40:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sevan Janiyan
>Release: FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 5 21:11:58 UTC
>Description:
Added file(s):
- files/pkg-message.in
Removed file(s):
- pkg-message
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- xpvm-1.2.5_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/xpvm/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 19 May 2007 20:19:19 -0000 1.4
+++ Makefile 24 Jan 2010 08:26:31 -0000
@@ -23,7 +23,7 @@
WRKSRC= ${WRKDIR}/xpvm
PVM_ROOT?= ${LOCALBASE}/lib/pvm
MAKE_ENV+= PVM_ROOT=${PVM_ROOT} XPVM_ROOT=${WRKSRC}
-PKGMESSAGE= ${WRKDIR}/pkg-message
+SUB_FILES= pkg-message
ALL_TARGET= default
@@ -53,9 +53,6 @@
done
post-install:
- @${SED} -e 's,%%DATADIR%%,${DATADIR},' \
- -e 's,%%LOCALBASE%%,${LOCALBASE},' \
- <${.CURDIR}/pkg-message >${PKGMESSAGE}
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message 28 Jun 2004 11:38:12 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
--
-You have to set following enviroment variable before using xpvm
-
- XPVM_ROOT=%%DATADIR%%
- PVM_ROOT=%%LOCALBASE%%/lib/pvm
-
-You can also put them into /etc/login.conf for system-wide defaults.
--
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/xpvm/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 28 Jun 2004 11:38:12 -0000 1.1
+++ pkg-plist 24 Jan 2010 08:26:31 -0000
@@ -1,95 +1,95 @@
bin/xpvm
-share/xpvm/globs.tcl
-share/xpvm/procs.tcl
-share/xpvm/util.tcl
-share/xpvm/xpvm.tcl
-share/xpvm/src/help/author.help
-share/xpvm/src/help/file_halt.help
-share/xpvm/src/help/file_quit.help
-share/xpvm/src/help/hosts.help
-share/xpvm/src/help/options_mode.help
-share/xpvm/src/help/options_tasksort.help
-share/xpvm/src/help/reset.help
-share/xpvm/src/help/tasks_kill.help
-share/xpvm/src/help/tasks_otf.help
-share/xpvm/src/help/tasks_signal.help
-share/xpvm/src/help/tasks_spawn.help
-share/xpvm/src/help/tasks_systasks.help
-share/xpvm/src/help/traces.help
-share/xpvm/src/help/views_call_trace.help
-share/xpvm/src/help/views_msgq.help
-share/xpvm/src/help/views_network.help
-share/xpvm/src/help/views_space_time.help
-share/xpvm/src/help/views_task_output.help
-share/xpvm/src/help/views_tevhist.help
-share/xpvm/src/help/views_utilization.help
-share/xpvm/src/help/xpvm.help
-share/xpvm/src/xbm/adj.xbm
-share/xpvm/src/xbm/aix46k.xbm
-share/xpvm/src/xbm/aix4mp.xbm
-share/xpvm/src/xbm/aix4sp2.xbm
-share/xpvm/src/xbm/alliant.xbm
-share/xpvm/src/xbm/alpha.win32.xbm
-share/xpvm/src/xbm/alpha.xbm
-share/xpvm/src/xbm/alphamp.xbm
-share/xpvm/src/xbm/cm2.xbm
-share/xpvm/src/xbm/cm5.xbm
-share/xpvm/src/xbm/cnvx.xbm
-share/xpvm/src/xbm/convex.xbm
-share/xpvm/src/xbm/cray.xbm
-share/xpvm/src/xbm/cspp.xbm
-share/xpvm/src/xbm/dec5200.xbm
-share/xpvm/src/xbm/dummy_arch.xbm
-share/xpvm/src/xbm/fastfwd.xbm
-share/xpvm/src/xbm/fwd.xbm
-share/xpvm/src/xbm/fwdstep.xbm
-share/xpvm/src/xbm/grow.xbm
-share/xpvm/src/xbm/hppa.xbm
-share/xpvm/src/xbm/i860.xbm
-share/xpvm/src/xbm/ipsc2.xbm
-share/xpvm/src/xbm/ksr1.xbm
-share/xpvm/src/xbm/laptop.xbm
-share/xpvm/src/xbm/linux.xbm
-share/xpvm/src/xbm/linuxalpha.xbm
-share/xpvm/src/xbm/linuxsparc.xbm
-share/xpvm/src/xbm/next.xbm
-share/xpvm/src/xbm/os2.xbm
-share/xpvm/src/xbm/penguin.xbm
-share/xpvm/src/xbm/pgon.xbm
-share/xpvm/src/xbm/pmax.xbm
-share/xpvm/src/xbm/ptrd.xbm
-share/xpvm/src/xbm/ptrl.xbm
-share/xpvm/src/xbm/ptrr.xbm
-share/xpvm/src/xbm/ptru.xbm
-share/xpvm/src/xbm/rewind.xbm
-share/xpvm/src/xbm/rs6k.xbm
-share/xpvm/src/xbm/rs6kmp.xbm
-share/xpvm/src/xbm/sequent.xbm
-share/xpvm/src/xbm/sgi.xbm
-share/xpvm/src/xbm/sgi5.xbm
-share/xpvm/src/xbm/sgi6.xbm
-share/xpvm/src/xbm/sgi64.xbm
-share/xpvm/src/xbm/sgimp.xbm
-share/xpvm/src/xbm/sgimp6.xbm
-share/xpvm/src/xbm/sgimp64.xbm
-share/xpvm/src/xbm/shrink.xbm
-share/xpvm/src/xbm/smile.xbm
-share/xpvm/src/xbm/sparc.xbm
-share/xpvm/src/xbm/spin.xbm
-share/xpvm/src/xbm/spin2.xbm
-share/xpvm/src/xbm/spin3.xbm
-share/xpvm/src/xbm/spin4.xbm
-share/xpvm/src/xbm/stop.xbm
-share/xpvm/src/xbm/sun3.xbm
-share/xpvm/src/xbm/sun4.xbm
-share/xpvm/src/xbm/sun4sol2.xbm
-share/xpvm/src/xbm/sunmp.xbm
-share/xpvm/src/xbm/symmetry.xbm
-share/xpvm/src/xbm/win32.xbm
-share/xpvm/src/xbm/zoom.swipe.l.xbm
-share/xpvm/src/xbm/zoom.swipe.r.xbm
-share/xpvm/src/xbm/zoom.swipe.xbm
-@dirrm share/xpvm/src/xbm
-@dirrm share/xpvm/src/help
-@dirrm share/xpvm/src
-@dirrm share/xpvm
+%%DATADIR%%/globs.tcl
+%%DATADIR%%/procs.tcl
+%%DATADIR%%/util.tcl
+%%DATADIR%%/xpvm.tcl
+%%DATADIR%%/src/help/author.help
+%%DATADIR%%/src/help/file_halt.help
+%%DATADIR%%/src/help/file_quit.help
+%%DATADIR%%/src/help/hosts.help
+%%DATADIR%%/src/help/options_mode.help
+%%DATADIR%%/src/help/options_tasksort.help
+%%DATADIR%%/src/help/reset.help
+%%DATADIR%%/src/help/tasks_kill.help
+%%DATADIR%%/src/help/tasks_otf.help
+%%DATADIR%%/src/help/tasks_signal.help
+%%DATADIR%%/src/help/tasks_spawn.help
+%%DATADIR%%/src/help/tasks_systasks.help
+%%DATADIR%%/src/help/traces.help
+%%DATADIR%%/src/help/views_call_trace.help
+%%DATADIR%%/src/help/views_msgq.help
+%%DATADIR%%/src/help/views_network.help
+%%DATADIR%%/src/help/views_space_time.help
+%%DATADIR%%/src/help/views_task_output.help
+%%DATADIR%%/src/help/views_tevhist.help
+%%DATADIR%%/src/help/views_utilization.help
+%%DATADIR%%/src/help/xpvm.help
+%%DATADIR%%/src/xbm/adj.xbm
+%%DATADIR%%/src/xbm/aix46k.xbm
+%%DATADIR%%/src/xbm/aix4mp.xbm
+%%DATADIR%%/src/xbm/aix4sp2.xbm
+%%DATADIR%%/src/xbm/alliant.xbm
+%%DATADIR%%/src/xbm/alpha.win32.xbm
+%%DATADIR%%/src/xbm/alpha.xbm
+%%DATADIR%%/src/xbm/alphamp.xbm
+%%DATADIR%%/src/xbm/cm2.xbm
+%%DATADIR%%/src/xbm/cm5.xbm
+%%DATADIR%%/src/xbm/cnvx.xbm
+%%DATADIR%%/src/xbm/convex.xbm
+%%DATADIR%%/src/xbm/cray.xbm
+%%DATADIR%%/src/xbm/cspp.xbm
+%%DATADIR%%/src/xbm/dec5200.xbm
+%%DATADIR%%/src/xbm/dummy_arch.xbm
+%%DATADIR%%/src/xbm/fastfwd.xbm
+%%DATADIR%%/src/xbm/fwd.xbm
+%%DATADIR%%/src/xbm/fwdstep.xbm
+%%DATADIR%%/src/xbm/grow.xbm
+%%DATADIR%%/src/xbm/hppa.xbm
+%%DATADIR%%/src/xbm/i860.xbm
+%%DATADIR%%/src/xbm/ipsc2.xbm
+%%DATADIR%%/src/xbm/ksr1.xbm
+%%DATADIR%%/src/xbm/laptop.xbm
+%%DATADIR%%/src/xbm/linux.xbm
+%%DATADIR%%/src/xbm/linuxalpha.xbm
+%%DATADIR%%/src/xbm/linuxsparc.xbm
+%%DATADIR%%/src/xbm/next.xbm
+%%DATADIR%%/src/xbm/os2.xbm
+%%DATADIR%%/src/xbm/penguin.xbm
+%%DATADIR%%/src/xbm/pgon.xbm
+%%DATADIR%%/src/xbm/pmax.xbm
+%%DATADIR%%/src/xbm/ptrd.xbm
+%%DATADIR%%/src/xbm/ptrl.xbm
+%%DATADIR%%/src/xbm/ptrr.xbm
+%%DATADIR%%/src/xbm/ptru.xbm
+%%DATADIR%%/src/xbm/rewind.xbm
+%%DATADIR%%/src/xbm/rs6k.xbm
+%%DATADIR%%/src/xbm/rs6kmp.xbm
+%%DATADIR%%/src/xbm/sequent.xbm
+%%DATADIR%%/src/xbm/sgi.xbm
+%%DATADIR%%/src/xbm/sgi5.xbm
+%%DATADIR%%/src/xbm/sgi6.xbm
+%%DATADIR%%/src/xbm/sgi64.xbm
+%%DATADIR%%/src/xbm/sgimp.xbm
+%%DATADIR%%/src/xbm/sgimp6.xbm
+%%DATADIR%%/src/xbm/sgimp64.xbm
+%%DATADIR%%/src/xbm/shrink.xbm
+%%DATADIR%%/src/xbm/smile.xbm
+%%DATADIR%%/src/xbm/sparc.xbm
+%%DATADIR%%/src/xbm/spin.xbm
+%%DATADIR%%/src/xbm/spin2.xbm
+%%DATADIR%%/src/xbm/spin3.xbm
+%%DATADIR%%/src/xbm/spin4.xbm
+%%DATADIR%%/src/xbm/stop.xbm
+%%DATADIR%%/src/xbm/sun3.xbm
+%%DATADIR%%/src/xbm/sun4.xbm
+%%DATADIR%%/src/xbm/sun4sol2.xbm
+%%DATADIR%%/src/xbm/sunmp.xbm
+%%DATADIR%%/src/xbm/symmetry.xbm
+%%DATADIR%%/src/xbm/win32.xbm
+%%DATADIR%%/src/xbm/zoom.swipe.l.xbm
+%%DATADIR%%/src/xbm/zoom.swipe.r.xbm
+%%DATADIR%%/src/xbm/zoom.swipe.xbm
+@dirrm %%DATADIR%%/src/xbm
+@dirrm %%DATADIR%%/src/help
+@dirrm %%DATADIR%%/src
+@dirrm %%DATADIR%%
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in 24 Jan 2010 08:26:31 -0000
@@ -0,0 +1,8 @@
+-
+You have to set following enviroment variable before using xpvm
+
+ XPVM_ROOT=%%DATADIR%%
+ PVM_ROOT=%%LOCALBASE%%/lib/pvm
+
+You can also put them into /etc/login.conf for system-wide defaults.
+-
--- xpvm-1.2.5_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001240828.o0O8SNci009662>