ports/106115: libxine: fix knobs

[Max Brazhnikov]

>Number:         106115
>Category:       ports
>Synopsis:       libxine: fix knobs
>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:   Fri Dec 01 09:10:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
FreeBSD lqc.issp.ac.ru 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Wed Oct 25 14:52:11 MSD 2006     root at lqc.issp.ac.ru:/usr/obj/usr/src/sys/LQC  i386
>Description:
don't build libxine with gnomevfs2 if WITHOUT_GNOMEVFS2 is defined and gnome-vfs-2 is installed.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.ports	Mon Nov 20 18:28:45 2006
+++ Makefile	Mon Nov 20 18:29:58 2006
@@ -94,7 +94,7 @@
 PLIST_SUB+=	WITH_GNOMEVFS2=""
 .else
 PLIST_SUB+=	WITH_GNOMEVFS2="@comment "
-CONFIGURE_ARGS+=	--disable-gnome
+CONFIGURE_ARGS+=	--disable-gnomevfs
 .endif
 
 .if !defined(WITHOUT_POLYPAUDIO) && (exists(${LOCALBASE}/lib/libpolyp-0.7.so.0) || defined(WITH_POLYPAUDIO))
@@ -126,7 +126,7 @@
 PLIST_SUB+=	WITH_AALIB=""
 .else
 PLIST_SUB+=	WITH_AALIB="@comment "
-CONFIGURE_ARGS+=	--disable-aalib
+CONFIGURE_ARGS+=	--disable-aalib --disable-aalibtest
 .endif
 
 .if !defined(WITHOUT_IMAGEMAGICK) && (exists(${LOCALBASE}/lib/libWand.so.10) || defined (WITH_IMAGEMAGICK))
@@ -156,37 +156,37 @@
 	@${ECHO_MSG} "===>"
 	@${ECHO_MSG} "===> You can enable some features by defining following variables."
 	@${ECHO_MSG} "===>"
-.if !exists(${LOCALBASE}/bin/artsc-config) && !defined(WITH_ARTS)
+.if !exists(${LOCALBASE}/bin/artsc-config) && !defined(WITH_ARTS) || defined(WITHOUT_ARTS)
 	@${ECHO_MSG} "===> WITH_ARTS   (arts support)"
 .else
 	@${ECHO_MSG} "===> WITH_ARTS   (arts support, enabled)"
 .endif
-.if !exists(${LOCALBASE}/lib/libcaca.a) && !defined(WITH_CACA)
+.if !exists(${LOCALBASE}/lib/libcaca.a) && !defined(WITH_CACA) || defined(WITHOUT_CACA)
 	@${ECHO_MSG} "===> WITH_CACA (libcaca support)"
 .else
 	@${ECHO_MSG} "===> WITH_CACA (libcaca support, enabled)"
 .endif
-.if !(${HAVE_GNOME:Mgnomevfs2} != "") && !defined(WITH_GNOMEVFS2)
+.if !(${HAVE_GNOME:Mgnomevfs2} != "") && !defined(WITH_GNOMEVFS2) || defined(WITHOUT_GNOMEVFS2)
 	@${ECHO_MSG} "===> WITH_GNOMEVFS2 (gnomevfs2 support)"
 .else
 	@${ECHO_MSG} "===> WITH_GNOMEVFS2 (gnomevfs2 support, enabled)"
 .endif
-.if !(${HAVE_GNOME:Mesound} != "") && !defined(WITH_ESOUND)
+.if !(${HAVE_GNOME:Mesound} != "") && !defined(WITH_ESOUND) || defined(WITHOUT_ESOUND)
 	@${ECHO_MSG} "===> WITH_ESOUND (esound support)"
 .else
 	@${ECHO_MSG} "===> WITH_ESOUND (esound support, enabled)"
 .endif
-.if !exists(${LOCALBASE}/lib/libpolyp-0.7.so.0) && !defined(WITH_POLYPAUDIO)
+.if !exists(${LOCALBASE}/lib/libpolyp-0.7.so.0) && !defined(WITH_POLYPAUDIO) || defined(WITHOUT_POLYPAUDIO)
 	@${ECHO_MSG} "===> WITH_POLYPAUDIO (polypaudio support)"
 .else
 	@${ECHO_MSG} "===> WITH_POLYPAUDIO (polypaudio support, enabled)"
 .endif
-.if !exists(${LOCALBASE}/lib/libsmbclient.so.0) && !defined (WITH_SMB)
+.if !exists(${LOCALBASE}/lib/libsmbclient.so.0) && !defined (WITH_SMB) || defined(WITHOUT_SMB)
 	@${ECHO_MSG} "===> WITH_SMB (SMB support)"
 .else
 	@${ECHO_MSG} "===> WITH_SMB (SMB support, enabled)"
 .endif
-.if !exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) && !defined(WITH_XVMC)
+.if !exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) && !defined(WITH_XVMC) || defined(WITHOUT_XVMC)
 	@${ECHO_MSG} "===> WITH_XVMC (XvMC support)"
 .else
 	@${ECHO_MSG} "===> WITH_XVMC (XvMC support, enabled)"

>Release-Note:
>Audit-Trail:
>Unformatted: