4 files changed, 55 insertions, 51 deletions

diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index fd05790be058..566c89e3ef25 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -34,24 +34,24 @@ MAN1=		slsh.1
 DOCSDIR=	${PREFIX}/share/doc/slang
 DATADIR=	${PREFIX}/share/slsh
 
-OPTIONS=	PCRE	"Include pcre support" on \
-		PNG	"Include png support"  on \
-		ICONV	"Include iconv support" on \
-		ONIG	"Include Oniguruma support" off
+OPTIONS_DEFINE=	PCRE PNG ICONV ONIG
+OPTIONS_DEFAULT=PCRE PNG ICONV
+
+ONIG_DESC=	Oniguruma support
 
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_PCRE)
-LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre
+.if ${PORT_OPTIONS:MPCRE}
+LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
 PLIST_SUB+=	PCRE=""
 .else
 CONFIGURE_ARGS+=	--without-pcre
 PLIST_SUB+=	PCRE="@comment "
 .endif
 
-.if !defined(WITHOUT_PNG)
+.if ${PORT_OPTIONS:MPNG}
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 PLIST_SUB+=	PNG=""
 .else
@@ -59,7 +59,7 @@ CONFIGURE_ARGS+=	--without-png
 PLIST_SUB+=	PNG="@comment "
 .endif
 
-.if !defined(WITHOUT_ICONV)
+.if ${PORT_OPTIONS:MICONV}
 USE_ICONV=	yes
 PLIST_SUB+=	ICONV=""
 .else
@@ -67,8 +67,8 @@ CONFIGURE_ARGS+=	--without-iconv
 PLIST_SUB+=	ICONV="@comment "
 .endif
 
-.if defined(WITH_ONIG)
-LIB_DEPENDS+=	onig.1:${PORTSDIR}/devel/oniguruma4
+.if ${PORT_OPTIONS:MONIG}
+LIB_DEPENDS+=	onig:${PORTSDIR}/devel/oniguruma4
 PLIST_SUB+=	ONIG=""
 .else
 CONFIGURE_ARGS+=	--without-onig
@@ -78,7 +78,7 @@ PLIST_SUB+=	ONIG="@comment "
 post-patch:
 	@${REINPLACE_CMD} -E 's,doc/slsh,doc/slang/v\@slang_major_version\@,' \
 		${WRKSRC}/slsh/Makefile.in
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's, install[_-]docs,,g; /MKINSDIR.*DEST_SLSH_DOC_DIR/d' \
 		${WRKSRC}/src/Makefile.in \
 		${WRKSRC}/slsh/Makefile.in
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 7082ffa12e92..a2e645bd8b46 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -17,13 +17,15 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A SLang-based text editor
 
-LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS=	slang:${PORTSDIR}/devel/libslang2
 
 CONFLICTS=	jed-devel-[0-9]*
 
-OPTIONS=	X11 "Build xjed (depends of X11)" on \
-		PERMS "Respect permissions by Root" off \
-		HOSTLOOKUP "Look-up for hostname" on
+OPTIONS_DEFINE=	X11 PERMS HOSTLOOKUP
+OPTIONS_DEFAULT=X11 HOSTLOOKUP
+
+PERMS_DESC=	Respect permissions by Root
+HOSTLOOKUP_DESC=Look-up for hostname
 
 USE_BZIP2=	yes
 DIST_SUBDIR=	jed
@@ -33,7 +35,7 @@ CONFIGURE_ENV+=	JED_ROOT=${PREFIX}/lib/jed
 
 PORTDOCS=	*
 MAKE_ENV+=	DEST_DOC_DIR=${DOCSDIR}
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 MAKE_ENV+=	JED_DOC_FILES="" \
 		JED_DOC_TXT_FILES="" \
 		JED_DOC_HLP_FILES="" \
@@ -45,15 +47,15 @@ MAN1=		jed.1 rgrep.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_X11)
-PLIST_SUB+=	XJED="@comment "
-.else
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11 ice xt
 ALL_TARGET+=	xjed
 PLIST_SUB+=	XJED=""
+.else
+PLIST_SUB+=	XJED="@comment "
 .endif
 
-.if defined(WITHOUT_HOSTLOOKUP)
+.if empty(PORT_OPTIONS:MHOSTLOOKUP)
 HOSTNAME_CMD=	/bin/hostname
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src__userinfo.c
 .endif
@@ -63,14 +65,14 @@ post-patch:
 			  -e 's,\.\./info/\*,,' \
 			  -e 's,^\(JED_DOC_.*FILES\) =,\1 \?=,g' \
 		${WRKSRC}/src/Makefile.in
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} -e '/MKINSDIR.*DEST_DOC_DIR/d' \
 		${WRKSRC}/src/Makefile.in
 .endif
-.if defined(WITHOUT_PERMS)
+.if empty(PORT_OPTIONS:MPERMS)
 	@${REINPLACE_CMD} 's|jed_file_is_readonly (file, 1)|jed_file_is_readonly (file, 0)|' ${WRKSRC}/src/file.c
 .endif
-.if defined(WITHOUT_HOSTLOOKUP)
+.if empty(PORT_OPTIONS:MHOSTLOOKUP)
 	@${REINPLACE_CMD} -e "s/%%JED_HOSTNAME%%/$$(${HOSTNAME_CMD})/" \
 		${WRKSRC}/src/userinfo.c
 .endif
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 64a57c7e8da3..098e48007501 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -15,10 +15,13 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	XML-RPC library for C and C++
 
