Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Dec 2012 16:45:09 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r309249 - head/www/hastymail2
Message-ID:  <201212191645.qBJGj91J039282@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Wed Dec 19 16:45:09 2012
New Revision: 309249
URL: http://svnweb.freebsd.org/changeset/ports/309249

Log:
  - Convert to optionsNG
  - Strip Makefile header

Modified:
  head/www/hastymail2/Makefile

Modified: head/www/hastymail2/Makefile
==============================================================================
--- head/www/hastymail2/Makefile	Wed Dec 19 16:23:55 2012	(r309248)
+++ head/www/hastymail2/Makefile	Wed Dec 19 16:45:09 2012	(r309249)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	hastymail
-# Date created:		2006-11-04
-# Whom:			Bartlomiej Rutkowski <r@robakdesign.com>
-#
+# Created by: Bartlomiej Rutkowski <r@robakdesign.com>
 # $FreeBSD$
-#
 
 PORTNAME=	hastymail2
 PORTVERSION=	1.1
@@ -21,7 +17,7 @@ LICENSE=	GPLv2
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
-CONFLICTS=      hastymail-* hastymail2-devel-*
+CONFLICTS=	hastymail-* hastymail2-devel-*
 
 PLIST=		${WRKDIR}/pkg-plist
 
@@ -33,37 +29,36 @@ WRKSRC=		${WRKDIR}/${PORTNAME}_${WIKEDVE
 NO_BUILD=	yes
 FIND_SKIP_OPTS=	-not -name hastymail2.conf.example -not -name '*.orig'
 
-OPTIONS=	PGSQL	"Use PostgreSQL" off \
-		MYSQL	"Use MySQL" off \
-		DB	"Use older pear DB (instead of MDB2)" off \
-		ICONV	"Support character set conversion" off \
-		MBSTRING "Support multi-byte character sets" off
+OPTIONS_DEFINE=	PGSQL MYSQL DB ICONV MBSTRING
 
-.include <bsd.port.pre.mk>
+DB_DESC=	Use older pear DB (instead of MDB2)
+MBSTRING_DESC=	Support multi-byte character sets
 
-.if defined(WITH_MYSQL)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
-.if !defined(WITH_DB)
+.if ! ${PORT_OPTIONS:MDB}
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/databases/pear-MDB2_Driver_mysql
 .endif
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
-.if !defined(WITH_DB)
+.if ! ${PORT_OPTIONS:MDB}
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql
 .endif
 .endif
 
-.if defined(WITH_DB) && (defined(WITH_MYSQL) || defined(WITH_PGSQL))
+.if ${PORT_OPTIONS:MDB} && (${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL})
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 .endif
 
-.if defined(WITH_ICONV)
+.if ${PORT_OPTIONS:MICONV}
 USE_PHP+=	iconv
 .endif
 
-.if defined(WITH_MBSTRING)
+.if ${PORT_OPTIONS:MMBSTRING}
 USE_PHP+=	mbstring
 .endif
 
@@ -93,4 +88,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



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