17 files changed, 60 insertions, 239 deletions

diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index fef0d83093cc..3e7317008ab8 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xmp
-PORTVERSION=	2.0.4
-PORTREVISION=	5
+PORTVERSION=	2.5.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,32 +14,45 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	A player for many different Amiga and PC module formats
 
-USE_BZIP2=	yes
-USE_GNOME=	esound
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:213
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-alsa --disable-oss --enable-esd
+CONFIGURE_ARGS=	--disable-alsa --enable-oss \
+		--sysconfdir=${PREFIX}/etc
 
 MAN1=		xmp.1
 MLINKS=		xmp.1 xxmp.1
 
+OPTIONS=	XMMS	"Build XMMS plugin" off \
+		ESOUND	"EsounD support" off
+
 CFLAGS+=	-fPIC
 
-.if !defined(WITHOUT_XMMS)
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ESOUND)
+USE_GNOME+=	esound
+.else
+CONFIGURE_ARGS+=	--disable-esd
+.endif
+
+.if defined(WITH_XMMS)
 LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
+CONFIGURE_ARGS+=	--enable-xmms-plugin
 .else
-CONFIGURE_ARGS+=--disable-xmms
+CONFIGURE_ARGS+=	--disable-xmms
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/docs/xmp.1
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
+.for f in docs/xmp.1 etc/xmp.conf etc/xmp-modules.conf
+	@${REINPLACE_CMD} -e "s|/etc/xmp|${PREFIX}/etc/xmp|g" ${WRKSRC}/${f}
+.endfor
+	@${REINPLACE_CMD} -E -e 's|(^DDIRS.*)etc|\1|' ${WRKSRC}/Makefile
+
+post-install:
+	@${MKDIR} ${PREFIX}/etc/xmp
+	@${INSTALL_DATA} ${WRKSRC}/etc/xmp.conf ${PREFIX}/etc/xmp/xmp.conf.default
+	@${INSTALL_DATA} ${WRKSRC}/etc/xmp-modules.conf ${PREFIX}/etc/xmp/xmp-modules.conf.default
 
 .include <bsd.port.post.mk>
