From ce2305af6799357159c317fc826d37d8137bfef3 Mon Sep 17 00:00:00 2001
From: Matthew Seaman <matthew@FreeBSD.org>
Date: Mon, 4 Jun 2012 19:25:56 +0000
Subject: - Convert all my remaining ports to OPTIONSng   Files	  affected:

    databases/mysql-connector-java/Makefile
    databases/phpmyadmin/Makefile
    mail/sa-utils/Makefile
    net/phpldapadmin/Makefile
    security/apg/Makefile
    textproc/sphinxsearch/Makefile
    www/p5-RT-Authen-ExternalAuth/Makefile
    www/p5-RT-Extension-LDAPImport/Makefile
    www/p5-RT-Extension-SLA/Makefile
    www/p5-RTx-Calendar/Makefile
    www/rt40/Makefile
    www/rt40/Makefile.cpan
    x11-fonts/gentium/Makefile
    x11-fonts/gentium-basic/Makefile

Approved by:	shaun (mentor)
---
 net/phpldapadmin/Makefile | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'net/phpldapadmin')

diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile
index 4e06a72ccda8..30b08acec145 100644
--- a/net/phpldapadmin/Makefile
+++ b/net/phpldapadmin/Makefile
@@ -22,11 +22,12 @@ USE_PHP=	gettext ldap openssl pcre session xml iconv hash
 DEFAULT_PHP_VER=	5
 IGNORE_WITH_PHP=	4
 
-OPTIONS=	SUPHP	"suPHP support" off
+OPTIONS_DEFINE=	SUPHP
+SUPHP_DESCR=	suPHP support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
+.if ${PORT_OPTIONS:MSUPHP}
 
 PKGNAMESUFFIX+=	-suphp
 RUN_DEPENDS+=	${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp
@@ -38,7 +39,7 @@ WANT_PHP_WEB=	yes
 
 .endif
 
-# USERS is only used WITH_SUPHP
+# USERS is only used when SUPHP option selected
 GROUPS?=	${WWWGRP}
 CFGDIR=		config
 CFGFILE=	config.php
@@ -46,7 +47,7 @@ CFGFILE=	config.php
 PLIST=		${WRKDIR}/plist
 PLIST_SUB+=	PLA_GRP=${GROUPS}
 
-.if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
+.if ${PORT_OPTIONS:MSUPHP}
 
 USERS?=		_pla
 
@@ -61,12 +62,6 @@ SUB_FILES+=	pkg-message
 
 .SILENT:
 
-pre-everything::
-	${ECHO_MSG} ""
-	${ECHO_MSG} "This port is PHP5 specific. If you need PHP4 support,"
-	${ECHO_MSG} "please use the net/phpldapadmin098 port instead."
-	${ECHO_MSG} ""
-
 post-patch:
 	cd ${WRKSRC} ;							    \
 	${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore   \
@@ -101,7 +96,7 @@ install-conf:
 	fi
 
 post-install:
-.if defined(WITH_SUPHP)
+.if ${PORT_OPTIONS:MSUPHP}
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	${CAT} ${PKGMESSAGE}
-- 
cgit v1.2.3