Date: Sat, 23 Jan 2010 01:54:37 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: eugen@grosbein.pp.ru Subject: ports/143096: [PATCH] net/AquaGatekeeper: use $SUB_FILES to dynamically adjust pkg-message Message-ID: <201001230154.o0N1sbpp004501@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001230200.o0N20DWM043452@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143096
>Category: ports
>Synopsis: [PATCH] net/AquaGatekeeper: use $SUB_FILES to dynamically adjust pkg-message
>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: Sat Jan 23 02:00:13 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:
don't invoke sed manually, use SUB_FILES
use EXAMPLESDIR in pkg-message instead of %%PREFIX%%/share/examples/AquaGatekeeper
Added file(s):
- files/pkg-message.in
Removed file(s):
- pkg-message
Port maintainer (eugen@grosbein.pp.ru) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- AquaGatekeeper-1.22_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/AquaGatekeeper/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 5 Jan 2009 21:36:37 -0000 1.13
+++ Makefile 23 Jan 2010 01:52:01 -0000
@@ -23,6 +23,22 @@
RESTRICTED= No commercial redistribution
+SUB_FILES= pkg-message
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+DISTNAME= AquaGatekeeper122FreeBSDamd64Build131
+.else
+DISTNAME= AquaGatekeeper122FreeBSDBuild445
+.endif
+
+.if ${ARCH} == "i386"
+LIB_DEPENDS= c.4:${PORTSDIR}/misc/compat4x
+.elif ${ARCH} == "amd64"
+LIB_DEPENDS= c.5:${PORTSDIR}/misc/compat5x
+.endif
+
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
IS_INTERACTIVE= yes
.endif
@@ -46,20 +62,6 @@
post-install:
@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- @${SED} "s'%%PREFIX%%'${PREFIX}'" < pkg-message
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-LIB_DEPENDS= c.4:${PORTSDIR}/misc/compat4x
-.elif ${ARCH} == "amd64"
-LIB_DEPENDS= c.5:${PORTSDIR}/misc/compat5x
-.endif
-
-.if ${ARCH} == "amd64"
-DISTNAME= AquaGatekeeper122FreeBSDamd64Build131
-.else
-DISTNAME= AquaGatekeeper122FreeBSDBuild445
-.endif
+ @{CAT} ${PKG-MESSAGE}
.include <bsd.port.post.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message 2 Nov 2003 17:37:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-****************************************************************************
- Please read documentation located in %%PREFIX%%/share/doc/AquaGatekeeper
- You will need to write configuration file to run the Gatekeeper.
- Some examples are in %%PREFIX%%/share/examples/AquaGatekeeper
-****************************************************************************
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 23 Jan 2010 01:52:01 -0000
@@ -0,0 +1,5 @@
+****************************************************************************
+ Please read documentation located in %%EXAMPLESDIR%%
+ You will need to write configuration file to run the Gatekeeper.
+ Some examples are in %%EXAMPLESDIR%%
+****************************************************************************
--- AquaGatekeeper-1.22_3.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?201001230154.o0N1sbpp004501>