From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 14 03:00:09 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9485B106568B for ; Thu, 14 Jan 2010 03:00:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5FFA58FC19 for ; Thu, 14 Jan 2010 03:00:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0E309Rp040925 for ; Thu, 14 Jan 2010 03:00:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0E309Sj040922; Thu, 14 Jan 2010 03:00:09 GMT (envelope-from gnats) Resent-Date: Thu, 14 Jan 2010 03:00:09 GMT Resent-Message-Id: <201001140300.o0E309Sj040922@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sevan Janiyan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 194D9106566C for ; Thu, 14 Jan 2010 02:55:07 +0000 (UTC) (envelope-from sevan@newbie.thingamajig-systems.co.uk) Received: from newbie.thingamajig-systems.co.uk (newbie.thingamajig-systems.co.uk [93.97.185.103]) by mx1.freebsd.org (Postfix) with ESMTP id 28A6B8FC13 for ; Thu, 14 Jan 2010 02:54:59 +0000 (UTC) Received: from newbie.thingamajig-systems.co.uk (localhost [127.0.0.1]) by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3) with ESMTP id o0E2p4aV009952; Thu, 14 Jan 2010 02:51:04 GMT (envelope-from sevan@newbie.thingamajig-systems.co.uk) Received: (from root@localhost) by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3/Submit) id o0E2p4qt009951; Thu, 14 Jan 2010 02:51:04 GMT (envelope-from sevan) Message-Id: <201001140251.o0E2p4qt009951@newbie.thingamajig-systems.co.uk> Date: Thu, 14 Jan 2010 02:51:04 GMT From: Sevan Janiyan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: pgollucci@FreeBSD.org Subject: ports/142808: [PATCH] mail/spamass-milter: use $SUB_FILES to dynamically adjust pkg-message X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2010 03:00:09 -0000 >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: