From 0258f722b5566440f1d84d80937afa864c3ff209 Mon Sep 17 00:00:00 2001
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Mon, 29 Oct 2012 15:57:24 +0000
Subject: - Force at least one database option to be selected - Fix PGSQL
 option (WITH_PGSQL -> USE_PGSQL) - Drop indefinite article from COMMENT - Add
 LICENSE (2-clause BSD) and remove from PORTDOCS - Add USE_GETTEXT to silence
 some portlint(1) warnings

Approved by:	makc, avilla (mentors, implicit)
Feature safe:	yes
---
 mail/vexim/Makefile  | 14 ++++++++++----
 mail/vexim/pkg-plist |  1 -
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'mail/vexim')

diff --git a/mail/vexim/Makefile b/mail/vexim/Makefile
index c92103725698..fa94a759e23d 100644
--- a/mail/vexim/Makefile
+++ b/mail/vexim/Makefile
@@ -9,7 +9,10 @@ MASTER_SITES=	http://silverwraith.com/vexim/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A web interface for managing virtual domains for exim
+COMMENT=	Web interface for managing virtual domains for exim
+
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 
@@ -19,8 +22,11 @@ WRKSRC=		${WRKDIR}/vexim2
 SUB_FILES=	pkg-message
 NO_BUILD=	yes
 USE_PHP=	gettext session posix
+USE_GETTEXT=	yes
 
-OPTIONS_DEFINE=	MYSQL PGSQL DOCS
+OPTIONS_MULTI=		DB
+OPTIONS_MULTI_DB=	MYSQL PGSQL
+OPTIONS_DEFINE=		DOCS
 OPTIONS_DEFAULT=	MYSQL
 
 .include <bsd.port.options.mk>
@@ -31,7 +37,7 @@ USE_PHP+=	mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-WITH_PGSQL=	yes
+USE_PGSQL=	yes
 USE_PHP+=	pgsql
 .endif
 
@@ -56,7 +62,7 @@ do-install:
 		-type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
 		-o \! -path '*.svn*' -type f \
 		-exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-.for i in INSTALL LICENSE README TODO
+.for i in INSTALL README TODO
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
diff --git a/mail/vexim/pkg-plist b/mail/vexim/pkg-plist
index 348e61d6857e..b8cf50625441 100644
--- a/mail/vexim/pkg-plist
+++ b/mail/vexim/pkg-plist
@@ -14,7 +14,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/vexim-acl-check-rcpt.conf
 %%PORTDOCS%%%%DOCSDIR%%/docs/vexim-acl-check-spf.conf
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/docs/vexim-group-router.conf
-- 
cgit v1.2.3