Updated xmp-2.0.4 (provided by Rui-Xiang Guo in pkg/15283)

- Added driver for synthesized sounds
- Added Tatsuyuki Satoh's YM3812 emulator
- Added support to The Player 6.0a modules (using Sylvain "Asle"
  Chipaux's P60A loader)
- Added seek capability to XMMS plugin
- Added (very) experimental AIX driver
- Added envelope point sanity checks (fixed "Beautiful Ones" IT
  envelope bug reported by Chris Cox)
- Added support to dynamic linked drivers (for better packaging)
- Added option to package only DFSG-compliant code
- Fixed audioio.h detection in OpenBSD 2.8 (by Chris Cox
  <cox.family@sk.sympatico.ca>)
- Max. filter cutoff value changed from 254 to 253 to avoid problems
  in "Beautiful Ones")
- Fixed external drivers problem with the XMMS plugin (reported by
  greg <gjones@computelnet.com>)
- Fixed xmp_ord_set() bug (was calling XMP_ORD_PREV)
- Fixed period calculation algorithm (that was an OLD bug!)
- Started adding support to MED 1.11, 1.12, 2.00 and 3.22
- Replaced RPM spec with Dominik Mierzejewski's version

6 files changed, 34 insertions, 37 deletions

diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index f20e2b9e163..7287ddf07b4 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2001/03/05 16:40:11 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/01/29 07:41:28 martti Exp $
 # FreeBSD: ports/audio/xmp/Makefile,v 1.5 2000/04/08 21:24:59 mharo Exp
 #
 
-DISTNAME=	xmp-2.0.2
+DISTNAME=	xmp-2.0.4
 CATEGORIES=	audio
-MASTER_SITES=	http://xmp.helllabs.org/pkg/2.0.2/ \
-		http://xmp.linuxbox.com/pkg/2.0.2/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmp/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	rxg@ms25.url.com.tw
-HOMEPAGE=	http://xmp.helllabs.org/
+HOMEPAGE=	http://xmp.sourceforge.net/
 COMMENT=	Player for many different Amiga and PC module formats
 
 GNU_CONFIGURE=	yes
diff --git a/audio/xmp/distinfo b/audio/xmp/distinfo
index db2ae9723d6..dcfca438162 100644
--- a/audio/xmp/distinfo
+++ b/audio/xmp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 12:14:41 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/01/29 07:41:28 martti Exp $
 
-SHA1 (xmp-2.0.2.tar.bz2) = fc5a4039670a7c8b224ed2468091398cc060e106
-Size (xmp-2.0.2.tar.bz2) = 249013 bytes
-SHA1 (patch-aa) = 33e7b60785b346cdeb30a0c8d7497491a84d4c42
-SHA1 (patch-ab) = f0ea6986c80bc108ad491dfee9a4954b6f607a26
-SHA1 (patch-ac) = 5845b7bd612d0cc72f534c2d94b247e78afefffd
-SHA1 (patch-ad) = 921f5c6cba02c3c4f97d07ce1c11636af22556b7
+SHA1 (xmp-2.0.4.tar.bz2) = 35c1578f2f6728aa2ec92f34ada050e328694167
+Size (xmp-2.0.4.tar.bz2) = 314820 bytes
+SHA1 (patch-aa) = 22f7d1ef64fba6f0dc7bf77bd1db707538bca8aa
+SHA1 (patch-ab) = 308779c6a2facd18251a1fa33947dfacdaeb4680
+SHA1 (patch-ac) = 43c70f84a7b9b9aaed0dfdbd60aee9be6cf2d0ef
+SHA1 (patch-ad) = 7b2c1f5c10b4b8a766bcca7bc4d7d9f538e89db1
diff --git a/audio/xmp/patches/patch-aa b/audio/xmp/patches/patch-aa
index bb52322f4a0..936c1a10faa 100644
--- a/audio/xmp/patches/patch-aa
+++ b/audio/xmp/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/28 01:25:40 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2002/01/29 07:41:28 martti Exp $
 