diff --git a/audio/xmp/distinfo b/audio/xmp/distinfo
index 01ef3a6954e1..c4a70d71fb8e 100644
--- a/audio/xmp/distinfo
+++ b/audio/xmp/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmp-2.0.4.tar.bz2) = db1813fec46c57757965c53a8cf33c4f
-SHA256 (xmp-2.0.4.tar.bz2) = 830555c08eea5bbe7b1eb88a860ad8e51743de00e73397502fe9d69b81bbc241
-SIZE (xmp-2.0.4.tar.bz2) = 314820
+MD5 (xmp-2.5.1.tar.gz) = 79040d5ae0efaf7ea116c5fe05d99b75
+SHA256 (xmp-2.5.1.tar.gz) = af9dedfc6f312c1f68fb73f286be26b67755877c6b53803b9dea9f3d189b992f
+SIZE (xmp-2.5.1.tar.gz) = 772595
diff --git a/audio/xmp/files/patch-aa b/audio/xmp/files/patch-aa
deleted file mode 100644
index ad72ee9d3c5d..000000000000
--- a/audio/xmp/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/player/readrc.c.orig	Wed Mar  1 09:42:44 2000
-+++ src/player/readrc.c	Fri Aug  4 23:24:03 2000
-@@ -56,7 +56,7 @@
-     if ((rc = fopen (myrc2, "r")) == NULL) {
- 	if ((rc = fopen (myrc, "r")) == NULL) {
- #ifndef __EMX__
--	    if ((rc = fopen ("/etc/xmp.conf", "r")) == NULL) {
-+	    if ((rc = fopen (ETC_DIR "/xmp.conf", "r")) == NULL) {
- #else
- 	    if ((rc = fopen ("xmp.conf", "r")) == NULL) {
- #endif
-@@ -202,7 +202,7 @@
-     myrc = malloc ((home ? strlen (home) : 0) + 20);
- #ifndef __EMX__
-     sprintf (myrc, "%s/.xmp/modules.conf", home);
--    parse_modconf (ctl, "/etc/xmp-modules.conf", crc, size);
-+    parse_modconf (ctl, ETC_DIR "/xmp-modules.conf", crc, size);
- #else
-     sprintf (myrc, "%s\\.xmp\\modules.conf", home);
-     parse_modconf (ctl, "xmp-modules.conf", crc, size);
diff --git a/audio/xmp/files/patch-ab b/audio/xmp/files/patch-ab
deleted file mode 100644
index 8c76034bf44c..000000000000
--- a/audio/xmp/files/patch-ab
+++ /dev/null
@@ -1,9 +0,0 @@
---- etc/Makefile.old	Mon Jan  1 16:49:34 2001
-+++ etc/Makefile	Mon Jan  1 16:50:29 2001
-@@ -20,5 +20,5 @@
- 	@if [ -f $(DEST_DIR)/etc/xmp-modules.conf ]; then \
- 	    mv -f $(DEST_DIR)/etc/xmp-modules.conf $(DEST_DIR)/etc/xmp-modules.conf.old; \
- 	fi
--	$(INSTALL) -m644 xmp.conf xmp-modules.conf $(DEST_DIR)/etc
-+	$(INSTALL_DATA) xmp.conf xmp-modules.conf $(ETC_DIR)
- 
diff --git a/audio/xmp/files/patch-ac b/audio/xmp/files/patch-ac
deleted file mode 100644
index 30074c8afadf..000000000000
--- a/audio/xmp/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	Sun May  7 03:41:24 2000
-+++ Makefile	Fri Aug  4 23:48:52 2000
-@@ -42,8 +42,8 @@
- 
- install::
- 	@echo
--	@echo "  Installation complete. To customize, copy /etc/xmp.conf to"
--	@echo "  \$$HOME/.xmp/xmp.conf and /etc/xmp-modules.conf to \$$HOME/.xmp/modules.conf"
-+	@echo "  Installation complete. To customize, copy ${ETC_DIR}/xmp.conf to"
-+	@echo "  \$$HOME/.xmp/xmp.conf and ${ETC_DIR}/xmp-modules.conf to \$$HOME/.xmp/modules.conf"
- 	@echo
- 	@echo "  Please report bugs to xmp-bugs@helllabs.org."
- 	@echo
diff --git a/audio/xmp/files/patch-ad b/audio/xmp/files/patch-ad
deleted file mode 100644
index 817092fea8e0..000000000000
--- a/audio/xmp/files/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.rules.in.old	Sun Feb 11 02:36:54 2001
-+++ Makefile.rules.in	Sun Feb 11 02:38:45 2001
-@@ -9,14 +9,17 @@
- exec_prefix= $(DEST_DIR)@prefix@
- BIN_DIR	= @bindir@
- LIB_DIR = @libdir@
-+ETC_DIR = @sysconfdir@
- MAN_DIR	= @mandir@/man1
- 
- CC	= @CC@
--CFLAGS	= -c @CFLAGS@ @DEFS@ @CINCS@
-+CFLAGS	= -c @CFLAGS@ @DEFS@ @CINCS@ -DETC_DIR=\"$(ETC_DIR)\"
- LD	= @CC@
- LDFLAGS	= -o$@ @LDFLAGS@
- RANLIB	= @RANLIB@
- INSTALL	= @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
- LIBS	= @LIBS@ $(XLIBS)
- SHELL	= /bin/sh
- PLATFORM= @PLATFORM@
diff --git a/audio/xmp/files/patch-ae b/audio/xmp/files/patch-ae
deleted file mode 100644
index f6fe6a9bf4a2..000000000000
--- a/audio/xmp/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- docs/Makefile.orig	Thu Jan 20 06:49:20 2000
-+++ docs/Makefile	Sat Aug  5 02:44:20 2000
-@@ -21,8 +21,8 @@
- install:: docs
- 	@echo Installing manpages in $(MAN_DIR)...
- 	@[ -d $(MAN_DIR) ] || mkdir -p $(MAN_DIR)
--	$(INSTALL) -m644 xmp.1 $(MAN_DIR)
-+	$(INSTALL_DATA) xmp.1 $(MAN_DIR)
- 	@if test "$(X_XMP)x" = xxmpx; then \
--	    $(INSTALL) -m644 $(X_XMP).1 $(MAN_DIR); \
-+	    $(INSTALL_DATA) $(X_XMP).1 $(MAN_DIR); \
- 	fi
- 
diff --git a/audio/xmp/files/patch-af b/audio/xmp/files/patch-af
deleted file mode 100644
index 83ed0a8e3b25..000000000000
--- a/audio/xmp/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/xmp.1.orig	Wed Mar 15 09:58:49 2000
-+++ docs/xmp.1	Sat Aug  5 03:19:50 2000
-@@ -225,7 +225,7 @@
- Command line options \fB-M\fP and \fB-S\fP don\'t work correctly with xxmp\&.
- .PP 
- .SH "FILES" 
--\f(CW/etc/xmp\&.conf, /etc/xmp-modules\&.conf, $HOME/\&.xmp/xmp\&.conf,
-+\f(CW%%PREFIX%%/etc/xmp\&.conf, %%PREFIX%%/etc/xmp-modules\&.conf, $HOME/\&.xmp/xmp\&.conf,
- $HOME/\&.xmp/xmp-modules\&.conf\fP
- .PP 
- .SH "AUTHOR" 
diff --git a/audio/xmp/files/patch-ag b/audio/xmp/files/patch-ag
deleted file mode 100644
index 99baf4d22b19..000000000000
--- a/audio/xmp/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main/Makefile.orig	Thu Jan 20 00:59:33 2000
-+++ src/main/Makefile	Sat Aug  5 02:43:15 2000
-@@ -32,7 +32,7 @@
- install:: $(BINS)
- 	@echo Installing binaries in $(BIN_DIR)...
- 	@[ -d $(BIN_DIR) ] || mkdir -p $(BIN_DIR)
--	$(INSTALL) -s -m755 $(BINS) $(BIN_DIR)
-+	$(INSTALL_PROGRAM) $(BINS) $(BIN_DIR)
- 
- $(OBJS): ../../Makefile.rules Makefile
- 
diff --git a/audio/xmp/files/patch-ah b/audio/xmp/files/patch-ah
deleted file mode 100644
index a51dbe5aac48..000000000000
--- a/audio/xmp/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xmms/Makefile.old	Sun Feb 11 02:39:18 2001
-+++ src/xmms/Makefile	Sun Feb 11 02:39:51 2001
-@@ -23,7 +23,7 @@
- 	make -C ../../lib shared
- 
- install::
--	$(INSTALL) -s -m755 xmp-plugin.so $(DEST_DIR)`xmms-config --input-plugin-dir`
-+	$(INSTALL_DATA) -s -m755 xmp-plugin.so $(DEST_DIR)`xmms-config --input-plugin-dir`
- 
- $(OBJS): Makefile
- 
diff --git a/audio/xmp/files/patch-ai b/audio/xmp/files/patch-ai
deleted file mode 100644
index 8a613ddcff26..000000000000
--- a/audio/xmp/files/patch-ai
+++ /dev/null
@@ -1,33 +0,0 @@
-*** src/loaders/it_load.c.orig	Wed Sep 10 12:13:18 2003
---- src/loaders/it_load.c	Wed Sep 10 12:11:36 2003
-***************
-*** 327,340 ****
-  
-  #define BUILD_ENV(X) { \
-  	    fread (&env, 1, sizeof (env), f); \
-! 	    xxih[i].##X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
-! 	    xxih[i].##X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
-! 	    xxih[i].##X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
-! 	    xxih[i].##X##ei.npt = env.num; \
-! 	    xxih[i].##X##ei.sus = env.slb; \
-! 	    xxih[i].##X##ei.sue = env.sle; \
-! 	    xxih[i].##X##ei.lps = env.lpb; \
-! 	    xxih[i].##X##ei.lpe = env.lpe; \
-  	    if (env.num) xx##X##e[i] = calloc (4, env.num); \
-  	    for (j = 0; j < env.num; j++) { \
-  		L_ENDIAN16 (env.node[j].x); \
---- 327,340 ----
-  
-  #define BUILD_ENV(X) { \
-  	    fread (&env, 1, sizeof (env), f); \
-! 	    xxih[i].X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
-! 	    xxih[i].X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
-! 	    xxih[i].X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
-! 	    xxih[i].X##ei.npt = env.num; \
-! 	    xxih[i].X##ei.sus = env.slb; \
-! 	    xxih[i].X##ei.sue = env.sle; \
-! 	    xxih[i].X##ei.lps = env.lpb; \
-! 	    xxih[i].X##ei.lpe = env.lpe; \
-  	    if (env.num) xx##X##e[i] = calloc (4, env.num); \
-  	    for (j = 0; j < env.num; j++) { \
-  		L_ENDIAN16 (env.node[j].x); \
diff --git a/audio/xmp/files/patch-aj b/audio/xmp/files/patch-aj
deleted file mode 100644
index d1a7f1c609f0..000000000000
--- a/audio/xmp/files/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-*** src/xmms/plugin.c.orig	Sun Jan  7 01:53:15 2001
---- src/xmms/plugin.c	Wed Sep 10 12:17:16 2003
-***************
-*** 228,234 ****
-  	xmp_cfg.filter = TRUE;
-  	xmp_cfg.pan_amplitude = 80;
-  
-! #define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg.##x)
-  
-  	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
-  	if ((cfg = xmms_cfg_open_file(filename))) {
---- 228,234 ----
-  	xmp_cfg.filter = TRUE;
-  	xmp_cfg.pan_amplitude = 80;
-  
-! #define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg.x)
-  
-  	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
-  	if ((cfg = xmms_cfg_open_file(filename))) {
diff --git a/audio/xmp/files/patch-ak b/audio/xmp/files/patch-ak
deleted file mode 100644
index 49565494d920..000000000000
--- a/audio/xmp/files/patch-ak
+++ /dev/null
@@ -1,36 +0,0 @@
-*** src/xmms/plugin.c.orig	Wed Sep 10 14:13:18 2003
---- src/xmms/plugin.c	Wed Sep 10 14:13:31 2003
-***************
-*** 558,564 ****
-  	gtk_object_set_data(GTK_OBJECT(xmp_conf_window), #w, w);	\
-  	gtk_widget_show(w);						\
-  	gtk_box_pack_start(GTK_BOX(vbox6), w, TRUE, TRUE, 0);		\
-! 	if (xmp_cfg.##o == 1)						\
-  		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE); \
-  }
-  
---- 558,564 ----
-  	gtk_object_set_data(GTK_OBJECT(xmp_conf_window), #w, w);	\
-  	gtk_widget_show(w);						\
-  	gtk_box_pack_start(GTK_BOX(vbox6), w, TRUE, TRUE, 0);		\
-! 	if (xmp_cfg.o == 1)						\
-  		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE); \
-  }
-  
-***************
-*** 658,664 ****
-  	if (!cfg)
-  		cfg = xmms_cfg_new();
-  
-! #define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg.##x)
-  
-  	CFGWRITEINT (mixing_freq);
-  	CFGWRITEINT (force8bit);
---- 658,664 ----
-  	if (!cfg)
-  		cfg = xmms_cfg_new();
-  
-! #define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg.x)
-  
-  	CFGWRITEINT (mixing_freq);
-  	CFGWRITEINT (force8bit);
diff --git a/audio/xmp/files/patch-src-drivers-oss_seq.c b/audio/xmp/files/patch-src-drivers-oss_seq.c
new file mode 100644
index 000000000000..78b7d5fbf018
--- /dev/null
+++ b/audio/xmp/files/patch-src-drivers-oss_seq.c
@@ -0,0 +1,26 @@
+--- src/drivers/oss_seq.c.orig	2008-04-16 20:48:53.000000000 +0200
++++ src/drivers/oss_seq.c	2008-04-16 20:49:05.000000000 +0200
+@@ -141,7 +141,6 @@
+ #endif
+ 	if (num > SEQ_NUM_VOICES)
+ 	    return SEQ_NUM_VOICES;
+-	GUS_NUMVOICES (dev, num);
+ 	break;
+     }
+ 
+@@ -151,7 +150,6 @@
+ 
+ static void voicepos(int ch, int pos)
+ {
+-    GUS_VOICE_POS (dev, ch, pos);
+ }
+ 
+ 
+@@ -204,7 +202,6 @@
+ 
+ static void setpan(struct xmp_context *ctx, int ch, int pan)
+ {
+-    GUS_VOICEBALA(dev, ch, (pan + 0x80) >> 4)
+ }
+ 
+ 
diff --git a/audio/xmp/files/patch-src::loaders::ac1d_load.c b/audio/xmp/files/patch-src::loaders::ac1d_load.c
deleted file mode 100644
index 24a0a3beeb07..000000000000
--- a/audio/xmp/files/patch-src::loaders::ac1d_load.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/loaders/ac1d_load.c.orig	Sat Dec 30 03:08:12 2000
-+++ src/loaders/ac1d_load.c	Sat Sep 18 23:41:47 2004
-@@ -150,6 +150,7 @@
- 		    case 0x0a:
- 			event->fxt = 0x00;
- 		    case 0x0f:
-+			;
- 		    }
- 		}
- 	    }
diff --git a/audio/xmp/files/patch-src::loaders::pp10_load.c b/audio/xmp/files/patch-src::loaders::pp10_load.c
deleted file mode 100644
index 02e5b2b7abb4..000000000000
--- a/audio/xmp/files/patch-src::loaders::pp10_load.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/loaders/pp10_load.c.orig	Sat Dec 30 03:08:46 2000
-+++ src/loaders/pp10_load.c	Sat Sep 18 23:44:27 2004
-@@ -226,6 +226,7 @@
- 		    case 0x0a:
- 			event->fxt = 0x00;
- 		    case 0x0f:
-+			;
- 		    }
- 		}
- 
diff --git a/audio/xmp/pkg-plist b/audio/xmp/pkg-plist
index bf4a22e27acb..af1abb1b5812 100644
--- a/audio/xmp/pkg-plist
+++ b/audio/xmp/pkg-plist
@@ -1,5 +1,5 @@
 bin/xmp
-bin/xxmp
-etc/xmp.conf
-etc/xmp-modules.conf
-@unexec rm %D/lib/xmms/Input/xmp-plugin.so 2>/dev/null || true
+etc/xmp/xmp.conf.default
+etc/xmp/xmp-modules.conf.default
+@dirrmtry etc/xmp
+@unexec rm %D/lib/xmms/Input/xmp-xmms.so 2>/dev/null || true