summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2007-02-16 00:54:48 +0000
committerwiz <wiz@pkgsrc.org>2007-02-16 00:54:48 +0000
commit725304c5e398081f60507854428a7dc932ccc885 (patch)
tree7232ebd3b5fdbe88ec550aca9626e3aaf666efd4 /multimedia
parent76357ccf93ad3dd8f3a1ef2112dfd45665ad5562 (diff)
downloadpkgsrc-725304c5e398081f60507854428a7dc932ccc885.tar.gz
Proxy-commit for drochner:
Fix a problem reported by Greg Oster in PR 35564.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xine-lib/Makefile.common8
1 files changed, 3 insertions, 5 deletions
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 2a214638b59..41442836b08 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2007/02/07 20:04:00 drochner Exp $
+# $NetBSD: Makefile.common,v 1.40 2007/02/16 00:54:48 wiz Exp $
#
DISTNAME= xine-lib-${XINE_LIB_VER}
@@ -32,12 +32,10 @@ PKGSRC_MAKE_ENV+= "mkdir_p"="mkdir -p"
.include "../../mk/bsd.prefs.mk"
-.if ${X11_TYPE} != "native"
-.include "../../x11/libXv/buildlink3.mk"
-PLIST_SUBST+= HAVE_XV=
-.elif !exists(${X11BASE}/lib/libXv.so)
+.if ${X11_TYPE} == "native" && !exists(${X11BASE}/lib/libXv.so)
PLIST_SUBST+= HAVE_XV="@comment "
.else
+.include "../../x11/libXv/buildlink3.mk"
CONFIGURE_ARGS+= --with-xv-path='${X11BASE}/lib'
PLIST_SUBST+= HAVE_XV=
.endif