1 files changed, 25 insertions, 27 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 9119cb141001..1acd4ac351dd 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -20,10 +20,10 @@ LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		lcms.1:${PORTSDIR}/graphics/lcms \
+LIB_DEPENDS=	fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		freetype:${PORTSDIR}/print/freetype2 \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		lcms:${PORTSDIR}/graphics/lcms \
 		png15:${PORTSDIR}/graphics/png \
 		xml2:${PORTSDIR}/textproc/libxml2
 
@@ -33,7 +33,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--verbose --disable-tests \
-		--without-alsa --without-capi --without-dbus --with-glu \
+		--without-alsa --without-capi --without-dbus \
+		--with-fontconfig --with-glu \
 		--without-gphoto --without-gsm --without-gstreamer \
 		--with-opengl --without-mpg123 --without-opencl \
 		--with-oss --without-sane --without-tiff \
@@ -61,14 +62,11 @@ USE_XORG=	xcursor xi xpm xrandr xrender
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-OPTIONS=	CUPS	"Use CUPS (Common UNIX Printing System)"	Off \
-		DOSBOX	"Use DOSBox to run MS-DOS programs"		Off \
-		GNUTLS	"Use GnuTLS"					Off \
-		HAL	"Use HAL (Hardware Abstraction Layer)"		Off \
-		LDAP	"Use LDAP"					Off \
-		LIBXSLT	"Use libxslt (only used by msxml3.dll)"		Off \
-		OPENAL	"Use OpenAL (3D audio library)"			Off \
-		WINEMAKER "Fully support winemaker (requires Perl)"	Off
+OPTIONS_DEFINE=	CUPS DOSBOX GNUTLS HAL LDAP LIBXSLT OPENAL WINEMAKER
+
+DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
+LIBXSLT_DESC=	Use libxslt (only used by msxml3.dll)
+WINEMAKER_DESC=	Fully support winemaker (requires Perl)
 
 PORTDATA=	fonts/ generic.ppd l_intl.nls wine.inf
 
@@ -76,46 +74,46 @@ PORTSCOUT=	limitw:1,even
 
 .include <bsd.port.pre.mk>
 
-.ifdef WITHOUT_CUPS
-CONFIGURE_ARGS+=	--without-cups
-.else
+.if ${PORT_OPTIONS:MCUPS}
 CONFIGURE_ARGS+=	--with-cups
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=	cups:${PORTSDIR}/print/cups-client
+.else
+CONFIGURE_ARGS+=	--without-cups
 .endif
 
-.ifdef WITH_DOSBOX
+.if ${PORT_OPTIONS:MDOSBOX}
 RUN_DEPENDS+=	dosbox:${PORTSDIR}/emulators/dosbox
 .endif
 
-.ifdef WITH_GNUTLS
+.if ${PORT_OPTIONS:MGNU_TLS}
 CONFIGURE_ARGS+=	--with-gnutls
-LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=	--without-gnutls
 .endif
 
-.ifdef WITH_HAL
+.if ${PORT_OPTIONS:MHAL}
 CONFIGURE_ARGS+=	--with-hal
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
 .else
 CONFIGURE_ARGS+=	--without-hal
 .endif
 
-.ifdef WITH_LDAP
+.if ${PORT_OPTIONS:MLDAP}
 CONFIGURE_ARGS+=	--with-ldap
 USE_OPENLDAP=	yes
 .else
 CONFIGURE_ARGS+=	--without-ldap
 .endif
 
-.ifdef WITH_LIBXSLT
+.if ${PORT_OPTIONS:MLIBXSLT}
 CONFIGURE_ARGS+=	--with-xslt
-LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS+=	xslt:${PORTSDIR}/textproc/libxslt
 .else
 CONFIGURE_ARGS+=	--without-xslt
 .endif
 
-.ifdef WITH_OPENAL
+.if ${PORT_OPTIONS:MOPENAL}
 CONFIGURE_ARGS+=	--with-openal
 USE_OPENAL=		yes
 PLIST_SUB+=		OPENAL=""
@@ -124,7 +122,7 @@ CONFIGURE_ARGS+=	--without-openal
 PLIST_SUB+=		OPENAL="@comment "
 .endif
 
-.ifdef WITH_WINEMAKER
+.if ${PORT_OPTIONS:MWINEMAKER}
 RUN_DEPENDS+=	p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
 .endif