Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Jan 2010 23:20:52 GMT
From:      Sevan Janiyan <venture37@geeklan.co.uk>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        tota@rtfm.jp
Subject:   ports/142732: [PATCH] mail/ilohamail: use $SUB_FILES to dynamically adjust pkg-message 
Message-ID:  <201001112320.o0BNKq28003492@newbie.thingamajig-systems.co.uk>
Resent-Message-ID: <201001112330.o0BNU7HP079167@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         142732
>Category:       ports
>Synopsis:       [PATCH] mail/ilohamail: 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:   Mon Jan 11 23:30:07 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.

Added file(s):
- files/pkg-message.in

Removed file(s):
- pkg-message

Port maintainer (tota@rtfm.jp) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- ilohamail-0.8.13_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/ilohamail/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	22 Aug 2009 00:27:46 -0000	1.4
+++ Makefile	11 Jan 2010 23:20:24 -0000
@@ -33,7 +33,8 @@
 .endif
 
 PLIST_SUB+=	ILOHADIR="${ILOHADIR:S,^${PREFIX}/,,}"
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+SUB_LIST=	ILOHADIR=${ILOHADIR}
 
 pre-everything::
 	@${ECHO_MSG} ""
@@ -55,10 +56,6 @@
 .endif
 
 post-install:
-	@${SED} -e 's|%%ILOHADIR%%|${ILOHADIR}|g' \
-		-e 's|%%DATADIR%%|${DATADIR}|g' \
-		-e 's|%%DOCSDIR%%|${DOCSDIR}|g' \
-		< ${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	28 Feb 2004 11:19:44 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-==========================================================================
-IlohaMail has now been installed.
-
-Create a redirect one of the following methods:
- - add an alias to apache's httpd.conf pointing to %%ILOHADIR%%/source
- - create a VirtualHost with DocumentRoot set to %%ILOHADIR%%/source
- - make a symbolic link to %%ILOHADIR%%/source
-
-Check your PHP.ini file.  You need:
- - short_open_tag = On
- - file_uploads = On
-
-Edit %%ILOHADIR%%/conf/conf.inc and
-%%ILOHADIR%%/conf/login.inc files as necessary.
-
-Using the MySQL back-end is also recommended.
-
-  1. Create database user who has rights on webmail database manipulation
-     by following "sample" mysql commands:
-
-     $ mysql -u root -p
-     mysql> use mysql;
-     mysql> grant select,insert,update,delete,index,
-         -> alter,create,drop,references, lock tables,
-         -> create temporary tables on webmail.* to webmail@localhost
-         -> identified by 'password';
-     mysql> flush privileges;
-
-  2. Create a MySQL database.
-     $ mysqladmin create webmail
-
-  3. Create tables.
-     $ mysql webmail < %%DATADIR%%/MySQL/sql
-
-  4. Configure %%ILOHADIR%%/conf/db_conf.php.
-
-  5. Set value of $backend in %%ILOHADIR%%/conf/conf.inc from "FS" to "DB".
-
-For more complete database setup, post-installation instructions
-please read IlohaMail Guide in %%DOCSDIR%%/Manual.
-==========================================================================
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	11 Jan 2010 23:20:24 -0000
@@ -0,0 +1,41 @@
+==========================================================================
+IlohaMail has now been installed.
+
+Create a redirect one of the following methods:
+ - add an alias to apache's httpd.conf pointing to %%ILOHADIR%%/source
+ - create a VirtualHost with DocumentRoot set to %%ILOHADIR%%/source
+ - make a symbolic link to %%ILOHADIR%%/source
+
+Check your PHP.ini file.  You need:
+ - short_open_tag = On
+ - file_uploads = On
+
+Edit %%ILOHADIR%%/conf/conf.inc and
+%%ILOHADIR%%/conf/login.inc files as necessary.
+
+Using the MySQL back-end is also recommended.
+
+  1. Create database user who has rights on webmail database manipulation
+     by following "sample" mysql commands:
+
+     $ mysql -u root -p
+     mysql> use mysql;
+     mysql> grant select,insert,update,delete,index,
+         -> alter,create,drop,references, lock tables,
+         -> create temporary tables on webmail.* to webmail@localhost
+         -> identified by 'password';
+     mysql> flush privileges;
+
+  2. Create a MySQL database.
+     $ mysqladmin create webmail
+
+  3. Create tables.
+     $ mysql webmail < %%DATADIR%%/MySQL/sql
+
+  4. Configure %%ILOHADIR%%/conf/db_conf.php.
+
+  5. Set value of $backend in %%ILOHADIR%%/conf/conf.inc from "FS" to "DB".
+
+For more complete database setup, post-installation instructions
+please read IlohaMail Guide in %%DOCSDIR%%/Manual.
+==========================================================================
--- ilohamail-0.8.13_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?201001112320.o0BNKq28003492>