3 files changed, 31 insertions, 33 deletions

diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 03c60bff69d1..71f4cd7a7534 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -16,12 +16,9 @@ COMMENT=	Set of tools to record/playback/edit videos in MPEG format
 
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 
-OPTIONS=	GTK2        "Build GTK+2 player (needs SDL)"              on  \
-		SDL         "Enable SDL support"                          on  \
-		PNG         "Enable libPNG support"                       on  \
-		DV          "Enable libDV support"                        off \
-		QUICKTIME   "Enable libQuickTime support"                 off \
-		SIMD 	    "Use cpu-specific optimizations if possible"  off
+OPTIONS_DEFINE=	GTK2 SDL PNG DV QUICKTIME SIMD DOCS
+OPTIONS_DEFAULT=	GTK2 SDL PNG
+QUICKTIME_DESC=		Enable libQuickTime support
 
 CONFLICTS=	mplex-[0-9]*
 
@@ -61,45 +58,45 @@ CFLAGS=	-O0
 BROKEN=		Does not build on powerpc-9
 .endif
 
-.if !defined(WITHOUT_GTK2) && defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MGTK2}
+
+.if empty(${PORT_OPTIONS:MSDL})
 IGNORE=		GTK+2 player needs SDL
 .endif # GTK2/SDL
 
-.if defined(WITHOUT_GTK2)
-PLIST_SUB+=	GTK2:="@comment "
-_HAVE_GTK=	false
-.else
 USE_GNOME+=	gtk20
 PLIST_SUB+=	GTK2:=""
-_HAVE_GTK=	true
+.else
+PLIST_SUB+=	GTK2:="@comment "
+_HAVE_GTK=	false
 .endif # GTK2
 
-.if defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
+USE_SDL+=	gfx sdl
+PLIST_SUB+=	SDL:=""
+.else
 CONFIGURE_ENV+=	ac_cv_path_SDL_CONFIG=no
 PLIST_SUB+=	SDL:="@comment "
 CONFIGURE_ARGS+=	--without-libsdl
-.else
-USE_SDL+=	gfx sdl
-PLIST_SUB+=	SDL:=""
 .endif # SDL
 
-.if defined(WITHOUT_PNG)
-CONFIGURE_ARGS+=--without-libpng
-PLIST_SUB+=	PNG:="@comment "
-.else
+.if ${PORT_OPTIONS:MPNG}
 LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
 CONFIGURE_ARGS+=--with-libpng
 PLIST_SUB+=	PNG:=""
+.else
+CONFIGURE_ARGS+=--without-libpng
+PLIST_SUB+=	PNG:="@comment "
 .endif # PNG
 
-.if defined(WITH_DV)
+.if ${PORT_OPTIONS:MDV}
 LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
 CONFIGURE_ARGS+=--with-libdv
 .else
 CONFIGURE_ARGS+=--without-libdv
 .endif # DV
 
-.if defined(WITH_QUICKTIME)
+.if ${PORT_OPTIONS:MQUICKTIME}
 PLIST_SUB+=	QUICKTIME=""
 LIB_DEPENDS+=	quicktime.0:${PORTSDIR}/multimedia/libquicktime
 CONFIGURE_ARGS+=--with-libquicktime
@@ -108,7 +105,7 @@ PLIST_SUB+=	QUICKTIME="@comment "
 CONFIGURE_ARGS+=--without-libquicktime
 .endif # QUICKTIME
 
-.if defined(WITH_SIMD)
+.if ${PORT_OPTIONS:MSIMD}
 CONFIGURE_ARGS+=--enable-simd-accel
 .else
 CONFIGURE_ARGS+=--disable-simd-accel
@@ -120,7 +117,7 @@ post-patch:
 		 /^CXXFLAGS=/s|$$ARCHFLAGS||g' ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in ${DOC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index 15a105b3758d..c43c13af55b1 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -47,11 +47,13 @@ ADDITIONAL_CODECS_WRKSRC=	${DISTFILES:S/.tar.bz2//}
 REMOVE_CODECS_FILES=	AvidQTAVUICodec.qtx QuickTimeEssentials.qtx QuickTime.qts \
 			QuickTimeInternetExtras.qtx qtmlClient.dll BeHereiVideo.qtx
 
-OPTIONS=	REALPLAYER	"Install realplayer codec"	on
+OPTIONS_DEFINE=	REALPLAYER
+OPTIONS_DEFAULT=	REALPLAYER
+REALPLAYER_DESC=	Install realplayer codec
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_REALPLAYER)
+.if ${PORT_OPTIONS:MREALPLAYER}
 ADDITIONAL_CODECS_DISTFILES+=	rp9codecs-20050115.tar.bz2 \
 				rp9codecs-win32-20050115.tar.bz2
 PLIST_SUB+=	REALPLAYER=""
@@ -83,4 +85,4 @@ do-install:
 	@${CP} /dev/null ${PREFIX}/lib/win32/${PKGNAME}
 	@${CHMOD} 0444 ${PREFIX}/lib/win32/${PKGNAME}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/minisapserver/Makefile b/net/minisapserver/Makefile
index 68729ac87617..5544daf84140 100644
--- a/net/minisapserver/Makefile
+++ b/net/minisapserver/Makefile
@@ -22,22 +22,21 @@ MAN1=		sapserver.1
 PLIST_FILES=	bin/sapserver etc/sap.cfg-dist
 USE_RC_SUBR=	sapserver
 SUB_FILES=	pkg-message
-OPTIONS=	SLP "Enable SLP support via openslp" off
+OPTIONS_DEFINE=	SLP
+SLP_DESC=	"Enable SLP support via openslp"
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_SLP)
+.if ${PORT_OPTIONS:MSLP}
 LIB_DEPENDS+=	slp.1:${PORTSDIR}/net/openslp
 CONFIGURE_ARGS+=--enable-slp
 .else
 CONFIGURE_ARGS+=--disable-slp
 .endif
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(prefix)/share/man|${MANPREFIX}/man|; \
 		s|$$(prefix)/share/doc/sapserver|${DOCSDIR}|; \
@@ -53,4 +52,4 @@ post-patch:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>