summaryrefslogtreecommitdiff
path: root/audio/esound
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-08-25 18:38:05 +0000
committerjlam <jlam@pkgsrc.org>2002-08-25 18:38:05 +0000
commite2afa97f51a1f72e6618533019aaaae07b7d3cf2 (patch)
treed2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /audio/esound
parente97ad43756dc8382d2c6cb8a7ae09be0eb540f67 (diff)
downloadpkgsrc-e2afa97f51a1f72e6618533019aaaae07b7d3cf2.tar.gz
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework.
Diffstat (limited to 'audio/esound')
-rw-r--r--audio/esound/Makefile7
-rw-r--r--audio/esound/buildlink2.mk21
-rw-r--r--audio/esound/distinfo2
-rw-r--r--audio/esound/patches/patch-ad2
4 files changed, 27 insertions, 5 deletions
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index d3dd3c4ad2e..1761633b406 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/07/18 02:19:27 rh Exp $
+# $NetBSD: Makefile,v 1.33 2002/08/25 18:38:05 jlam Exp $
DISTNAME= esound-0.2.26
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://www.tux.org/~ricdude/EsounD.html
COMMENT= the Enlightened sound daemon
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
@@ -19,6 +19,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/esound
CONF_FILES= ${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf
-.include "../../audio/libaudiofile/buildlink.mk"
+.include "../../audio/libaudiofile/buildlink2.mk"
+
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/esound/buildlink2.mk b/audio/esound/buildlink2.mk
new file mode 100644
index 00000000000..ec37357b4e5
--- /dev/null
+++ b/audio/esound/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:05 jlam Exp $
+
+.if !defined(ESOUND_BUILDLINK2_MK)
+ESOUND_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= esound
+BUILDLINK_DEPENDS.esound?= esound>=0.2.18
+BUILDLINK_PKGSRCDIR.esound?= ../../audio/esound
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.esound=esound
+BUILDLINK_PREFIX.esound_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.esound= include/esd.h
+BUILDLINK_FILES.esound+= lib/libesd.*
+
+.include "../../audio/libaudiofile/buildlink2.mk"
+
+BUILDLINK_TARGETS+= esound-buildlink
+
+esound-buildlink: _BUILDLINK_USE
+
+.endif # ESOUND_BUILDLINK2_MK
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index 46049d9d213..3d6acb8a756 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/07/18 02:19:27 rh Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 18:38:06 jlam Exp $
SHA1 (esound-0.2.26.tar.gz) = dffa3424120b896b879a2ea95f2c495a49dadc45
Size (esound-0.2.26.tar.gz) = 349513 bytes
diff --git a/audio/esound/patches/patch-ad b/audio/esound/patches/patch-ad
index 0452ce3481c..9b82d999cb7 100644
--- a/audio/esound/patches/patch-ad
+++ b/audio/esound/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2002/07/18 02:19:28 rh Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 18:38:07 jlam Exp $
--- esound.pc.in.orig Tue Apr 23 18:28:28 2002
+++ esound.pc.in