Date: Wed, 13 Jan 2010 22:06:50 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: bg1tpt@gmail.com Subject: ports/142796: [PATCH] mail/phpmailer: use $SUB_FILES to dynamically adjust pkg-message Message-ID: <201001132206.o0DM6owg080093@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001132220.o0DMK1x4097623@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142796
>Category: ports
>Synopsis: [PATCH] mail/phpmailer: 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 22:20: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
adjust pkg-plist
Added file(s):
- files/pkg-message.in
Removed file(s):
- files/pkg-message
Port maintainer (bg1tpt@gmail.com) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- phpmailer-5.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/phpmailer/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 28 Nov 2009 01:10:46 -0000 1.6
+++ Makefile 13 Jan 2010 22:03:02 -0000
@@ -21,10 +21,7 @@
IGNORE_WITH_PHP= 4
USE_PHP= pcre
-PKGMESSAGE= ${WRKDIR}/pkg-message
-MSG_SRC= ${FILESDIR}/pkg-message
-
-MSG_SUB= DATADIR=${DATADIR} LOCALBASE=${LOCALBASE}
+SUB_FILES= pkg-message
do-install:
@${MKDIR} ${DATADIR}
@@ -48,8 +45,6 @@
.endif
post-install:
- @${SED} ${MSG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${MSG_SRC} > \
- ${PKGMESSAGE}
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/phpmailer/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist 28 Nov 2009 01:10:46 -0000 1.5
+++ pkg-plist 13 Jan 2010 22:03:02 -0000
@@ -61,6 +61,6 @@
@dirrm %%DATADIR%%/test
@dirrm %%DATADIR%%/language
@dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images
-%%PORTEXAMPLES%%@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/pkg-message
===================================================================
RCS file: files/pkg-message
diff -N files/pkg-message
--- files/pkg-message 10 Apr 2007 07:29:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-You need to adjust php's include_path to contain `%%DATADIR%%'!
-For example, insert
- include_path = ".:%%DATADIR%%"
-into `%%LOCALBASE%%/etc/php.ini'.
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 22:03:02 -0000
@@ -0,0 +1,4 @@
+You need to adjust php's include_path to contain `%%DATADIR%%'!
+For example, insert
+ include_path = ".:%%DATADIR%%"
+into `%%LOCALBASE%%/etc/php.ini'.
--- phpmailer-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?201001132206.o0DM6owg080093>