Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Oct 2012 15:57:24 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306621 - head/mail/vexim
Message-ID:  <201210291557.q9TFvO2Z093321@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhale
Date: Mon Oct 29 15:57:24 2012
New Revision: 306621
URL: http://svn.freebsd.org/changeset/ports/306621

Log:
  - 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

Modified:
  head/mail/vexim/Makefile   (contents, props changed)
  head/mail/vexim/pkg-plist   (contents, props changed)

Modified: head/mail/vexim/Makefile
==============================================================================
--- head/mail/vexim/Makefile	Mon Oct 29 15:08:30 2012	(r306620)
+++ head/mail/vexim/Makefile	Mon Oct 29 15:57:24 2012	(r306621)
@@ -9,7 +9,10 @@ MASTER_SITES=	http://silverwraith.com/ve
 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

Modified: head/mail/vexim/pkg-plist
==============================================================================
--- head/mail/vexim/pkg-plist	Mon Oct 29 15:08:30 2012	(r306620)
+++ head/mail/vexim/pkg-plist	Mon Oct 29 15:57:24 2012	(r306621)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210291557.q9TFvO2Z093321>