summaryrefslogtreecommitdiff
path: root/audio/xmms
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-08-29 22:41:00 +0000
committerjlam <jlam@pkgsrc.org>2001-08-29 22:41:00 +0000
commit63fc151cb9f15f8bcc66bbeca21050fea30c29d3 (patch)
tree0943c3791afa0b712d3818b69672014acfe55e03 /audio/xmms
parent70004632b203c88d357d29ec8f217d1caa85f9c7 (diff)
downloadpkgsrc-63fc151cb9f15f8bcc66bbeca21050fea30c29d3.tar.gz
Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to ${LOCALBASE}/share/x11-links. These packages should now be strongly- buildlinked regardless of whether xpkgwedge is installed. Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
Diffstat (limited to 'audio/xmms')
-rw-r--r--audio/xmms/distinfo6
-rw-r--r--audio/xmms/patches/patch-am4
-rw-r--r--audio/xmms/patches/patch-an4
3 files changed, 7 insertions, 7 deletions
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index 2871493d25a..f4d82d0c42b 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2001/08/11 20:51:24 fredb Exp $
+$NetBSD: distinfo,v 1.7 2001/08/29 22:41:02 jlam Exp $
SHA1 (xmms-1.2.5.tar.gz) = 64d64a6db0b08ba91a135229437c384da7dba1e5
Size (xmms-1.2.5.tar.gz) = 2414840 bytes
@@ -12,8 +12,8 @@ SHA1 (patch-ai) = d05ba576dc40dd29d59c571fbab369d83fbe0b06
SHA1 (patch-aj) = 95e965c5033dea5d2b0be2a22058f19504da0031
SHA1 (patch-ak) = 9c89fc3014c1109b14f56c4bdaae7782f2531529
SHA1 (patch-al) = 3150ee9972911c5152f14a0771d9e9a2cbcb107f
-SHA1 (patch-am) = 3f44eb6ea71c47133482142f4d18ff60c230763c
-SHA1 (patch-an) = 9055b76be68766955311b8f388afd60c604c0c34
+SHA1 (patch-am) = 0de11b998fcf90f64c2e8442edc427e3bc49653c
+SHA1 (patch-an) = 2a622693d825c631e36f73bc35a9639c40071564
SHA1 (patch-ao) = 428e1083a104358d752ddc483310a97764cb6979
SHA1 (patch-ap) = 493a4d81960b4d11548b8f277c00b8315339ac02
SHA1 (patch-aq) = 3eb19fbebfc0ea68cd6703b6b3d1a706406b1aee
diff --git a/audio/xmms/patches/patch-am b/audio/xmms/patches/patch-am
index 9d5f03c5cfe..a084ab3823d 100644
--- a/audio/xmms/patches/patch-am
+++ b/audio/xmms/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2001/05/20 20:52:24 rh Exp $
+$NetBSD: patch-am,v 1.3 2001/08/29 22:41:02 jlam Exp $
--- Output/OSS/Makefile.in.orig Tue Nov 28 01:56:02 2000
+++ Output/OSS/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.2 2001/05/20 20:52:24 rh Exp $
libOSS_la_LDFLAGS = $(ossldflags)
-libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
-+libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ -lossaudio
++libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ${LIBOSSAUDIO}
libOSS_la_SOURCES = $(osssources)
INCLUDES = @GTK_CFLAGS@ @OSS_CFLAGS@ -I$(top_builddir)/intl
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/audio/xmms/patches/patch-an b/audio/xmms/patches/patch-an
index e5e0dd06eb9..e17529159d3 100644
--- a/audio/xmms/patches/patch-an
+++ b/audio/xmms/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.3 2001/06/21 16:38:34 rh Exp $
+$NetBSD: patch-an,v 1.4 2001/08/29 22:41:02 jlam Exp $
--- Input/cdaudio/Makefile.in.orig Mon Jun 18 21:55:46 2001
+++ Input/cdaudio/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-an,v 1.3 2001/06/21 16:38:34 rh Exp $
INCLUDES = @GTK_CFLAGS@ @XML_CFLAGS@ -I$(top_buiddir)/intl
libcdaudio_la_LDFLAGS = $(cdaudioldflags)
-libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@
-+libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@ -lossaudio
++libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@ ${LIBOSSAUDIO}
libcdaudio_la_SOURCES = $(cdaudiosources)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h ../../xmms/i18n.h