Add OPTIONS for esound, IPv6, and pulseaudio support.

PR:		137977
Submitted by:	Israel Jacques <mrkotfw@gmail.com>

2 files changed, 74 insertions, 49 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 57c518322f8d..8ad9e480e98e 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -16,8 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Multimedia applications for the GNOME 2 desktop
 
-LIB_DEPENDS=	pulse.0:${PORTSDIR}/audio/pulseaudio \
-		canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 
 USE_BZIP2=	yes
@@ -28,19 +27,42 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop
-USE_GSTREAMER=	cdparanoia esound gconf good
-CONFIGURE_ARGS=	--enable-ipv6
+USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 libgnomeui
+USE_GSTREAMER=	gconf good
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	gnome-audio-profiles.schemas \
 		gnome-sound-recorder.schemas
 
+OPTIONS=	ESOUND "Enable the EsounD module" on \
+		IPV6 "Enable support for IPv6" on \
+		PULSEAUDIO "Enable the PulseAudio module" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ESOUND)
+USE_GSTREAMER+=	esound
+PLIST_SUB+=	VUMETER=""
+.else
+CONFIGURE_ARGS+=--disable-esound --disable-esdtest
+PLIST_SUB+=	VUMETER="@comment "
+.endif
+
+.if defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=--disable-ipv6
+.endif
+
+.if defined(WITH_PULSEAUDIO)
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.else
+CONFIGURE_ARGS+=--disable-pulse
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
 		${WRKSRC}/gnome-cd/Makefile.in
 	@${REINPLACE_CMD} -e 's|acd0c|acd0|g ; s|== "xyes|= "xyes|g' \
 		${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index 8905eac3fc05..b425b9c29bd8 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -1,9 +1,9 @@
 bin/gnome-audio-profiles-properties
 bin/gnome-sound-recorder
 bin/gnome-volume-control
-bin/gnome-volume-control-applet
+%%VUMETER%%bin/gnome-volume-control-applet
 bin/gstreamer-properties
-etc/xdg/autostart/gnome-volume-control-applet.desktop
+%%VUMETER%%etc/xdg/autostart/gnome-volume-control-applet.desktop
 include/gnome-media/profiles/audio-profile-choose.h
 include/gnome-media/profiles/audio-profile-edit.h
 include/gnome-media/profiles/audio-profile.h
@@ -21,26 +21,28 @@ share/applications/gnome-sound-recorder.desktop
 share/applications/gnome-volume-control.desktop
 share/applications/gstreamer-properties.desktop
 %%DATADIR%%/glade/gnome-audio-profiles.glade2
-%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
-%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
-%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png
-%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png
-%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png
-%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png
-%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png
-%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png
-%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png
-%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png
-%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png
-%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png
-%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png
-%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png
-%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png
-%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png
-%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg
-%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg
-%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
-%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
+%%VUMETER%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png
+%%VUMETER%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg
+%%VUMETER%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg
+%%VUMETER%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
+%%VUMETER%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
+%%DATADIR%%/pixmaps/chain-broken.png
+%%DATADIR%%/pixmaps/chain.png
 %%DATADIR%%/sounds/gnome-sounds-default.xml
 share/gnome-sound-recorder/ui/ui.xml
 share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
@@ -92,21 +94,21 @@ share/gnome/help/gstreamer-properties/th/gstreamer-properties.xml
 share/gstreamer-properties/glade/gstreamer-properties.glade
 share/gstreamer-properties/icons/gstreamer-properties.png
 share/icons/hicolor/16x16/apps/gnome-sound-recorder.png
-share/icons/hicolor/16x16/apps/gnome-volume-control.png
-share/icons/hicolor/16x16/apps/gnome-volume-control.svg
+%%VUMETER%%share/icons/hicolor/16x16/apps/gnome-volume-control.png
+%%VUMETER%%share/icons/hicolor/16x16/apps/gnome-volume-control.svg
 share/icons/hicolor/22x22/apps/gnome-sound-recorder.png
-share/icons/hicolor/22x22/apps/gnome-volume-control.png
-share/icons/hicolor/22x22/apps/gnome-volume-control.svg
+%%VUMETER%%share/icons/hicolor/22x22/apps/gnome-volume-control.png
+%%VUMETER%%share/icons/hicolor/22x22/apps/gnome-volume-control.svg
 share/icons/hicolor/24x24/apps/gnome-sound-recorder.png
-share/icons/hicolor/24x24/apps/gnome-volume-control.png
+%%VUMETER%%share/icons/hicolor/24x24/apps/gnome-volume-control.png
 share/icons/hicolor/32x32/apps/gnome-sound-recorder.png
-share/icons/hicolor/32x32/apps/gnome-volume-control.png
-share/icons/hicolor/32x32/apps/gnome-volume-control.svg
+%%VUMETER%%share/icons/hicolor/32x32/apps/gnome-volume-control.png
+%%VUMETER%%share/icons/hicolor/32x32/apps/gnome-volume-control.svg
 share/icons/hicolor/48x48/apps/gnome-sound-recorder.png
-share/icons/hicolor/48x48/apps/gnome-volume-control.png
+%%VUMETER%%share/icons/hicolor/48x48/apps/gnome-volume-control.png
 share/icons/hicolor/48x48/apps/gstreamer-properties.png
 share/icons/hicolor/scalable/apps/gnome-sound-recorder.svg
-share/icons/hicolor/scalable/apps/gnome-volume-control.svg
+%%VUMETER%%share/icons/hicolor/scalable/apps/gnome-volume-control.svg
 share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/as/LC_MESSAGES/gnome-media-2.0.mo
@@ -270,19 +272,20 @@ share/sounds/gnome/default/alerts/sonar.ogg
 @dirrm share/gnome/help/gnome-sound-recorder
 @dirrm share/gnome-sound-recorder/ui
 @dirrm share/gnome-sound-recorder
+@dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/icons/hicolor/scalable/status
-@dirrm %%DATADIR%%/icons/hicolor/scalable
-@dirrm %%DATADIR%%/icons/hicolor/32x32/status
-@dirrm %%DATADIR%%/icons/hicolor/32x32
-@dirrm %%DATADIR%%/icons/hicolor/24x24/status
-@dirrm %%DATADIR%%/icons/hicolor/24x24
-@dirrm %%DATADIR%%/icons/hicolor/22x22/status
-@dirrm %%DATADIR%%/icons/hicolor/22x22
-@dirrm %%DATADIR%%/icons/hicolor/16x16/status
-@dirrm %%DATADIR%%/icons/hicolor/16x16
-@dirrm %%DATADIR%%/icons/hicolor
-@dirrm %%DATADIR%%/icons
+%%VUMETER%%@dirrm %%DATADIR%%/icons/hicolor/scalable/status
+%%VUMETER%%@dirrm %%DATADIR%%/icons/hicolor/scalable
+%%VUMETER%%@dirrm %%DATADIR%%/icons/hicolor/32x32/status
+%%VUMETER%%@dirrm %%DATADIR%%/icons/hicolor/32x32
+%%VUMETER%%@dirrm %%DATADIR%%/icons/hicolor/24x24/status
+%%VUMETER%%@dirrm %%DATADIR%%/icons/hicolor/24x24
+%%VUMETER%%@dirrm %%DATADIR%%/icons/hicolor/22x22/status
+%%VUMETER%%@dirrm %%DATADIR%%/icons/hicolor/22x22
+%%VUMETER%%@dirrm %%DATADIR%%/icons/hicolor/16x16/status
+%%VUMETER%%@dirrm %%DATADIR%%/icons/hicolor/16x16
+%%VUMETER%%@dirrm %%DATADIR%%/icons/hicolor
+%%VUMETER%%@dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
 @dirrmtry share/applications