5 files changed, 27 insertions, 120 deletions

diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index c8085c90bc39..6d1bbb8c9400 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmp
-PORTVERSION=	3.5.0
+PORTVERSION=	4.0.0
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF
@@ -12,30 +12,25 @@ COMMENT=	A player for many different Amiga and PC module formats
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	xmp:${PORTSDIR}/audio/libxmp
+
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc --disable-arts \
-		--disable-audacious-plugin
-
-MAN1=		xmp.1
 
-OPTIONS_DEFINE=	ALSA BMP ESOUND NAS PULSEAUDIO UNZIP XMMS DOCS
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
 
-BMP_DESC=	Beep media player plugin
-XMMS_DESC=	XMMS plugin
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFAULT=UNZIP
+MAN1=		xmp.1
 
-MAKE_JOBS_SAFE=	yes
+CONFIG_FILES=	xmp.conf modules.conf
 
-CFLAGS+=	-I${LOCALBASE}/include
+OPTIONS_DEFINE=	ALSA PULSEAUDIO
 
 .include <bsd.port.options.mk>
 
-PORTDOCS=	*
-
 .if ${PORT_OPTIONS:MALSA}
 LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
 RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
@@ -44,29 +39,6 @@ CONFIGURE_ARGS+=	--enable-alsa
 CONFIGURE_ARGS+=	--disable-alsa
 .endif
 
-.if ${PORT_OPTIONS:MBMP}
-LIB_DEPENDS+=	beep:${PORTSDIR}/multimedia/beep-media-player
-CONFIGURE_ARGS+=	--enable-bmp-plugin
-PLIST_SUB+=	BMP=""
-.else
-CONFIGURE_ARGS+=	--disable-bmp-plugin
-PLIST_SUB+=	BMP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MESOUND}
-USE_GNOME+=	esound
-CONFIGURE_ARGS+=	--enable-esd
-.else
-CONFIGURE_ARGS+=	--disable-esd
-.endif
-
-.if ${PORT_OPTIONS:MNAS}
-LIB_DEPENDS+=	audio:${PORTSDIR}/audio/nas
-CONFIGURE_ARGS+=	--enable-nas
-.else
-CONFIGURE_ARGS+=	--disable-nas
-.endif
-
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 LIB_DEPENDS+=	pulse-simple:${PORTSDIR}/audio/pulseaudio
 CONFIGURE_ARGS+=	--enable-pulseaudio
@@ -74,47 +46,17 @@ CONFIGURE_ARGS+=	--enable-pulseaudio
 CONFIGURE_ARGS+=	--disable-pulseaudio
 .endif
 
-.if ${PORT_OPTIONS:MUNZIP}
-RUN_DEPENDS+=	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
-.else
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-misc-load.c
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e 's|\(pulseaudio\.o\)|sound_\1|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|\ install-conf||' ${WRKSRC}/Makefile.in
 
-.if ${PORT_OPTIONS:MXMMS}
-LIB_DEPENDS+=	xmms:${PORTSDIR}/multimedia/xmms
-CONFIGURE_ARGS+=	--enable-xmms-plugin
-PLIST_SUB+=	XMMS=""
-.else
-CONFIGURE_ARGS+=	--disable-xmms-plugin
-PLIST_SUB+=	XMMS="@comment "
+post-install:
+	${MKDIR} ${PREFIX}/etc/xmp
+.for f in ${CONFIG_FILES}
+.if !exists(${ETCDIR}/${f})
+	${INSTALL_DATA} ${WRKSRC}/src/${f} ${ETCDIR}/${f}
 .endif
-
-post-patch:	.SILENT
-.for f in docs/xmp.1 etc/xmp.conf etc/modules.conf
-	${REINPLACE_CMD} -e "s|/etc/xmp|${ETCDIR}|g" ${WRKSRC}/${f}
+	${INSTALL_DATA} ${WRKSRC}/src/${f} ${ETCDIR}/${f}.sample
 .endfor
-	${REINPLACE_CMD} -e \
-		'/$$(INSTALL_DATA)/s|\([[:alnum:]]*\.conf\).*$$|&\1.sample|' \
-		${WRKSRC}/etc/Makefile
-	@${REINPLACE_CMD} -e \
-		's|-Wno-unknown-warning-option -Wno-unused-but-set-variable||' \
-		${WRKSRC}/configure
-
-post-install:	.SILENT
-	if  [ ! -f ${ETCDIR}/${PORTNAME}.conf ]; then \
-		${INSTALL_DATA} ${ETCDIR}/${PORTNAME}.conf.sample \
-			${ETCDIR}/${PORTNAME}.conf; \
-	fi
-	if [ ! -f ${ETCDIR}/modules.conf ]; then \
-		${INSTALL_DATA} ${ETCDIR}/modules.conf.sample \
-			${ETCDIR}/modules.conf; \
-	fi
-
-.if ${PORT_OPTIONS:MDOCS}
-	${ECHO_MSG} Installing documentation in ${DOCSDIR}
-	( cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* \
-		${DOCSDIR} '! ( -name Makefile -or -name xmp.1 \
-		-or -name *.bak -or -name *.orig )' )
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/xmp/distinfo b/audio/xmp/distinfo
index e56453898244..64373816b62c 100644
--- a/audio/xmp/distinfo
+++ b/audio/xmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xmp-3.5.0.tar.gz) = e1c7c7f9a59da7901f299e1b93b4ffb4ad17731cbb8f09df5c2d5eab2ef7e3a3
-SIZE (xmp-3.5.0.tar.gz) = 887671
+SHA256 (xmp-4.0.0.tar.gz) = 0a78728f8a108235360676af779ac5df1ab9e68f96d0a0ed5b1fa26c83764de1
+SIZE (xmp-4.0.0.tar.gz) = 127630
diff --git a/audio/xmp/files/extra-patch-src-misc-load.c b/audio/xmp/files/extra-patch-src-misc-load.c
deleted file mode 100644
index b34f83c89532..000000000000
--- a/audio/xmp/files/extra-patch-src-misc-load.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/misc/load.c~
-+++ src/misc/load.c
-@@ -99,8 +99,11 @@ static int decrunch(struct xmp_context *
- 	cmd = "unzip -pqqC \"%s\" -x readme *.diz *.nfo *.txt *.exe *.com "
- 		"README *.DIZ *.NFO *.TXT *.EXE *.COM " REDIR_STDERR;
- #else
--	cmd = "unzip -pqqC \"%s\" -x readme '*.diz' '*.nfo' '*.txt' '*.exe' "
--		"'*.com' README '*.DIZ' '*.NFO' '*.TXT' '*.EXE' '*.COM' "
-+	cmd = "bsdtar xOf \"%s\" --exclude readme --exclude '*.diz' "
-+		"--exclude '*.nfo' --exclude '*.txt' --exclude '*.exe' "
-+		"--exclude '*.com' --exclude  README --exclude '*.DIZ' "
-+		"--exclude '*.NFO' --exclude '*.TXT' --exclude '*.EXE' "
-+		"--exclude '*.COM' "
- 		REDIR_STDERR;
- #endif
-     } else if (b[2] == '-' && b[3] == 'l' && b[4] == 'h') {
diff --git a/audio/xmp/files/patch-configure b/audio/xmp/files/patch-configure
deleted file mode 100644
index 5b54a5d2714c..000000000000
--- a/audio/xmp/files/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
-$FreeBSD$
-
-From ports/160597, upstreamed:
-
-http://sourceforge.net/mailarchive/forum.php?thread_name=86ty8zcut0.fsf%40gmail.com&forum_name=xmp-devel
-
---- configure~
-+++ configure
-@@ -5166,7 +5166,7 @@ done
-     fi
-     ;;
- freebsd*)
--    for ac_header in sys/resource.h sys/rtprio.h
-+    for ac_header in sys/types.h sys/resource.h sys/rtprio.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/audio/xmp/pkg-plist b/audio/xmp/pkg-plist
index 4edc76eaefe0..442a6cd22541 100644
--- a/audio/xmp/pkg-plist
+++ b/audio/xmp/pkg-plist
@@ -1,10 +1,8 @@
+@unexec if cmp -s %D/etc/xmp/xmp.conf %D/etc/xmp/xmp.conf.sample; then rm -f %D/etc/xmp/xmp.conf; fi
+etc/xmp/xmp.conf.sample
+@exec [ -f %B/xmp.conf ] || cp %B/%f %B/xmp.conf
 bin/xmp
-@unexec if cmp -s %D/%%ETCDIR%%/xmp.conf.sample %D/%%ETCDIR%%/xmp.conf; then rm -f %D/%%ETCDIR%%/xmp.conf; fi
-%%ETCDIR%%/xmp.conf.sample
-@exec if [ ! -f %D/%%ETCDIR%%/xmp.conf ]; then cp -p %D/%F %B/xmp.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/modules.conf.sample %D/%%ETCDIR%%/modules.conf; then rm -f %D/%%ETCDIR%%/modules.conf; fi
-%%ETCDIR%%/modules.conf.sample
-@exec if [ ! -f %D/%%ETCDIR%%/modules.conf ]; then cp -p %D/%F %B/modules.conf; fi
-%%BMP%%lib/bmp/Input/xmp-bmp.so
-%%XMMS%%lib/xmms/Input/xmp-xmms.so
-@dirrmtry %%ETCDIR%%
+@unexec if cmp -s %D/etc/xmp/modules.conf %D/etc/xmp/modules.conf.sample; then rm -f %D/etc/xmp/modules.conf; fi
+etc/xmp/modules.conf.sample
+@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf
+@dirrmtry etc/xmp