- convert to option NG

- sort pkg-plist

2 files changed, 91 insertions, 94 deletions

diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index a4674f8db0c2..4a68012da7cb 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}_${SNAPDATE}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache Portability Library
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
 
 NO_LATEST_LINK=	yes
 
@@ -22,16 +22,15 @@ SNAPDATE=	20110821151329
 
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	THREADS "Enable Threads in apr"				on  \
-		IPV6	"Enable IPV6 Support in apr"			on  \
-		BDB	"Enable Berkley BDB support in apr-util"	on  \
-		GDBM	"Enable GNU dbm support in apr-util"		on  \
-		MYSQL	"Enable MySQL suport in apr-util"		off \
-		NDBM	"Enable NDBM support in apr-util"		off \
-		PGSQL	"Enable Postgresql suport in apr-util"		off \
-		SQLITE  "Enable SQLite3 support in apr-util"		off \
-		DEVRANDOM "Use /dev/random or compatible in apr"	on \
-		DEVELOPER_ONLY "I want to test apr2 not the maintainer" off
+NO_OPTIONS_SORT=yes
+OPTIONS_DEFINE=	THREADS IPV6 DEVRANDOM BDB GDBM MYSQL NDBM PGSQL SQLITE DEVELOPER_ONLY
+OPTIONS_DEFAULT=THREADS IPV6 DEVRANDOM BDB GDBM
+
+NDBM_DESC=	NDBM support in apr-util
+DEVRANDOM_DESC= Use /dev/random or compatible
+DEVELOPER_ONLY_DESC=	I want to test apr2 not the maintainer
+
+.include <bsd.port.options.mk>
 
 USE_ICONV=		yes
 USE_AUTOTOOLS=	automake autoconf libtool:env
@@ -51,91 +50,89 @@ WRKSRC=	${WRKDIR}/apr
 SHLIB_MAJOR=	0
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-.include <bsd.port.options.mk>
-
-.if !defined(WITH_DEVELOPER_ONLY)
+.if empty(PORT_OPTIONS:MDEVELOPER_ONLY)
 IGNORE=	not for the general public. Maintainer only supports developers of apr
 .endif
 
