Date: Thu, 14 Jan 2010 02:51:04 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: pgollucci@FreeBSD.org Subject: ports/142808: [PATCH] mail/spamass-milter: use $SUB_FILES to dynamically adjust pkg-message Message-ID: <201001140251.o0E2p4qt009951@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001140300.o0E309Sj040922@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142808
>Category: ports
>Synopsis: [PATCH] mail/spamass-milter: 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: Thu Jan 14 03:00:09 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:
no need to invoke sed manually, SUB_FILES will take care of this.
Added file(s):
- files/pkg-message.in
Removed file(s):
- pkg-message
Port maintainer (pgollucci@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- spamass-milter-0.3.1_8.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/spamass-milter/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile 11 Jan 2010 22:53:50 -0000 1.35
+++ Makefile 14 Jan 2010 02:50:33 -0000
@@ -88,7 +88,7 @@
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
-PKGMESSAGE= ${WRKDIR}/pkg-message
+SUB_FILES= pkg-message
MAN1= spamass-milter.1
@@ -124,8 +124,6 @@
.if !defined(WITHOUT_LDAP) && defined(WITH_LDAP)
@${REINPLACE_CMD} -e 's|-lmilter|-lmilter -lldap|g' ${WRKSRC}/configure
.endif
- @${SED} -e's,%%DOCSDIR%%,${DOCSDIR},g' \
- ${MASTERDIR}/pkg-message > ${PKGMESSAGE}
post-install:
.if !defined(NOPORTDOCS)
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message 28 Aug 2005 13:04:20 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-
-------------------------------------------------------------------------
-spamass-milter has been installed, but it must be activated manually.
-Please refer to...
-
- %%DOCSDIR%%/activation.txt
-
-...for details.
-
-You may also want to tweak your spamd rc.subr(8) startup flags to
-specify a username to switch credentials to when delivering mail, if
-applicable.
-------------------------------------------------------------------------
-
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 14 Jan 2010 02:50:33 -0000
@@ -0,0 +1,14 @@
+
+------------------------------------------------------------------------
+spamass-milter has been installed, but it must be activated manually.
+Please refer to...
+
+ %%DOCSDIR%%/activation.txt
+
+...for details.
+
+You may also want to tweak your spamd rc.subr(8) startup flags to
+specify a username to switch credentials to when delivering mail, if
+applicable.
+------------------------------------------------------------------------
+
--- spamass-milter-0.3.1_8.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?201001140251.o0E2p4qt009951>