Date: Wed, 13 Jan 2010 23:40:53 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: leeym@FreeBSD.org Subject: ports/142798: [PATCH] mail/pop3vscan: use $SUB_FILES to dynamically adjust pkg-message Message-ID: <201001132340.o0DNerwG059263@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001132350.o0DNo1c4076357@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142798
>Category: ports
>Synopsis: [PATCH] mail/pop3vscan: 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: Wed Jan 13 23:50:01 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:
use SUB_FILES to adjust pkg-message
use LOCALBASE instead of PREFIX in CFLAGS & LDFLAGS
use PLIST_FILES instead of a seperate file
Added file(s):
- files/pkg-message.in
Removed file(s):
- pkg-message
- pkg-plist
Port maintainer (leeym@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- pop3vscan-0.4_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/pop3vscan/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 22 Aug 2009 00:27:52 -0000 1.9
+++ Makefile 13 Jan 2010 23:32:36 -0000
@@ -20,6 +20,13 @@
MAKE_ENV= _LDFLAGS="${LDFLAGS}"
SCRIPTS_ENV= PKG_PREFIX=${PREFIX} NONEXISTENT=${NONEXISTENT} PASSWD=/etc/passwd
+PLIST_FILES= etc/pop3vscan.conf.sample \
+ etc/pop3vscan.mail.sample \
+ etc/rc.d/pop3vscan.sh \
+ sbin/pop3vscan
+
+SUB_FILES= pkg-message
+
post-extract:
@${RM} ${WRKSRC}/ripmime/ripmime.a
@@ -38,6 +45,6 @@
post-install:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- @${SED} -e 's,PREFIX,${PREFIX},g' ${PKGMESSAGE}
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message 28 Feb 2004 15:23:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-**********************************************************************
-
-By default, POP3VScan is configured to work with McAfee UVSCAN.
-Please copy PREFIX/etc/pop3vscan.conf.sample to pop3vscan.conf and modify
-PREFIX/etc/pop3vscan.conf and/or PREFIX/etc/rc.d/pop3vscan.sh to
-fit your environment.
-
-Don't forget to copy PREFIX/etc/pop3vscan.mail.sample to pop3vscan.mail
-and edit your own template for virus notifications.
-
-By the way, you need to enable the IPFIREWALL opion in kernel. Please note,
-that IPFIREWALL_FORWARD might be needed on older systems as well.
-Then add the following forwarding rule into your IPFW table,
-
-# ipfw add fwd 192.168.0.254,8110 tcp from 192.168.0.0/24 to any pop3
-
-where 192.168.0.254 is the IP of your internal interface, 8110 is the
-default port of POP3VScan, and 192.168.0.0/24 is the IP range of your LAN.
-
-**********************************************************************
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist 3 Jun 2003 07:54:47 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-etc/pop3vscan.conf.sample
-etc/pop3vscan.mail.sample
-etc/rc.d/pop3vscan.sh
-sbin/pop3vscan
Index: files/patch-Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/pop3vscan/files/patch-Makefile,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile
--- files/patch-Makefile 6 Jun 2003 03:31:30 -0000 1.2
+++ files/patch-Makefile 13 Jan 2010 23:32:36 -0000
@@ -9,8 +9,8 @@
#CFLAGS=-Wall -ggdb
-CFLAGS=-Wall -O2
-LDFLAGS=-L. -lmime -lpcre #-static
-+CFLAGS=-Wall -O2 -I$(PREFIX)/include -DPREFIX=\"${PREFIX}\"
-+LDFLAGS=-L. -lmime -lpcre -L$(PREFIX)/lib $(_LDFLAGS) #-static
++CFLAGS=-Wall -O2 -I$(LOCALBASE)/include -DPREFIX=\"${PREFIX}\"
++LDFLAGS=-L. -lmime -lpcre -L$(LOCALBASE)/lib $(_LDFLAGS) #-static
OBJECTS=getline.o parsefile.o pop3vscan.o \
scanner_basic.o scanner_avpd.o scanner_trophie.o
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 13 Jan 2010 23:32:36 -0000
@@ -0,0 +1,20 @@
+**********************************************************************
+
+By default, POP3VScan is configured to work with McAfee UVSCAN.
+Please copy %%PREFIX%%/etc/pop3vscan.conf.sample to pop3vscan.conf and modify
+%%PREFIX%%/etc/pop3vscan.conf and/or %%PREFIX%%/etc/rc.d/pop3vscan.sh to
+fit your environment.
+
+Don't forget to copy %%PREFIX%%/etc/pop3vscan.mail.sample to pop3vscan.mail
+and edit your own template for virus notifications.
+
+By the way, you need to enable the IPFIREWALL opion in kernel. Please note,
+that IPFIREWALL_FORWARD might be needed on older systems as well.
+Then add the following forwarding rule into your IPFW table,
+
+# ipfw add fwd 192.168.0.254,8110 tcp from 192.168.0.0/24 to any pop3
+
+where 192.168.0.254 is the IP of your internal interface, 8110 is the
+default port of POP3VScan, and 192.168.0.0/24 is the IP range of your LAN.
+
+**********************************************************************
--- pop3vscan-0.4_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?201001132340.o0DNerwG059263>