-.if defined(WITHOUT_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
+CONFIGURE_ARGS+=	--enable-threads
+.else
 CONFIGURE_ARGS+=	--disable-threads
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nothr
-.else
+. else
 PKGNAMESUFFIX=	-nothr
-.endif
-.else
-CONFIGURE_ARGS+=	--enable-threads
+. endif
 .endif
 
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--disable-ipv6
-.else
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ipv6
-.else
+. else
 PKGNAMESUFFIX=	-ipv6
-.endif
+. endif
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if defined(WITHOUT_DEVRANDOM)
-CONFIGURE_ARGS+=	--without-devrandom
-.else
+.if ${PORT_OPTIONS:MDEVRANDOM}
 CONFIGURE_ARGS+=	--with-devrandom
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-devrandom
-.else
+. else
 PKGNAMESUFFIX=	-devrandom
-.endif
+. endif
+.else
+CONFIGURE_ARGS+=	--without-devrandom
 .endif
 
 ######### APR-Util Options
-.if defined(WITHOUT_GDBM)
-PLIST_SUB+=	GDBM="@comment "
-CONFIGURE_ARGS+=	--without-gdbm
-.else
+.if ${PORT_OPTIONS:MGDBM}
 PLIST_SUB+=	GDBM=""
 EXTRAS=	yes
-LIB_DEPENDS+=	gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	gdbm:${PORTSDIR}/databases/gdbm
 CONFIGURE_ARGS+=	--with-gdbm=${LOCALBASE}
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gdbm
-.else
+. else
 PKGNAMESUFFIX=	-gdbm
-.endif
+. endif
+.else
+PLIST_SUB+=	GDBM="@comment "
+CONFIGURE_ARGS+=	--without-gdbm
 .endif
 
-.if defined(WITHOUT_BDB)
-PLIST_SUB+=	BDB="@comment "
-CONFIGURE_ARGS+=	--without-berkeley-db
-.else
+.if ${PORT_OPTIONS:MBDB}
 EXTRAS=	yes
 PLIST_SUB+=	BDB=""
 USE_BDB=	42+
 CONFIGURE_ARGS+=	--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
-.else
+. else
 PKGNAMESUFFIX=	-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
-.endif
+. endif
+.else
+PLIST_SUB+=	BDB="@comment "
+CONFIGURE_ARGS+=	--without-berkeley-db
 .endif
 
-.if defined(WITH_NDBM)
+.if ${PORT_OPTIONS:MNDBM}
 EXTRAS=	yes
 PLIST_SUB+=	NDBM=""
 CONFIGURE_ARGS+=	--with-ndbm=/usr
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ndbm
-.else
+. else
 PKGNAMESUFFIX=	-ndbm
-.endif
+. endif
 .else
 PLIST_SUB+=	NDBM="@comment "
 CONFIGURE_ARGS+=	--without-ndbm
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 EXTRAS=	yes
 PLIST_SUB+=	MYSQL=""
 USE_MYSQL=	YES
@@ -143,42 +140,42 @@ CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 CONFIGURE_ENV+=	LIBS="${LIBS}"
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
 LDFLAGS+=	-L${LOCALBASE}/lib/mysql
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-mysql${MYSQL_VER}
-.else
+. else
 PKGNAMESUFFIX=	-mysql
-.endif
+. endif
 .else
 PLIST_SUB+=	MYSQL="@comment "
 CONFIGURE_ARGS+=	--without-mysql
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 EXTRAS=	yes
 PLIST_SUB+=	PGSQL=""
 USE_PGSQL=	YES
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 CONFIGURE_ENV+=	ac_cv_path_PGSQL_CONFIG=""
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-pgsql${PGSQL_VER}
-.else
+. else
 PKGNAMESUFFIX=	-pgsql
-.endif
+. endif
 .else
 PLIST_SUB+=	PGSQL="@comment "
 CONFIGURE_ARGS+=	--without-pgsql
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 EXTRAS=	yes
 PLIST_SUB+=	SQLITE3=""
 USE_SQLITE=	YES
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-sqlite3
-.else
+. else
 PKGNAMESUFFIX=	-sqlite3
-.endif
+. endif
 .else
 CONFIGURE_ARGS+=	--without-sqlite3
 PLIST_SUB+=	SQLITE3="@comment "
diff --git a/devel/apr2/pkg-plist b/devel/apr2/pkg-plist
index d48ba3c5361d..a292534c51b3 100644
--- a/devel/apr2/pkg-plist
+++ b/devel/apr2/pkg-plist
@@ -1,9 +1,4 @@
 bin/apr-2-config
-%%DATADIR%%/build-2/libtool
-%%DATADIR%%/build-2/mkdir.sh
-%%DATADIR%%/build-2/make_exports.awk
-%%DATADIR%%/build-2/make_var_export.awk
-%%DATADIR%%/build-2/apr_rules.mk
 include/apr-2/apr.h
 include/apr-2/apr_allocator.h
 include/apr-2/apr_anylock.h
@@ -17,7 +12,6 @@ include/apr-2/apr_dbm.h
 include/apr-2/apr_dso.h
 include/apr-2/apr_env.h
 include/apr-2/apr_errno.h
-include/apr-2/apu_errno.h
 include/apr-2/apr_file_info.h
 include/apr-2/apr_file_io.h
 include/apr-2/apr_fnmatch.h
@@ -66,39 +60,45 @@ include/apr-2/apr_want.h
 include/apr-2/apr_xlate.h
 include/apr-2/apr_xml.h
 include/apr-2/apu.h
+include/apr-2/apu_errno.h
 include/apr-2/apu_version.h
 include/apr-2/apu_want.h
-libdata/pkgconfig/apr-2.pc
-lib/apr.exp
-lib/libapr-2.a
-lib/libapr-2.la
-lib/libapr-2.so
-lib/libapr-2.so.%%SHLIB_MAJOR%%
-%%GDBM%%lib/apr-2/apr_dbm_gdbm-2.so
-%%GDBM%%lib/apr-2/apr_dbm_gdbm.so
-%%GDBM%%lib/apr-2/apr_dbm_gdbm.la
-%%GDBM%%lib/apr-2/apr_dbm_gdbm.a
-%%BDB%%lib/apr-2/apr_dbm_db-2.so
-%%BDB%%lib/apr-2/apr_dbm_db.so
-%%BDB%%lib/apr-2/apr_dbm_db.la
-%%BDB%%lib/apr-2/apr_dbm_db.a
-%%NDBM%%lib/apr-2/apr_dbm_ndbm-2.so
-%%NDBM%%lib/apr-2/apr_dbm_ndbm.so
-%%NDBM%%lib/apr-2/apr_dbm_ndbm.la
-%%NDBM%%lib/apr-2/apr_dbm_ndbm.a
 %%MYSQL%%lib/apr-2/apr_dbd_mysql-2.so
-%%MYSQL%%lib/apr-2/apr_dbd_mysql.so
-%%MYSQL%%lib/apr-2/apr_dbd_mysql.la
 %%MYSQL%%lib/apr-2/apr_dbd_mysql.a
+%%MYSQL%%lib/apr-2/apr_dbd_mysql.la
+%%MYSQL%%lib/apr-2/apr_dbd_mysql.so
 %%PGSQL%%lib/apr-2/apr_dbd_pgsql-2.so
-%%PGSQL%%lib/apr-2/apr_dbd_pgsql.so
-%%PGSQL%%lib/apr-2/apr_dbd_pgsql.la
 %%PGSQL%%lib/apr-2/apr_dbd_pgsql.a
+%%PGSQL%%lib/apr-2/apr_dbd_pgsql.la
+%%PGSQL%%lib/apr-2/apr_dbd_pgsql.so
 %%SQLITE3%%lib/apr-2/apr_dbd_sqlite3-2.so
-%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.so
-%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.la
 %%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.a
-%%EXTRAS%%@dirrm lib/apr-2
+%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.la
+%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.so
+%%BDB%%lib/apr-2/apr_dbm_db-2.so
+%%BDB%%lib/apr-2/apr_dbm_db.a
+%%BDB%%lib/apr-2/apr_dbm_db.la
+%%BDB%%lib/apr-2/apr_dbm_db.so
+%%GDBM%%lib/apr-2/apr_dbm_gdbm-2.so
+%%GDBM%%lib/apr-2/apr_dbm_gdbm.a
+%%GDBM%%lib/apr-2/apr_dbm_gdbm.la
+%%GDBM%%lib/apr-2/apr_dbm_gdbm.so
+%%NDBM%%lib/apr-2/apr_dbm_ndbm-2.so
+%%NDBM%%lib/apr-2/apr_dbm_ndbm.a
+%%NDBM%%lib/apr-2/apr_dbm_ndbm.la
+%%NDBM%%lib/apr-2/apr_dbm_ndbm.so
+lib/apr.exp
+lib/libapr-2.a
+lib/libapr-2.la
+lib/libapr-2.so
+lib/libapr-2.so.%%SHLIB_MAJOR%%
+libdata/pkgconfig/apr-2.pc
+%%DATADIR%%/build-2/apr_rules.mk
+%%DATADIR%%/build-2/libtool
+%%DATADIR%%/build-2/make_exports.awk
+%%DATADIR%%/build-2/make_var_export.awk
+%%DATADIR%%/build-2/mkdir.sh
 @dirrm %%DATADIR%%/build-2
 @dirrm %%DATADIR%%
+%%EXTRAS%%@dirrm lib/apr-2
 @dirrm include/apr-2