Convert to new options framework left unconverted ports in x* categories

7 files changed, 71 insertions, 92 deletions

diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index aa49b22eb110..9e2b701e7ab4 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	alltray
-# Date created:		2005-10-15
-# Whom:			Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
-#
 
 PORTNAME=	alltray
 PORTVERSION=	0.70
@@ -22,11 +18,12 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		alltray.1
 
-OPTIONS=	KDE	"Support only KDE desktop"	off
+OPTIONS_DEFINE=	KDE
+KDE_DESC=	Support only KDE desktop
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_KDE)
+.if ${PORT_OPTIONS:MKDE}
 CONFIGURE_ARGS=	--disable-gconf
 .else
 USE_GNOME+=	gconf2
@@ -42,4 +39,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|liballtray\.so\.0\.0\.0|liballtray.so.0|; \
 		s|/usr/lib|${PREFIX}/lib|' ${WRKSRC}/src/child.c
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile
index 30c021294a33..213ab1445b0d 100644
--- a/x11/dmenu/Makefile
+++ b/x11/dmenu/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	dmenu
-# Date created:				August 4, 2006
-# Whom:					Jeroen Schot <schot@a-eskwadraat.nl>
-#
+# Created by: Jeroen Schot <schot@a-eskwadraat.nl>
 # $FreeBSD$
-#
 
 PORTNAME=	dmenu
 PORTVERSION=	4.5
@@ -21,8 +17,8 @@ COMMENT=	X11 menu application designed for the dwm window manager
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-OPTIONS=	XINERAMA	"Enable Xinerama support"	On \
-		XFT		"Enable Xft support"		Off
+OPTIONS_DEFINE=	XINERAMA XFT
+OPTIONS_DEFAULT=	XINERAMA
 
 USE_XORG=	x11
 
@@ -31,11 +27,11 @@ PLIST_FILES=	bin/dmenu bin/dmenu_run bin/stest
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_XINERAMA)
+.if ${PORT_OPTIONS:MXINERAMA}
 USE_XORG+=	xinerama
 .endif
 
-.if defined(WITH_XFT)
+.if ${PORT_OPTIONS:MXFT}
 USE_XORG+=	xft
 PATCHFILES+=	${PORTNAME}-${PORTVERSION}-xft.diff
 .endif
@@ -45,7 +41,7 @@ post-patch:
 	         -e "s,%%PREFIX%%,${PREFIX},g" \
 	         -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
 	         -e "s,%%MANPREFIX%%,${MANPREFIX},g"
-.if defined(WITHOUT_XINERAMA)
+.if ! ${PORT_OPTIONS:MXINERAMA}
 	@${REINPLACE_CMD} -e 's,$${XINERAMALIBS},,g' \
 	         -e 's,$${XINERAMAFLAGS},,g' ${WRKSRC}/config.mk
 .endif
diff --git a/x11/dzen2/Makefile b/x11/dzen2/Makefile
index eb85450c24ad..3f4d501706a2 100644
--- a/x11/dzen2/Makefile
+++ b/x11/dzen2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   dzen2
-# Date created:        May 26 2008
-# Whom:                Morten Slot Kristensen
-#
+# Created by: Morten Slot Kristensen
 # $FreeBSD$
-#
 
 PORTNAME=	dzen2
 PORTVERSION=	0.8.5
@@ -18,26 +14,26 @@ USE_XORG=	x11
 
 PLIST_FILES=	bin/${PORTNAME}
 
-OPTIONS=	XPM		"Enable XPM support" On \
-		XINERAMA	"Enable Xinerama support" On
+OPTIONS_DEFINE=	XPM XINERAMA
+OPTIONS_DEFAULT=	XPM XINERAMA
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_XPM)
+.if ${PORT_OPTIONS:MXPM}
 USE_XORG+=	xpm
 .endif
 
-.if !defined(WITHOUT_XINERAMA)
+.if ${PORT_OPTIONS:MXINERAMA}
 USE_XORG+=	xinerama
 .endif
 
 post-patch:
-.if !defined(WITHOUT_XPM)
+.if ${PORT_OPTIONS:MXPM}
 	${REINPLACE_CMD} -e 's/^LIBS =\(.*\)$$/LIBS =\1 -lXpm/g'	\
 	  	-e 's/^CFLAGS =\(.*\)$$/CFLAGS =\1 -DDZEN_XPM/g'	\
 		${WRKSRC}/config.mk
 .endif
-.if !defined(WITHOUT_XINERAMA)
+.if ${PORT_OPTIONS:MXINERAMA}
 	${REINPLACE_CMD} -e 's/^LIBS =\(.*\)$$/LIBS =\1 -lXinerama/g'	\
 	  	-e 's/^CFLAGS =\(.*\)$$/CFLAGS =\1 -DDZEN_XINERAMA/g'	\
 		${WRKSRC}/config.mk
@@ -45,4 +41,4 @@ post-patch:
 	${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g'       \
 		${WRKSRC}/config.mk
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/metalock/Makefile b/x11/metalock/Makefile
index 844ea3aa9aea..67741d0a102d 100644
--- a/x11/metalock/Makefile
+++ b/x11/metalock/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	metalock
-# Date created:		21 March 2012
-# Whom:			Timothy Beyer <beyert@cs.ucr.edu>
-#
+# Created by: Timothy Beyer <beyert@cs.ucr.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	metalock
 PORTVERSION=	0.8.0
@@ -23,29 +19,29 @@ FETCH_ARGS=	"-Fpr"
 USE_BZIP2=	yes
 USE_XORG=	x11 xt xproto xext xpm
 
-OPTIONS=	IMLIB2 "Use Imlib2" on  \
-		XFT "Use Xft Fonts"	on  \
-		ULTRAGETOPT "Use Ultragetopt" on
+OPTIONS_DEFINE=	IMLIB2 XFT ULTRAGETOPT
+OPTIONS_DEFAULT=	IMLIB2 XFT ULTRAGETOPT
+ULTRAGETOPT_DESC=	Use Ultragetopt
 
 .include <bsd.port.options.mk>
 
 MAKE_ARGS=	PREFIX="${LOCALBASE}" DEST_PREFIX="${PREFIX}" CC="${CC}"
 
-.if !defined(WITHOUT_ULTRAGETOPT)
+.if ${PORT_OPTIONS:MULTRAGETOPT}
 LIB_DEPENDS+=	ultragetopt.0:${PORTSDIR}/devel/ultragetopt
 MAKE_ARGS+=	USE_ULTRAGETOPT=yes
 .else
 MAKE_ARGS+=	USE_ULTRAGETOPT=no
 .endif
 
-.if !defined(WITHOUT_IMLIB2)
+.if ${PORT_OPTIONS:MIMLIB2}
 USE_EFL=	imlib2
 MAKE_ARGS+=	USE_IMLIB2=yes
 .else
 MAKE_ARGS+=	USE_IMLIB2=no
 .endif
 
-.if !defined(WITHOUT_XFT)
+.if ${PORT_OPTIONS:MXFT}
 USE_XORG+=	xft
 MAKE_ARGS+=	USE_XFT=yes
 .else
diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index 90e1e7a53b43..0476c9efebe5 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mrxvt-devel
-# Date created:				24 Apr 2005
-# Whom:					Lars Engels <lars.engels@0x20.net>
-#
+# Created by: Lars Engels <lars.engels@0x20.net>
 # $FreeBSD$
-#
 
 PORTNAME=	mrxvt-devel
 PORTVERSION=	0.5.4
@@ -28,19 +24,19 @@ DESKTOP_ENTRIES=	"mrxvt" "mrxvt terminal emulator" \
 			"mrxvt" "Utility;TerminalEmulator;" \
 			false
 
-OPTIONS=	XFT "Enable Xft support for fonts" Off \
-		BACKGROUND "Enable background images" On\
-		JPEG "Enable JPEG background images" On \
-		PNG "Enable PNG background images" On \
-		TRANSPARENCY "Enable transparency" On \
-		SWAPSCREEN "Enable swapscreen" On \
-		JAPANESE "Enable support for Japanese language" Off \
-		24BITS "Prefer 24 bits color" On \
-		MENUBAR "Enable menubar" On \
-		TEXTSHADOW "Enable text shadow" Off \
-		FRILLS "Enable internal borders and smart resizing" Off
+OPTIONS_DEFINE=	XFT BACKGROUND JPEG PNG TRANSPARENCY SWAPSCREEN JAPANESE 24BITS \
+		MENUBAR TEXTSHADOW FRILLS DOCS EXAMPLES
+OPTIONS_DEFAULT=	BACKGROUND JPEG PNG TRANSPARENCY SWAPSCREEN 24BITS MENUBAR
+BACKGROUND_DESC=	Background images
+TRANSPARENCY_DESC=	transparency
+SWAPSCREEN_DESC=	Swapscreen
+JAPANESE_DESC=		Support for Japanese language
+24BITS_DESC=		Prefer 24 bits color
+MENUBAR_DESC=		Menubar
+TEXTSHADOW_DESC=	Text shadow
+FRILLS_DESC=		Internal borders and smart resizing
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 CONFIGURE_ARGS+=	--enable-utempter
 .if ${OSVERSION} >= 900004
@@ -49,52 +45,52 @@ CONFIGURE_ARGS+=	--disable-lastlog
 LIB_DEPENDS+=		utempter.0:${PORTSDIR}/sysutils/libutempter
 .endif
 
-.if defined(WITH_JAPANESE)
+.if ${PORT_OPTIONS:MJAPANESE}
 CONFIGURE_ARGS+=	--enable-xim --enable-cjk --with-encoding=eucj
 .endif
 
-.if defined(WITH_XFT)
+.if ${PORT_OPTIONS:MXFT}
 USE_XORG+=	xft
 CONFIGURE_ARGS+=	--enable-xft
 .endif
 
-.if defined(WITH_24BITS)
+.if ${PORT_OPTIONS:M24BITS}
 CONFIGURE_ARGS+=	--enable-24bits
 .endif
 
-.if defined(WITHOUT_BACKGROUND)
+.if ! ${PORT_OPTIONS:MBACKGROUND}
 CONFIGURE_ARGS+=	--disable-xpm
 .endif
 
-.if defined(WITHOUT_JPEG) || defined(WITHOUT_BACKGROUND)
+.if ! ${PORT_OPTIONS:MJPEG} || ! ${PORT_OPTIONS:MBACKGROUND}
 CONFIGURE_ARGS+=	--disable-jpeg
 .else
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 .endif
 
-.if defined(WITHOUT_PNG) || defined(WITHOUT_BACKGROUND)
+.if ! ${PORT_OPTIONS:MPNG} || ! ${PORT_OPTIONS:MBACKGROUND}
 CONFIGURE_ARGS+=	--disable-png
 .else
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 .endif
 
-.if defined(WITHOUT_TRANSPARENCY)
+.if ! ${PORT_OPTIONS:MTRANSPARENCY}
 CONFIGURE_ARGS+=	--disable-transparency
 .endif
 
-.if !defined(WITHOUT_MENUBAR)
+.if ${PORT_OPTIONS:MMENUBAR}
 CONFIGURE_ARGS+=	--enable-menubar
 .endif
 
-.if defined(WITH_TEXTSHADOW)
+.if ${PORT_OPTIONS:MTEXTSHADOW}
 CONFIGURE_ARGS+=	--enable-text-shadow
 .endif
 
-.if defined(WITHOUT_SWAPSCREEN)
+.if ! ${PORT_OPTIONS:MSWAPSCREEN}
 CONFIGURE_ARGS+=	--disable-swapscreen
 .endif
 
-.if defined(WITH_FRILLS)
+.if ${PORT_OPTIONS:MFRILLS}
 CONFIGURE_ARGS+=	--enable-frills
 .endif
 
@@ -135,16 +131,16 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/share/default.menu ${PREFIX}/etc/mrxvt/default.menu.sample
 	${INSTALL_DATA} ${WRKSRC}/share/submenus.menu ${PREFIX}/etc/mrxvt/submenus.menu.sample
 	${INSTALL_MAN} ${WRKSRC}/doc/mrxvt.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}/scripts
 	${INSTALL_DATA} ${WRKSRC}/share/scripts/mrxvtset.pl ${EXAMPLESDIR}/scripts
 	${INSTALL_DATA} ${WRKSRC}/share/scripts/settitle.c ${EXAMPLESDIR}/scripts
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${CP} ${WRKSRC}/doc/*.bz2 ${DOCSDIR}
 	${BZIP2_CMD} -d ${DOCSDIR}/*.bz2
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index 9cf4e0d6ef57..1022e54211c1 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -32,11 +32,11 @@ CMAKE_ARGS=	-DUSE_CONSOLEKIT=yes
 
 MAN1=		slim.1
 
-OPTIONS=	PAM "Use pam" off
+OPTIONS_DEFINE=	PAM
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PAM)
+.if ${PORT_OPTIONS:MPAM}
 CMAKE_ARGS+=	-DUSE_PAM=yes
 PLIST_SUB+=	PAM=""
 .else
@@ -64,7 +64,7 @@ post-install:
 	@if [ ! -f ${PREFIX}/etc/slim.conf ]; then \
 		${CP} ${PREFIX}/etc/slim.conf.sample ${PREFIX}/etc/slim.conf ; \
 	fi
-.	if defined(WITH_PAM)
+.	if ${PORT_OPTIONS:MPAM}
 	@${INSTALL_DATA} ${FILESDIR}/pam.conf ${PREFIX}/etc/pam.d/slim.default
 	@if [ ! -f ${PREFIX}/etc/pam.d/slim ]; then \
 		${CP} ${PREFIX}/etc/pam.d/slim.default ${PREFIX}/etc/pam.d/slim ; \
@@ -72,4 +72,4 @@ post-install:
 .	endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index d635f6ca05d7..6f982cfd09c6 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	workrave
-# Date created:				15 Jul 2003
-# Whom:					Koop Mast <einekoai@chello.nl>
-#
+# Created by: Koop Mast <einekoai@chello.nl>
 # $FreeBSD$
-#
 
 PORTNAME=	workrave
 PORTVERSION=	1.9.4
@@ -16,8 +12,8 @@ COMMENT=	RSI prevention tool
 
 BUILD_DEPENDS=	gdome-config:${PORTSDIR}/textproc/gdome2
 
-OPTIONS=	GNOME "Build with Gnome support" off \
-		NETWORK "Build with network support" off
+OPTIONS_DEFINE=	GNOME NETWORK NLS
+NETWORK_DESC=	Build with network support
 
 INSTALLS_ICONS=	yes
 DESKTOP_ENTRIES=	"Workrave" "RSI prevention tool" \
@@ -27,19 +23,21 @@ DESKTOP_ENTRIES=	"Workrave" "RSI prevention tool" \
 					false
 
 USE_XORG=	x11 xmu recordproto xtst xext
+USES=		pathfix
+USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 intltool
+USE_GNOME=	gnomeprefix intlhack gconf2 intltool
 USE_GSTREAMER=	good
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="`pkg-config --libs libgnomeui-2.0`"
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-gconf --disable-pulse
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 LIB_DEPENDS+=	gdome.8:${PORTSDIR}/textproc/gdome2
 
-.if defined(WITH_GNOME)
+.if ${PORT_OPTIONS:MGNOME}
 LIB_DEPENDS+=	gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26
 USE_GNOME+=	gnomepanel
 PLIST_SUB+=	GNOME=""
@@ -49,13 +47,13 @@ CONFIGURE_ARGS+=--disable-gnome
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
-.if defined(WITH_NETWORK)
+.if ${PORT_OPTIONS:MNETWORK}
 LIB_DEPENDS+=	gnet-2.0.0:${PORTSDIR}/net/gnet2
 .else
 CONFIGURE_ARGS+=--disable-distribution
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
@@ -63,4 +61,4 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>