>Number:         15283
>Category:       pkg
>Synopsis:       Update audio/xmp to 2.0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Jan 18 03:13:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Rui-Xiang Guo
>Release:        NetBSD 1.5ZA
>Organization:
	
>Environment:
	
	
System: NetBSD rxgpc.sparqnet.net 1.5ZA NetBSD 1.5ZA (HIVE) #0: Sat Jan 12 21:07:31 CST 2002 rxg@rxgpc.sparqnet.net:/usr/src/sys/arch/i386/compile/HIVE i386
Architecture: i386
Machine: i386
>Description:
	2.0.4 (20010119):
        - 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
>How-To-Repeat:
	1. Fix the Makefile:
	--- /usr/pkgsrc/audio/xmp/Makefile      Fri Apr 27 11:38:25 2001
+++ Makefile
@@ -2,14 +2,13 @@
 # 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

	2. Replace the patches:
patch-aa:
$NetBSD$

--- Makefile.orig       Sat Jan 20 09:51:28 2001
+++ Makefile
@@ -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
 
@@ -43,8 +44,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 ${PREFIX}/etc/xmp.conf to"
+       @echo "  \$$HOME/.xmp/xmp.conf and ${PREFIX}/etc/xmp-modules.conf to \$$HOME/.xmp/modules.c
onf"
        @echo
        @echo "  Please report bugs to xmp-bugs@helllabs.org."
        @echo

patch-ac:
$NetBSD$

--- etc/Makefile.orig   Fri Jan 18 18:38:12 2002
+++ etc/Makefile
@@ -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) -m644 xmp.conf xmp-modules.conf $(PREFIX)/etc
 

patch-ad:
$NetBSD$

--- src/main/Makefile.orig      Tue Jan 16 08:54:02 2001
+++ src/main/Makefile
@@ -7,7 +7,7 @@
 XDEPS  =
 BINS   = xmp $(X_XMP)
 XLIBS  = -L../../lib -lxmp -lm #-lefence
-X11LIBS        = -lX11 -lXext
+X11LIBS        = -lX11 -lXext -Wl,-R$(X11BASE)/lib
 XPMS   = bg1.xpm bg2.xpm bg3.xpm
 DFILES = Makefile $(OBJS:.o=.c) $(X11OBJS:.o=.c) main.c xpanel.h $(XPMS) \
          simple.c

	3. cd /usr/pkgsrc/audio/xmp ; make && make install
>Fix:
	
>Release-Note:
>Audit-Trail:
>Unformatted: