From 2aec64c7b5a4cc7b5581f26da9cf45c054015ce6 Mon Sep 17 00:00:00 2001 From: kili Date: Thu, 5 Apr 2007 16:20:02 +0000 Subject: [PATCH] Fix WANTLIB (+Xau Xdmcp expat). Adjust MODULES (converters/libiconv for no_x11, devel/gettext else) and drop intl from WANTLIB (spotted by ajacoutot@). ok, ajacoutot --- x11/mplayer/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile index bc353268c85..2b0a9c7c682 100644 --- a/x11/mplayer/Makefile +++ b/x11/mplayer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.113 2007/02/15 11:49:03 biorn Exp $ +# $OpenBSD: Makefile,v 1.114 2007/04/05 16:20:02 kili Exp $ # May not be hard to add more. ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64 arm @@ -7,7 +7,7 @@ COMMENT= "Movie player supporting MPEG, DivX, AVI, ASF, MOV & more" DISTNAME= MPlayer-1.0pre8 DIST_SUBDIR= mplayer -PKGNAME= ${DISTNAME:L}p8 +PKGNAME= ${DISTNAME:L}p9 CATEGORIES= x11 EXTRACT_SUFX= .tar.bz2 @@ -39,8 +39,6 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${SKIN}-${SKINVER}${EXTRACT_SUFX}:0 .include -MODULES= converters/libiconv - LIB_DEPENDS= png::graphics/png \ jpeg::graphics/jpeg \ ungif::graphics/libungif \ @@ -118,6 +116,7 @@ CONFIGURE_ARGS+=--disable-esd .endif .if ${FLAVOR:L:Mno_x11} +MODULES= converters/libiconv . if ${FLAVOR:L:Msdl} || ${FLAVOR:L:Mggi} ERRORS+="Fatal: nonsense combination of flavors" . else @@ -135,10 +134,11 @@ CONFIGURE_ARGS+=--enable-gui \ USE_X11= Yes LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ mp3lame:lame-*:audio/lame -WANTLIB+= GL X11 Xext Xrender Xinerama Xv Xxf86dga Xxf86vm atk-1.0 \ - cairo freetype fontconfig glib-2.0 gmodule-2.0 \ - gobject-2.0 glitz intl pango-1.0 pangocairo-1.0 \ +WANTLIB+= GL X11 Xau Xdmcp Xext Xrender Xinerama Xv Xxf86dga \ + Xxf86vm atk-1.0 cairo expat freetype fontconfig glib-2.0 \ + gmodule-2.0 gobject-2.0 glitz pango-1.0 pangocairo-1.0 \ pangoft2-1.0 +MODULES= devel/gettext .endif .if ${FLAVOR:L:Msdl}