-OPTIONS=	DEBUG "Compile with debugging information" off \
-		CURL "Compile with curl support" on \
-		LIBWWW "Compile with libwww support" on \
-		TOOLS "Build xmlrpc-c tools" on
+LICENSE=	BSD
+
+OPTIONS_DEFINE=	DEBUG CURL LIBWWW TOOLS
+OPTIONS_DEFAULT=CURL LIBWWW TOOLS
+
+LIBWWW_DESC=	 Compile with libwww support
+TOOLS_DESC=	 Build xmlrpc-c tools
 
 CONFLICTS=	xmlrpc-epi-0.* xmlrpc-c-[0-9]*
 
@@ -33,29 +36,27 @@ MAKE_ARGS=	LIBTOOL="${LIBTOOL}" \
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 
-LICENSE=	BSD
-
 .include <bsd.port.pre.mk>
 
-.if !defined(WITH_DEBUG)
+.if empty(PORT_OPTIONS:MDEBUG)
 CFLAGS+=	-DNDEBUG
 .endif
 
-.if defined(WITH_CURL)
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+.if ${PORT_OPTIONS:MCURL}
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--enable-curl-client
 .else
 CONFIGURE_ARGS+=	--disable-curl-client
 .endif
 
-.if defined(WITH_LIBWWW)
-LIB_DEPENDS+=	wwwcore.1:${PORTSDIR}/www/libwww
+.if ${PORT_OPTIONS:MLIBWWW}
+LIB_DEPENDS+=	wwwcore:${PORTSDIR}/www/libwww
 CONFIGURE_ARGS+=	--enable-libwww-client
 .else
 CONFIGURE_ARGS+=	--disable-libwww-client
 .endif
 
-.if defined(WITH_TOOLS)
+.if ${PORT_OPTIONS:MTOOLS}
 CONFIGURE_ARGS+=	--enable-tools
 PLIST_SUB+=		TOOLS=""
 MAN1+=			xml-rpc-api2cpp.1 xml-rpc-api2txt.1
@@ -64,8 +65,8 @@ CONFIGURE_ARGS+=	--disable-tools
 PLIST_SUB+=		TOOLS="@comment "
 .endif
 
-.if defined(WITHOUT_LIBWWW) && defined(WITHOUT_CURL)
-. if defined(WITH_TOOLS)
+.if empty(PORT_OPTIONS:MLIBWWW) && empty(PORT_OPTIONS:MCURL)
+. if ${PORT_OPTIONS:MTOOLS}
 IGNORE=		xmlrpc-c tools requires CURL or LIBWWW support enabled
 . endif
 PLIST_SUB+=	CLIENT="@comment "
@@ -74,8 +75,8 @@ PLIST_SUB+=	CLIENT=""
 .endif
 
 post-extract:
-	@${FIND} ${WRKSRC} -type l -name blddir | ${XARGS} ${RM}
-	@${FIND} ${WRKSRC} -type l -name srcdir | ${XARGS} ${RM}
+	@${FIND} ${WRKSRC} -type l -name blddir -delete
+	@${FIND} ${WRKSRC} -type l -name srcdir -delete
 
 post-patch:
 	@${GREP} -lR '\-lpthread' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 264988ea1017..0b94bbac2eaf 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -15,9 +15,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	XML-RPC library for C and C++
 
-OPTIONS=	DEBUG "Compile with debugging information" off \
-		CURL "Compile with curl support" on \
-		LIBWWW "Compile with libwww support" on
+LICENSE=	BSD
+
+OPTIONS_DEFINE=	DEBUG CURL LIBWWW
+OPTIONS_DEFAULT=CURL LIBWWW
+
+LIBWWW_DESC=	Compile with libwww support
 
 CONFLICTS=	xmlrpc-epi-0.* xmlrpc-c-devel-[0-9]*
 
@@ -31,31 +34,29 @@ MAKE_ARGS=	LIBTOOL="${LIBTOOL}" \
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 
-LICENSE=	BSD
-
 .include <bsd.port.pre.mk>
 
-.if !defined(WITH_DEBUG)
+.if empty(PORT_OPTIONS:MDEBUG)
 CFLAGS+=	-DNDEBUG
 .endif
 
-.if defined(WITH_CURL)
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+.if ${PORT_OPTIONS:MCURL}
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--enable-curl-client
 .else
 CONFIGURE_ARGS+=	--disable-curl-client
 .endif
 
-.if defined(WITH_LIBWWW)
-LIB_DEPENDS+=	wwwcore.1:${PORTSDIR}/www/libwww
+.if ${PORT_OPTIONS:MLIBWWW}
+LIB_DEPENDS+=	wwwcore:${PORTSDIR}/www/libwww
 CONFIGURE_ARGS+=	--enable-libwww-client
 .else
 CONFIGURE_ARGS+=	--disable-libwww-client
 .endif
 
 post-extract:
-	@${FIND} ${WRKSRC} -type l -name blddir | ${XARGS} ${RM}
-	@${FIND} ${WRKSRC} -type l -name srcdir | ${XARGS} ${RM}
+	@${FIND} ${WRKSRC} -type l -name blddir -delete
+	@${FIND} ${WRKSRC} -type l -name srcdir -delete
 
 post-patch:
 	@${GREP} -lR '\-lpthread' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \