Convert to new options framework left un converted ports in a* categories

While here trim headers
Convert some gnomehack to pathfix
Convert some pkgconfig to USE_PKGCONFIG=build

1 files changed, 15 insertions, 18 deletions

diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index fb8d83b18f1e..be816c49e34d 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -28,26 +28,23 @@ INSTALLS_ICONS=	yes
 CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-update \
 		no-g15 no-portaudio no-pulseaudio no-xevie no-embed-qt-translations
 
-OPTIONS=	DBUS "Enable D-Bus support" on \
-		BONJOUR "Enable Bonjour support" off \
-		MUMBLE11X "Enable mumble 1.1 support" off \
-		SYSCELT "Use system CELT libraries" off \
+OPTIONS_DEFINE=	DBUS BONJOUR MUMBLE11X SYSCELT
+OPTIONS_DEFAULT=	DBUS
+BONJOUR_DESC=		Bonjour support
+MUMBLE11X_DESC=		mumble 1.1 support
+SYSCELT_DESC=		Use system CELT libraries
 
 MAN1=		mumble.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 800000
-BROKEN=		does not compile on FreeBSD 7.x
-.endif
-
-.if defined(WITHOUT_DBUS)
+.if ! ${PORT_OPTIONS:MDBUS}
 CONFIG+=	no-dbus
 .else
 USE_QT4+=	dbus
 .endif
 
-.if defined(WITHOUT_SYSCELT)
+.if ! ${PORT_OPTIONS:MSYSCELT}
 CONFIG+=	bundled-celt
 PLIST_SUB+=	BUNDLECELT=""
 .else
@@ -56,13 +53,13 @@ PLIST_SUB+=	BUNDLECELT="@comment "
 LIB_DEPENDS+=	celt0.2:${PORTSDIR}/audio/celt
 .endif
 
-.if defined(WITHOUT_BONJOUR)
+.if ! ${PORT_OPTIONS:MBONJOUR}
 CONFIG+=	no-bonjour
 .else
 LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
 .endif
 
-.if defined(WITHOUT_MUMBLE11X)
+.if ! ${PORT_OPTIONS:MMUMBLE11X}
 CONFIG+=	no-11x
 PLIST_SUB+=	MUMBLE11X="@comment "
 .else
@@ -72,12 +69,12 @@ PLIST_SUB+=	MUMBLE11X=""
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro
 	# Fix with celt 0.11
-.if !defined(WITHOUT_SYSCELT)
+.if ${PORT_OPTIONS:MSYSCELT}
 	@${REINPLACE_CMD} -e 's/CELT_SET_VBR_RATE/CELT_SET_BITRATE/g' ${WRKSRC}/src/mumble/AudioInput.cpp
 .endif
 
 do-configure:
-.if defined(WITHOUT_SYSCELT)
+.if ! ${PORT_OPTIONS:MSYSCELT}
 	cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}"
 .else
 	cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}" "DEFINES+=FREEBSD_SYSTEM_CELT=1"
@@ -85,11 +82,11 @@ do-configure:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${PREFIX}/bin
-.if defined(WITHOUT_SYSCELT)
+.if ! ${PORT_OPTIONS:MSYSCELT}
 	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${PREFIX}/lib/libcelt-mumble.so.0.11.0
 	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.7.0 ${PREFIX}/lib/libcelt-mumble.so.0.7.0
 .endif
-.if !defined(WITHOUT_MUMBLE11X)
+.if ${PORT_OPTIONS:MMUMBLE11X}
 	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble11x ${PREFIX}/bin
 .endif
 	${MKDIR} ${PREFIX}/share/services
@@ -103,4 +100,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${MANPREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>