ports/69472: bug in xorg-conv.diff

[Janos Mohacsi]

>Number:         69472
>Category:       ports
>Synopsis:       bug in xorg-conv.diff
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 23 08:10:09 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Janos Mohacsi
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
NIIF
>Environment:
System: FreeBSD scone.ki.iif.hu 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Mon Jul 19 12:51:39 CEST 2004 mohacsi at scone.ki.iif.hu:/usr/obj/usr/src/sys/SCONE i386

>Description:
	The xorg-conv.diff does not handle correctly XFree dependency
	in multimedia/libxine.
	I found this bug when I tried to install kde3 from scratch 
	with xorg-conv.diff.
	Apply small patch below.

>How-To-Repeat:
	Try compiling with xorg-conv.diff multimedia/libxine.
>Fix:


--- Makefile.orig	Fri Jul 23 09:09:39 2004
+++ Makefile	Fri Jul 23 09:36:24 2004
@@ -60,7 +60,9 @@
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src:input:input_cdda.c
 .endif
 
-.if ${XFREE86_VERSION} >= 4
+.if ${X_WINDOW_SYSTEM} == xfree86-4
+PLIST_SUB+=	WITH_LIBXV=""
+.elif ${X_WINDOW_SYSTEM} == xorg
 PLIST_SUB+=	WITH_LIBXV=""
 .else
 PLIST_SUB+=	WITH_LIBXV="@comment "
>Release-Note:
>Audit-Trail:
>Unformatted: