1 files changed, 36 insertions, 51 deletions

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index df7550bffb6a..6663c0359fa5 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -22,70 +22,59 @@ PATCH_SITE_SUBDIR=	sobomax
 
 MAINTAINER=	esk@ira.uka.de
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		glib12.3:${PORTSDIR}/devel/glib12 \
-		xml.5:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
 
-USE_X_PREFIX=   yes
-USE_LIBTOOL=    yes
+USE_X_PREFIX=	yes
+USE_GTK=	yes
+WANT_ESOUND=	yes
+WANT_GNOME=	yes
+USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure libxmms/configure
-INSTALLS_SHLIB= yes
+INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib" \
+		HAVE_MIKMOD=${HAVE_MIKMOD}
+
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_MIKMOD)
 LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
-HAVE_MIKMOD_OVERRIDE=
+HAVE_MIKMOD=	yes
 PLIST_SUB+=	MIKMODPLUGIN:=""
 .else
-HAVE_MIKMOD_OVERRIDE=	yes
 PLIST_SUB+=	MIKMODPLUGIN:="@comment "
 .endif
 
-.if !defined(WITHOUT_ESD)
-LIB_DEPENDS+=	esd.2:${PORTSDIR}/audio/esound
-HAVE_ESD_OVERRIDE=
-PLIST_SUB+=	ESDPLUGIN:=""
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
 .else
-HAVE_ESD_OVERRIDE=	yes
-PLIST_SUB+=	ESDPLUGIN:="@comment "
+CONFIGURE_ARGS=	--without-gnome
 .endif
 
-.if defined(WITH_GNOME)
-LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		panel_applet.4:${PORTSDIR}/x11/gnomecore
-CONFIGURE_ARGS+=	--with-gnome
-PLIST_SUB+=	GNOME:=""
+.if defined(HAVE_ESOUND)
+USE_ESOUND=	yes
+PLIST_SUB+=	ESDPLUGIN:=""
 .else
-CONFIGURE_ARGS+=	--without-gnome
-PLIST_SUB+=	GNOME:="@comment "
+PLIST_SUB+=	ESDPLUGIN:="@comment "
 .endif
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-
-CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		HAVE_ESD_OVERRIDE="${HAVE_ESD_OVERRIDE}" \
-		HAVE_MIKMOD_OVERRIDE="${HAVE_MIKMOD_OVERRIDE}"
-
-.include <bsd.port.pre.mk>
-
 .if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
 PATCHFILES=	xmms-${PORTVERSION}-3dnow.patch.gz
 CONFIGURE_ARGS+=	--enable-3dnow
 .endif
 
+.if defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021
+post-extract:
+	(cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \
+	  cd ${WRKSRC}/Visualization/blur_scope && ${MV} blur_8.s blur_8.S);
+	${PERL} -pi.bak -e 's:\.s :\.S :g' ${WRKSRC}/Input/mpg123/Makefile.in
+	${PERL} -pi.bak -e 's:blur_8.s:blur_8.S:g' \
+	  ${WRKSRC}/Visualization/blur_scope/Makefile.in
+.endif
+
 pre-extract:
-.if !defined(WITH_GNOME) || !defined(WITHOUT_ESD) || !defined(WITHOUT_MIKMOD) || \
-    ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 )
+.if !defined(WITHOUT_MIKMOD) || ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 )
 	@${ECHO_MSG}
-.if !defined(WITH_GNOME)
-	@${ECHO_MSG} "You can add support for GNOME by defining WITH_GNOME."
-.endif
-.if !defined(WITHOUT_ESD)
-	@${ECHO_MSG} "You can disable support for ESD sound daemon by defining WITHOUT_ESD."
-.endif
 .if !defined(WITHOUT_MIKMOD)
 	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
 .endif
@@ -95,16 +84,12 @@ pre-extract:
 	@${ECHO_MSG}
 .endif
 
-.if defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021
-post-extract:
-	(cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \
-	  cd ${WRKSRC}/Visualization/blur_scope && ${MV} blur_8.s blur_8.S);
-	${PERL} -pi.bak -e 's:\.s :\.S :g' ${WRKSRC}/Input/mpg123/Makefile.in
-	${PERL} -pi.bak -e 's:blur_8.s:blur_8.S:g' \
-	  ${WRKSRC}/Visualization/blur_scope/Makefile.in
-.endif
-
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
+	@${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(datadir\)/aclocal|\$\(prefix\)/share/aclocal|g ; \
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.post.mk>