[pkgsrc/trunk]: pkgsrc/audio/xmp darwin fixes (plus some makefile patching to...

[danw <danw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b465369e5f85
branches:  trunk
changeset: 475483:b465369e5f85
user:      danw <danw%pkgsrc.org@localhost>
date:      Sun May 16 17:11:30 2004 +0000

description:
darwin fixes (plus some makefile patching to get rid of the irrelevant
but scary-looking errors at make install time)

diffstat:

 audio/xmp/Makefile         |   9 ++++++++-
 audio/xmp/distinfo         |   6 ++++--
 audio/xmp/patches/patch-ae |  11 +++++++----
 audio/xmp/patches/patch-ag |  12 ++++++++++++
 audio/xmp/patches/patch-ah |  13 +++++++++++++
 5 files changed, 44 insertions(+), 7 deletions(-)

diffs (99 lines):

diff -r d876fd2d4ea0 -r b465369e5f85 audio/xmp/Makefile
--- a/audio/xmp/Makefile        Sun May 16 17:07:22 2004 +0000
+++ b/audio/xmp/Makefile        Sun May 16 17:11:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/04/11 17:13:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/16 17:11:30 danw Exp $
 # FreeBSD: ports/audio/xmp/Makefile,v 1.5 2000/04/08 21:24:59 mharo Exp
 #
 
@@ -27,6 +27,13 @@
 CONF_FILES=    ${EGDIR}/xmp-modules.conf ${PKG_SYSCONFDIR}/xmp-modules.conf
 CONF_FILES+=   ${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp.conf
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+# XMP has no native Darwin support, so make it use the esound backend
+.include "../../audio/esound/buildlink3.mk"
+.endif
+
 pre-install:
        ${INSTALL_DATA_DIR} ${EGDIR}
 
diff -r d876fd2d4ea0 -r b465369e5f85 audio/xmp/distinfo
--- a/audio/xmp/distinfo        Sun May 16 17:07:22 2004 +0000
+++ b/audio/xmp/distinfo        Sun May 16 17:11:30 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/09/22 09:30:03 tron Exp $
+$NetBSD: distinfo,v 1.6 2004/05/16 17:11:30 danw Exp $
 
 SHA1 (xmp-2.0.4.tar.bz2) = 35c1578f2f6728aa2ec92f34ada050e328694167
 Size (xmp-2.0.4.tar.bz2) = 314820 bytes
@@ -6,5 +6,7 @@
 SHA1 (patch-ab) = 9d4732f57cf045a3904b8d9627ccb866d39e0fb0
 SHA1 (patch-ac) = 0efcb2f094f149c56da96a6ba7ba9a59ed06dc4d
 SHA1 (patch-ad) = 7b2c1f5c10b4b8a766bcca7bc4d7d9f538e89db1
-SHA1 (patch-ae) = 251bd77372088b1e72a581c0c39e722aacb40a0e
+SHA1 (patch-ae) = e136083ec69df5b32cb741bb14173f58fa613574
 SHA1 (patch-af) = 96743b9d31adec688a0bcab05bd8b32a9e162a54
+SHA1 (patch-ag) = 431875a9a1889e0c63620c04a78473116c090fae
+SHA1 (patch-ah) = d6119a1d0ef33bf58bd443b2f18d72cb9ea1956a
diff -r d876fd2d4ea0 -r b465369e5f85 audio/xmp/patches/patch-ae
--- a/audio/xmp/patches/patch-ae        Sun May 16 17:07:22 2004 +0000
+++ b/audio/xmp/patches/patch-ae        Sun May 16 17:11:30 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2002/12/22 17:05:52 jmmv Exp $
+$NetBSD: patch-ae,v 1.2 2004/05/16 17:11:30 danw Exp $
 
---- Makefile.rules.in.orig     Sat Jan 20 02:51:53 2001
+--- Makefile.rules.in.orig     Fri Jan 19 20:51:53 2001
 +++ Makefile.rules.in
-@@ -7,12 +7,14 @@ DATE = Fri Jan 19 23:51:53 BRST 2001
+@@ -7,14 +7,16 @@ DATE = Fri Jan 19 23:51:53 BRST 2001
  DEST_DIR=
  prefix        = $(DEST_DIR)@prefix@
  exec_prefix= $(DEST_DIR)@prefix@
@@ -16,5 +16,8 @@
 -CFLAGS        = -c @CFLAGS@ @DEFS@ @CINCS@
 +CFLAGS        = -c @CFLAGS@ @DEFS@ @CINCS@ -DETC_DIR=\"${ETC_DIR}\"
  LD    = @CC@
- LDFLAGS       = -o$@ @LDFLAGS@
+-LDFLAGS       = -o$@ @LDFLAGS@
++LDFLAGS       = -o $@ @LDFLAGS@
  RANLIB        = @RANLIB@
+ INSTALL       = @INSTALL@
+ LIBS  = @LIBS@ $(XLIBS)
diff -r d876fd2d4ea0 -r b465369e5f85 audio/xmp/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/xmp/patches/patch-ag        Sun May 16 17:11:30 2004 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2004/05/16 17:11:30 danw Exp $
+
+--- configure.orig     Sat May 15 09:48:55 2004
++++ configure
+@@ -593,7 +593,6 @@ CINCS="${CPPFLAGS}"
+ PLUGIN=""
+ 
+ 
+-LDFLAGS=""
+ 
+ 
+ X_XMP="xxmp"
diff -r d876fd2d4ea0 -r b465369e5f85 audio/xmp/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/xmp/patches/patch-ah        Sun May 16 17:11:30 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2004/05/16 17:11:30 danw Exp $
+
+--- src/Makefile.orig  Sat May 15 10:09:32 2004
++++ src/Makefile
+@@ -2,7 +2,7 @@
+ 
+ DFILES        = Makefile
+ _DIRS = drivers include loaders player misc main
+-DDIRS = $(_DIRS) os2 xmms
++DDIRS = $(_DIRS)
+ CFILES        =
+ DCFILES       =
+