From 88a428546b51c7db7fa708cabf26dcfdef95d6b3 Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Tue, 5 Jun 2012 18:27:14 +0000
Subject: [PATCH] - convert to optionsNG - strip version information from
 LIB_DEPENDS to pet portlint - include bsd.port.mk instead of
 bsd.port.{pre|post}.mk

---
 astro/boinc-setiathome-enhanced/Makefile | 18 +++++++++++-------
 emulators/fuse-utils/Makefile            | 20 +++++++++++---------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile
index 5003556e457f..3281ee1eef02 100644
--- a/astro/boinc-setiathome-enhanced/Makefile
+++ b/astro/boinc-setiathome-enhanced/Makefile
@@ -38,13 +38,17 @@ BOINC_CLIENT_USER?=	boinc
 BOINC_CLIENT_GROUP?=	nobody
 BOINC_CLIENT_HOME?=	/var/db/boinc
 
-OPTIONS=	X11		"Build screensaver (requires net/boinc-client with X11)" off
+OPTIONS_DEFINE=	X11
 
-.include <bsd.port.pre.mk>
+X11_DESC=	Build screensaver (requires net/boinc-client with X11)
 
-.if !defined(WITHOUT_X11)
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		xcb.2:${PORTSDIR}/x11/libxcb
+OPTIONS_DEFAULT=
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
+		xcb:${PORTSDIR}/x11/libxcb
 USE_GL=		gl glu glut
 USE_XORG=	ice sm x11 xau xext xi xdamage xdmcp xfixes xmu xt xxf86vm
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client
@@ -102,7 +106,7 @@ do-install:
 	    ${BOINC_CLIENT_HOME}/projects/${SETI_SITE}
 	${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \
 	    ${WRKSRC}/client/${SETI_BINARY} ${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 	${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \
 	    ${WRKSRC}/client/seti_graphics ${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
 .endif
@@ -111,4 +115,4 @@ post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/fuse-utils/Makefile b/emulators/fuse-utils/Makefile
index cef964f269a6..fc74c7dfa614 100644
--- a/emulators/fuse-utils/Makefile
+++ b/emulators/fuse-utils/Makefile
@@ -18,21 +18,23 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 MAKE_JOBS_SAFE=	yes
 
-LIB_DEPENDS=	spectrum.8:${PORTSDIR}/emulators/libspectrum
+LIB_DEPENDS=	spectrum:${PORTSDIR}/emulators/libspectrum
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libspectrum-prefix=${LOCALBASE} \
 		--with-local-prefix=${LOCALBASE}
 
 MAN1=	createhdf.1 fuse-utils.1 listbasic.1 raw2hdf.1 rzxcheck.1 rzxdump.1 rzxtool.1 scl2trd.1 snap2tzx.1 snapconv.1 tapeconv.1 tzxlist.1 profile2map.1
 
+OPTIONS_DEFINE=	AUDIOFILE
+
+AUDIOFILE_DESC=	Build audio <-> tape utilities
+
+OPTIONS_DEFAULT=	AUDIOFILE
+
 .include <bsd.port.options.mk>
 
-OPTIONS=	AUDIOFILE "Build audio <-> tape utilities" on
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_AUDIOFILE)
-LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
+.if ${PORT_OPTIONS:MAUDIOFILE}
+LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile
 PLIST_SUB=	AUDIOFILE=""
 MAN1+=		audio2tape.1 tape2wav.1
 .else
@@ -40,10 +42,10 @@ CONFIGURE_ARGS+=--without-audiofile
 PLIST_SUB=	AUDIOFILE="@comment "
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS ChangeLog README ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>