---- Makefile.orig	Sat Sep 16 01:24:09 2000
-+++ Makefile	Sat Sep 16 01:25:45 2000
-@@ -15,6 +15,7 @@
- DDIRS	= lib docs etc src scripts debian
+--- Makefile.orig	Sat Jan 20 02:51:28 2001
++++ Makefile	Mon Jan 28 15:30:21 2002
+@@ -16,6 +16,7 @@
+ DDIRS	= lib docs etc src scripts debian modules
  CFILES	=
  DCFILES	= Makefile.rules.old config.log config.status config.cache
 +ETCDIR	= ${PREFIX}/etc
  
  all: xmp
  
-@@ -42,8 +43,8 @@
+@@ -43,8 +44,8 @@
  
  install::
  	@echo
diff --git a/audio/xmp/patches/patch-ab b/audio/xmp/patches/patch-ab
index 576d39d2306..96cbc024e71 100644
--- a/audio/xmp/patches/patch-ab
+++ b/audio/xmp/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/28 01:25:40 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2002/01/29 07:41:28 martti Exp $
 
---- src/player/readrc.c.orig	Sat Sep 16 01:35:21 2000
-+++ src/player/readrc.c	Sat Sep 16 01:38:24 2000
-@@ -56,7 +56,7 @@
+--- src/player/readrc.c.orig	Wed Jan  3 11:50:08 2001
++++ src/player/readrc.c	Mon Jan 28 15:28:59 2002
+@@ -58,7 +58,7 @@
      if ((rc = fopen (myrc2, "r")) == NULL) {
  	if ((rc = fopen (myrc, "r")) == NULL) {
  #ifndef __EMX__
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/28 01:25:40 hubertf Exp $
  #else
  	    if ((rc = fopen ("xmp.conf", "r")) == NULL) {
  #endif
-@@ -202,7 +202,7 @@
+@@ -206,7 +206,7 @@
      myrc = malloc ((home ? strlen (home) : 0) + 20);
  #ifndef __EMX__
      sprintf (myrc, "%s/.xmp/modules.conf", home);
diff --git a/audio/xmp/patches/patch-ac b/audio/xmp/patches/patch-ac
index fe87be9956c..549ddcad030 100644
--- a/audio/xmp/patches/patch-ac
+++ b/audio/xmp/patches/patch-ac
@@ -1,13 +1,11 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/28 01:25:40 hubertf Exp $
+$NetBSD: patch-ac,v 1.2 2002/01/29 07:41:28 martti Exp $
 
---- etc/Makefile.orig	Wed Feb  2 21:20:34 2000
-+++ etc/Makefile	Fri Sep 15 23:22:03 2000
-@@ -21,7 +21,7 @@
- 	@if [ -f /etc/xmp-modules.conf ]; then \
- 	    mv -f /etc/xmp-modules.conf /etc/xmp-modules.conf.old; \
+--- etc/Makefile.orig	Mon Jan 28 15:55:41 2002
++++ etc/Makefile	Mon Jan 28 15:56:18 2002
+@@ -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 /etc
+-	$(INSTALL) -m644 xmp.conf xmp-modules.conf $(DEST_DIR)/etc
 +	$(INSTALL) -m644 xmp.conf xmp-modules.conf ${PREFIX}/etc
  
- xmp.spec: xmp.spec.in ../Makefile.rules
- 	cat $@.in | sed 's/@VERSION@/$(VERSION)/g' > $@
diff --git a/audio/xmp/patches/patch-ad b/audio/xmp/patches/patch-ad
index 8d7344f87b2..2daf0e595cb 100644
--- a/audio/xmp/patches/patch-ad
+++ b/audio/xmp/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/12/28 01:25:40 hubertf Exp $
+$NetBSD: patch-ad,v 1.2 2002/01/29 07:41:28 martti Exp $
 
---- src/main/Makefile.orig	Fri Sep 15 23:17:25 2000
-+++ src/main/Makefile	Fri Sep 15 23:20:30 2000
-@@ -6,7 +6,7 @@
+--- src/main/Makefile.orig	Tue Jan 16 01:54:02 2001
++++ src/main/Makefile	Mon Jan 28 15:32:24 2002
+@@ -7,7 +7,7 @@
  XDEPS	=
  BINS	= xmp $(X_XMP)
- XLIBS	= -L../../lib -lxmp #-lefence
+ XLIBS	= -L../../lib -lxmp -lm #-lefence
 -X11LIBS	= -lX11 -lXext
 +X11LIBS	= -lX11 -lXext -Wl,-R${X11BASE}/lib
  XPMS	= bg1.xpm bg2.xpm bg3.xpm