diff options
| author | nra <nra> | 2001-08-13 20:07:17 +0000 |
|---|---|---|
| committer | nra <nra> | 2001-08-13 20:07:17 +0000 |
| commit | 16090c57d00c27cecf7575fdfca96c3c82dd555a (patch) | |
| tree | bca4dc528729f2c1cd53345927a4245669899378 /audio | |
| parent | 9ebc7d8e6e9df9c826131c09e272adc48b98cc42 (diff) | |
| download | pkgsrc-16090c57d00c27cecf7575fdfca96c3c82dd555a.tar.gz | |
Change flac-xmms to use the recently buildlink-ified audio/flac.
PR 13686 by Ben Collver.
Changes as noted by Ben:
* flac libraries not redundantly built again for flac-xmms
* libtool not used to generate xmms plugin (good/bad?)
* does not install unnecessary .la file
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/flac-xmms/Makefile | 26 | ||||
| -rw-r--r-- | audio/flac-xmms/distinfo | 3 | ||||
| -rw-r--r-- | audio/flac-xmms/patches/patch-aa | 15 | ||||
| -rw-r--r-- | audio/flac-xmms/pkg/PLIST | 3 |
4 files changed, 23 insertions, 24 deletions
diff --git a/audio/flac-xmms/Makefile b/audio/flac-xmms/Makefile index 8c6453b05dc..fd3be3be137 100644 --- a/audio/flac-xmms/Makefile +++ b/audio/flac-xmms/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2001/07/24 10:14:56 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/08/13 20:07:17 nra Exp $ # DISTNAME= flac-1.0-src PKGNAME= flac-xmms-1.0 -WRKSRC= ${WRKDIR}/flac-1.0 +WRKSRC= ${WRKDIR}/flac-1.0/src/plugin_xmms/ CATEGORIES= audio archivers MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/} @@ -11,30 +11,14 @@ MAINTAINER= collver@linuxfreemail.com HOMEPAGE= http://flac.sourceforge.net COMMENT= FLAC xmms plugin -BUILD_DEPENDS+= automake>=1.4:../../devel/automake DEPENDS+= xmms>=1.2.4:../../audio/xmms -DEPENDS+= flac>=1.0:../../audio/flac -.include "../../mk/bsd.prefs.mk" - -.if ${MACHINE_PLATFORM:MNetBSD-*-i386} != "" -BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm -.endif - -GNU_CONFIGURE= yes +MAKEFILE= Makefile.lite USE_GMAKE= yes -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig - -pre-configure: - (cd ${WRKSRC}/src/libFLAC/ia32 && \ - ${MV} Makefile.am Makefile.am.orig && \ - ${CP} Makefile.am.libtool-1.4b Makefile.am) - (cd ${WRKSRC} && ${LOCALBASE}/bin/automake) do-install: - ${LIBTOOL} --mode=install ${INSTALL_DATA} \ - ${WRKSRC}/src/plugin_xmms/libxmms-flac.la \ + ${INSTALL_PROGRAM} ${WRKSRC}/../../obj/lib/libxmms-flac.so \ ${PREFIX}/lib/xmms/Input +.include "../../audio/flac/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/flac-xmms/distinfo b/audio/flac-xmms/distinfo index 59e98110959..f0a0254f570 100644 --- a/audio/flac-xmms/distinfo +++ b/audio/flac-xmms/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/07/23 18:16:10 wiz Exp $ +$NetBSD: distinfo,v 1.2 2001/08/13 20:07:17 nra Exp $ SHA1 (flac-1.0-src.tar.gz) = acfd76e56dafdad843adcf680a51ecf48911142e Size (flac-1.0-src.tar.gz) = 384379 bytes +SHA1 (patch-aa) = 8c166a5aebec7ddbadc9a1196b231e21e6673d51 diff --git a/audio/flac-xmms/patches/patch-aa b/audio/flac-xmms/patches/patch-aa new file mode 100644 index 00000000000..15cd06635a2 --- /dev/null +++ b/audio/flac-xmms/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.1 2001/08/13 20:07:17 nra Exp $ + +--- Makefile.lite.orig Thu Jun 7 17:00:48 2001 ++++ Makefile.lite +@@ -20,8 +20,8 @@ + # + + LIB_NAME = libxmms-flac +-INCLUDES = $(shell xmms-config --cflags) -I./include -I../../include +-LIBS = ../../obj/lib/libFLAC.a ++INCLUDES = $(shell xmms-config --cflags) -I./include -I${BUILDLINK}/include ++LIBS = ${LOCALBASE}/lib/libFLAC.a + + OBJS = \ + plugin.o diff --git a/audio/flac-xmms/pkg/PLIST b/audio/flac-xmms/pkg/PLIST index e99adf877c7..b96b0507fdf 100644 --- a/audio/flac-xmms/pkg/PLIST +++ b/audio/flac-xmms/pkg/PLIST @@ -1,3 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/07/23 18:16:10 wiz Exp $ -lib/xmms/Input/libxmms-flac.la +@comment $NetBSD: PLIST,v 1.2 2001/08/13 20:07:17 nra Exp $ lib/xmms/Input/libxmms-flac.so |