svn commit: r306028 - head/mail/dbmail

[Ruslan Mahmatkhanov]

Author: rm
Date: Wed Oct 17 17:54:34 2012
New Revision: 306028
URL: http://svn.freebsd.org/changeset/ports/306028

Log:
  - remove quotes from option description
  
  while here:
  - trim Makefile header
  - convert DOCS case to optionsng
  - remove conflicts with dbmail 2.0, that is not in the tree
  - tab -> space change in pkg-descr:WWW
  
  PR:		172611
  Submitted by:	Alan Hicks <ahicks at p-o.co dot uk> (maintainer)
  Feature safe:	yes

Modified:
  head/mail/dbmail/Makefile
  head/mail/dbmail/pkg-descr

Modified: head/mail/dbmail/Makefile
==============================================================================
--- head/mail/dbmail/Makefile	Wed Oct 17 17:27:46 2012	(r306027)
+++ head/mail/dbmail/Makefile	Wed Oct 17 17:54:34 2012	(r306028)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	dbmail
-# Date created:				07/26/2003
-# Whom:					Clement Laforet <sheepkiller at cultdeadsheep.org>
-#
+# Created by: Clement Laforet <sheepkiller at cultdeadsheep.org>
 # $FreeBSD$
-#
 
 PORTNAME=	dbmail
 PORTVERSION=	3.0.2
@@ -16,23 +12,24 @@ COMMENT=	An SQL database-based mail syst
 
 LICENSE=	GPLv2
 
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-		xmlto:${PORTSDIR}/textproc/xmlto
-.endif
 LIB_DEPENDS=	gmime-2.4:${PORTSDIR}/mail/gmime24 \
 		zdb:${PORTSDIR}/databases/libzdb \
 		mhash:${PORTSDIR}/security/mhash \
 		event:${PORTSDIR}/devel/libevent
 
-CONFLICTS=	dbmail-*-2.0.* dbmail-2.*
+CONFLICTS=	dbmail-2.*
 
 OPTIONS_DEFINE=	LDAP SIEVE THREADS
 OPTIONS_DEFAULT=	THREADS
-SIEVE_DESC=	"Build with support for Sieve mail sorting language"
+SIEVE_DESC=	Build with support for Sieve mail sorting language
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
+		xmlto:${PORTSDIR}/textproc/xmlto
+.endif
+
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
@@ -46,7 +43,7 @@ CONFIGURE_ARGS+=	--with-zdb=${LOCALBASE}
 MAKE_ARGS+=	mandir=${MANPREFIX}/man
 
 PORTDOCS=	AUTHORS BUGS INSTALL THANKS UPGRADING
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 MAN1=		dbmail-deliver.1 dbmail.1
 MAN5=		dbmail.conf.5
 MAN8=		dbmail-export.8 dbmail-httpd.8 dbmail-imapd.8 \
@@ -62,7 +59,7 @@ PLIST_SUB+=	DBMAIL_USER="${DBMAIL_USER}"
 		DBMAIL_GROUP="${DBMAIL_GROUP}" \
 		PIDDIR="${PIDDIR}"
 
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 PLIST_SUB+=	PORTDOCS="@comment "
 .else
 PLIST_SUB+=	PORTDOCS=""
@@ -91,7 +88,7 @@ EXTRA_PATCHES=	${FILESDIR}/extra-patch-a
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=	--enable-manpages
 .endif
 
@@ -108,7 +105,7 @@ post-install:
 	done
 	@${MKDIR} ${PIDDIR}
 	@${CHOWN} ${DBMAIL_USER}:${DBMAIL_GROUP} ${PIDDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} * ${DOCSDIR})

Modified: head/mail/dbmail/pkg-descr
==============================================================================
--- head/mail/dbmail/pkg-descr	Wed Oct 17 17:27:46 2012	(r306027)
+++ head/mail/dbmail/pkg-descr	Wed Oct 17 17:54:34 2012	(r306028)
@@ -21,4 +21,4 @@ PostgreSQL or SQLite).
   Changes on a Dbmail system (adding of users, changing passwords etc.) are
   effective immediately.
 
-WWW:	http://www.dbmail.org/
+WWW: http://www.dbmail.org/