4 files changed, 35 insertions, 5 deletions

diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index b54ae466def0..415c8de5886b 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -16,6 +16,10 @@ MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.2.x/ \
 		ftp://ftp.nl.xmms.org/xmms/1.2.x/ \
 		ftp://ftp.de.xmms.org/xmms/1.2.x/
 
+PATCH_SITES=	${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	sobomax
+PATCHFILES=	xmms-1.2.1-3dnow-20000620.patch.gz
+
 MAINTAINER=	esk@ira.uka.de
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
@@ -24,6 +28,7 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 
 USE_X_PREFIX=   yes
 USE_LIBTOOL=    yes
+LIBTOOLFILES=	configure libxmms/configure
 INSTALLS_SHLIB= yes
 
 .if !defined(WITHOUT_MIKMOD)
@@ -64,10 +69,16 @@ CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
 		HAVE_ESD_OVERRIDE="${HAVE_ESD_OVERRIDE}" \
 		HAVE_MIKMOD_OVERRIDE="${HAVE_MIKMOD_OVERRIDE}"
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
+CONFIGURE_ARGS+=	--enable-3dnow
+.endif
+
 pre-extract:
-.if !defined(WITH_GNOME) || !defined(WITHOUT_ESD) || !defined(WITHOUT_MIKMOD)
+.if !defined(WITH_GNOME) || !defined(WITHOUT_ESD) || !defined(WITHOUT_MIKMOD) || \
+    ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 )
 	@${ECHO_MSG}
-.endif
 .if !defined(WITH_GNOME)
 	@${ECHO_MSG} "You can add support for GNOME by defining WITH_GNOME."
 .endif
@@ -77,10 +88,13 @@ pre-extract:
 .if !defined(WITHOUT_MIKMOD)
 	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
 .endif
-.if !defined(WITH_GNOME) || !defined(WITHOUT_ESD) || !defined(WITHOUT_MIKMOD)
+.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
+	@${ECHO_MSG} "You can disable 3DNOW optimized decoding routines by defining WITHOUT_3DNOW."
+.endif
 	@${ECHO_MSG}
 .endif
 
+.if defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021
 post-extract:
 	(cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \
 	  ${MV} getbits.s getbits.S && cd ${WRKSRC}/Visualization/blur_scope && \
@@ -88,5 +102,6 @@ post-extract:
 	${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
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/xmms/distinfo b/multimedia/xmms/distinfo
index 5a2763baa952..06444c8cce12 100644
--- a/multimedia/xmms/distinfo
+++ b/multimedia/xmms/distinfo
@@ -1 +1,2 @@
 MD5 (xmms-1.2.2.tar.gz) = c4a99b69eb913329597ba52d727b3394
+MD5 (xmms-1.2.1-3dnow-20000620.patch.gz) = ea221913036248cef5c3cae0ad17b211
diff --git a/multimedia/xmms/files/patch-ae b/multimedia/xmms/files/patch-ae
new file mode 100644
index 000000000000..6494be16d0a2
--- /dev/null
+++ b/multimedia/xmms/files/patch-ae
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	Mon Jul 31 10:27:32 2000
++++ Makefile.in	Mon Jul 31 10:27:49 2000
+@@ -205,9 +205,9 @@
+ 		rm -f $(srcdir)/stamp-h.in; \
+ 		$(MAKE) $(srcdir)/stamp-h.in; \
+ 	else :; fi
+-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+-	cd $(top_srcdir) && $(AUTOHEADER)
+-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
++#$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
++#	cd $(top_srcdir) && $(AUTOHEADER)
++#	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
+ 
+ mostlyclean-hdr:
+ 
diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist
index 43c38cb1bb86..1c115f9822bf 100644
--- a/multimedia/xmms/pkg-plist
+++ b/multimedia/xmms/pkg-plist
@@ -13,7 +13,6 @@ include/xmms/plugin.h
 include/xmms/util.h
 include/xmms/xmmsctrl.h
 lib/libxmms.a
-lib/libxmms.la
 lib/libxmms.so.1
 @exec ln -fs %D/%F %B/libxmms.so
 @unexec rm -f %B/libxmms.so