ports/146551: [patch] x11-toolkits/wxgtk28: move gstreamer and mspack to OPTIONS

[Anonymous]

>Number:         146551
>Category:       ports
>Synopsis:       [patch] x11-toolkits/wxgtk28: move gstreamer and mspack to OPTIONS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 13 18:40:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
Some apps like mkvmerge (multimedia/mkvtoolnix) don't need them.
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: x11-toolkits/wxgtk28/Makefile
===================================================================
RCS file: /a/.cvsup/ports/x11-toolkits/wxgtk28/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- x11-toolkits/wxgtk28/Makefile	28 Mar 2010 15:02:31 -0000	1.54
+++ x11-toolkits/wxgtk28/Makefile	13 May 2010 18:31:55 -0000
@@ -19,8 +19,7 @@ COMMENT?=	The wxWidgets GUI toolkit with
 LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png\
 		jpeg.11:${PORTSDIR}/graphics/jpeg\
 		tiff.4:${PORTSDIR}/graphics/tiff\
-		expat.6:${PORTSDIR}/textproc/expat2\
-		mspack.1:${PORTSDIR}/archivers/libmspack
+		expat.6:${PORTSDIR}/textproc/expat2
 
 USE_BZIP2=	yes
 USE_XORG=	x11 sm xxf86vm xinerama 
@@ -28,7 +27,6 @@ USE_GL=		glu
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_GNOME=	gtk20 gconf2
-USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libpng=sys\
 		--with-libjpeg=sys\
@@ -50,6 +48,27 @@ PLIST=		${.CURDIR}/pkg-plist
 
 WXGTK_FLAVOR?=	gtk2
 
+OPTIONS=	GSTREAMER "media support" on \
+		MSPACK "MS archives support" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GSTREAMER)
+CONFIGURE_ARGS+=--enable-mediactrl
+USE_GSTREAMER=	yes
+PLIST_SUB+=     GSTREAMER=""
+.else
+CONFIGURE_ARGS+=--disable-mediactrl
+PLIST_SUB+=     GSTREAMER="@comment "
+.endif
+
+.if defined(WITH_MSPACK)
+CONFIGURE_ARGS+=--with-libmspack
+LIB_DEPENDS+=	mspack.1:${PORTSDIR}/archivers/libmspack
+.else
+CONFIGURE_ARGS+=--without-libmspack
+.endif
+
 .if ${WXGTK_FLAVOR} != "gtk2-common"
 RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common
 .endif
@@ -92,4 +111,4 @@ post-patch:
 		-e 's|png_check_sig|png_sig_cmp|g' \
 			${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: x11-toolkits/wxgtk28/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/x11-toolkits/wxgtk28/pkg-plist,v
retrieving revision 1.11
diff -u -p -r1.11 pkg-plist
--- x11-toolkits/wxgtk28/pkg-plist	19 Mar 2009 19:56:38 -0000	1.11
+++ x11-toolkits/wxgtk28/pkg-plist	13 Aug 2009 05:58:30 -0000
@@ -24,9 +24,9 @@ lib/libwx_gtk2_gl-2.8.so.0.6.0
 lib/libwx_gtk2_html-2.8.so
 lib/libwx_gtk2_html-2.8.so.0
 lib/libwx_gtk2_html-2.8.so.0.6.0
-lib/libwx_gtk2_media-2.8.so
-lib/libwx_gtk2_media-2.8.so.0
-lib/libwx_gtk2_media-2.8.so.0.6.0
+%%GSTREAMER%%lib/libwx_gtk2_media-2.8.so
+%%GSTREAMER%%lib/libwx_gtk2_media-2.8.so.0
+%%GSTREAMER%%lib/libwx_gtk2_media-2.8.so.0.6.0
 lib/libwx_gtk2_qa-2.8.so
 lib/libwx_gtk2_qa-2.8.so.0
 lib/libwx_gtk2_qa-2.8.so.0.6.0
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: