- Select MySQL/PGSQL via OPTIONS

- RUN_DEPEND on Apache and Postfix
- Drop custom FETCH_CMD and provide a mirror on my server
- Add www to CATEGORIES
- Adjust COMMENT and pkg-descr
- move pkg-message to files/pkg-message.in, use macros and add it in SUB_FILES
- Bump PORTREVISION for depends change.

3 files changed, 32 insertions, 21 deletions

diff --git a/mail/postfixadmin/Makefile b/mail/postfixadmin/Makefile
index d32925a2960b..ac4683b04097 100644
--- a/mail/postfixadmin/Makefile
+++ b/mail/postfixadmin/Makefile
@@ -7,27 +7,42 @@
 
 PORTNAME=	postfixadmin
 PORTVERSION=	2.1.0
-PORTREVISION=	1
-CATEGORIES=	mail
+PORTREVISION=	2
+CATEGORIES=	mail www
 MASTER_SITES=	http://high5.net/postfixadmin/ \
-		http://high5.net/postfixadmin/download.php?file=
+		http://sce-tindy.tecnik93.com/FreeBSD/ports/${PORTNAME}/sources/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	itetcu@FreeBSD.org
-COMMENT=	PHP frontend to postfix and mySQL
+COMMENT=	PHP web-based management tool for Postfix virtual domains and users
 
 WANT_PHP_PEAR=	yes
 NO_BUILD=	yes
+USE_APACHE=	1.3+
 
-FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-FETCH_CMD?=	/usr/bin/fetch -AR
+SUB_FILES+=	pkg-message
 
-.if defined (WITH_PGSQL)
-USE_PHP=	pgsql
-.else
+OPTIONS=	MYSQL "Use MySQL to store config data" on
+OPTIONS+=	PGSQL "Use PostgresQL to store config data" off
+
+.include <bsd.port.pre.mk>
+
+RUN_DEPENDS+=	postfix>=2[0-9]*:${PORTSDIR}/mail/postfix
+
+.ifndef(WITHOUT_MYSQL)
 USE_PHP=	mysql
 .endif
 
+.ifdef(WITH_PGSQL)
+USE_PHP=	pgsql
+.endif
+
+.ifdef(WITHOUT_MYSQL) && !defined(WITH_PGSQL)
+IGNORE=	needs at least one database backend
+.endif
+
+.include "${PORTSDIR}/Mk/bsd.php.mk"
+
 post-patch:
 		${FIND} ${WRKSRC} -name '*.orig' -delete
 
@@ -59,6 +74,7 @@ post-install:
 		@${CHMOD} 640 ${PREFIX}/www/postfixadmin/admin/*.php
 		@${CHMOD} 640 ${PREFIX}/www/postfixadmin/users/*.php
 		@${CHMOD} 640 ${PREFIX}/www/postfixadmin/templates/*.tpl
-		@${CAT} ${PKGMESSAGE}
+		${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
+# DO NOT DELETE
diff --git a/mail/postfixadmin/pkg-message b/mail/postfixadmin/files/pkg-message.in
index c8125c616fc8..e8a8b7e9cdee 100644
--- a/mail/postfixadmin/pkg-message
+++ b/mail/postfixadmin/files/pkg-message.in
@@ -2,13 +2,13 @@ To Install and use postfixadmin:
 
 1. Create the MySQL Tables
 --------------------------
-In ${PREFIX}/www/postfixadmin/DATABASE.TXT you can find the table
+In %%PREFIX%%/www/postfixadmin/DATABASE.TXT you can find the table
 structure that you need in order to configure Postfix Admin and Postfix
 in general to work with Virtual Domains and Users
 
 2. Configure
 ------------
-Check the ${PREFIX}/www/postfixadmin/config.inc.php file. There you
+Check the %%PREFIX%%/www/postfixadmin/config.inc.php file. There you
 can specify settings that are relevant to your setup.
 
 The default password for the admin part of Postfix Admin is admin/admin.
@@ -19,7 +19,7 @@ that the location of the .htpasswd file matches your path.
 -------------------
 Add a line in your httpd.conf to allow the use of .htaccess file.
 
-<Directory "/usr/local/www/postfixadmin">
+<Directory "%%PREFIX%%/www/postfixadmin">
 	Options Indexes
 	AllowOverride AuthConfig
 </Directory>
diff --git a/mail/postfixadmin/pkg-descr b/mail/postfixadmin/pkg-descr
index a0d9da2d94df..64d0b771c71e 100644
--- a/mail/postfixadmin/pkg-descr
+++ b/mail/postfixadmin/pkg-descr
@@ -1,15 +1,10 @@
 Postfix Admin is a Web Based Management tool for Postfix when you
 are dealing with Postfix Style Virtual Domains and Virtual Users
-that are stored in MySQL. It's written in PHP.
+that are stored in MySQL or Postgres. It's written in PHP.
 
 Postfix Admin supports:
 	- Virtual Mailboxes / Virtual Aliases / Forwarders.
 	- Domain to Domain forwarding / Catch-All.
 	- Vacation for Virtual Mailboxes (with the additional module).
-Requirements:
-	- Postfix 2.0 or higher.
-	- Apache 1.3.27 or higher.
-	- PHP 4.1 or higher.
-	- MySQL 3.23.55 or higher.
 
-WWW:	http://www.high5.net/postfixadmin
+WWW:	http://high5.net/postfixadmin/