diff options
-rw-r--r-- | audio/xmms-crossfade/Makefile | 11 | ||||
-rw-r--r-- | audio/xmms-dflowers/Makefile | 8 | ||||
-rw-r--r-- | audio/xmms-dflowers/distinfo | 4 | ||||
-rw-r--r-- | audio/xmms-dflowers/patches/patch-aa | 16 | ||||
-rw-r--r-- | audio/xmms-dscope/Makefile | 10 | ||||
-rw-r--r-- | audio/xmms-dscope/distinfo | 4 | ||||
-rw-r--r-- | audio/xmms-dscope/patches/patch-aa | 16 |
7 files changed, 33 insertions, 36 deletions
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile index 8325d8fa92b..0b3d0ff0a17 100644 --- a/audio/xmms-crossfade/Makefile +++ b/audio/xmms-crossfade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/08/08 15:29:45 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/09/21 01:31:24 jlam Exp $ # DISTNAME= xmms-crossfade-0.2.9 @@ -11,14 +11,15 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.netcologne.de/~nc-eisenlpe2/xmms-crossfade/ COMMENT= Crossfading/Gapless Plugin for XMMS -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig LDFLAGS+= ${LIBOSSAUDIO} -.include "../../audio/xmms/buildlink.mk" -.include "../../mk/ossaudio.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../audio/xmms/buildlink2.mk" +.include "../../mk/ossaudio.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile index 4b79da20837..d9def0de0ae 100644 --- a/audio/xmms-dflowers/Makefile +++ b/audio/xmms-dflowers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/10/24 22:10:45 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/09/21 01:32:22 jlam Exp $ # DISTNAME= dflowers-1.2 @@ -10,10 +10,10 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html COMMENT= XMMS plugin for dual flower scope -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -.include "../../audio/xmms/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../audio/xmms/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-dflowers/distinfo b/audio/xmms-dflowers/distinfo index 10714679e71..ecb14259889 100644 --- a/audio/xmms-dflowers/distinfo +++ b/audio/xmms-dflowers/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2001/08/16 04:30:12 zuntum Exp $ +$NetBSD: distinfo,v 1.4 2002/09/21 01:32:22 jlam Exp $ SHA1 (dflowers-1.2.tar.gz) = 5f7b518652a6df3677fdeaffa5014ad0171dd426 Size (dflowers-1.2.tar.gz) = 47953 bytes -SHA1 (patch-aa) = f18cc78c739bbb9be981b935093280412b4af85b +SHA1 (patch-aa) = 23999676cc61311cfc69206e67653c6a01e4f1e5 diff --git a/audio/xmms-dflowers/patches/patch-aa b/audio/xmms-dflowers/patches/patch-aa index 696b81def44..bfaed568310 100644 --- a/audio/xmms-dflowers/patches/patch-aa +++ b/audio/xmms-dflowers/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2001/08/16 04:30:12 zuntum Exp $ +$NetBSD: patch-aa,v 1.4 2002/09/21 01:32:23 jlam Exp $ ---- Makefile.orig Sat Jun 9 23:37:36 2001 +--- Makefile.orig Sat Jun 9 14:37:36 2001 +++ Makefile -@@ -1,35 +1,36 @@ +@@ -1,13 +1,9 @@ # Change paths if necessary -CC = gcc @@ -13,14 +13,12 @@ $NetBSD: patch-aa,v 1.3 2001/08/16 04:30:12 zuntum Exp $ -CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread` -LFLAGS = -shared -fPIC -L/usr/local/lib -OBJ = dflowers.o --INSTALL-DIR=`xmms-config --visualization-plugin-dir` --XMMS_DATADIR=`xmms-config --data-dir` -+CFLAGS+= $(OPT) -Wall -fPIC `${GTK_CONFIG} --cflags gthread` ++CFLAGS+= $(OPT) -Wall -fPIC `gtk-config --cflags gthread` +OBJ = dflowers.lo -+INSTALL-DIR=`$(XMMS_CONFIG) --visualization-plugin-dir` -+XMMS_DATADIR=`$(XMMS_CONFIG) --data-dir` + INSTALL-DIR=`xmms-config --visualization-plugin-dir` + XMMS_DATADIR=`xmms-config --data-dir` #INSTALL-DIR=$(HOME)/.xmms/Plugins - #XMMS_DATADIR=$(HOME)/.xmms +@@ -15,21 +11,26 @@ XMMS_DATADIR=`xmms-config --data-dir` THEME_SUBDIR=dflowers_themes XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\" diff --git a/audio/xmms-dscope/Makefile b/audio/xmms-dscope/Makefile index 0964440227b..19a62790f0a 100644 --- a/audio/xmms-dscope/Makefile +++ b/audio/xmms-dscope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/24 22:10:45 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/09/21 01:34:50 jlam Exp $ # DISTNAME= dscope-1.2 @@ -10,12 +10,12 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html COMMENT= XMMS plugin for dual scope -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES USE_LIBTOOL= YES pre-build: - cd ${WRKSRC} ; ${MAKE} clean + cd ${WRKSRC} ; ${MAKE} clean -.include "../../audio/xmms/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../audio/xmms/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-dscope/distinfo b/audio/xmms-dscope/distinfo index 9d3b8253247..328a0854f99 100644 --- a/audio/xmms-dscope/distinfo +++ b/audio/xmms-dscope/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2001/08/16 04:40:29 zuntum Exp $ +$NetBSD: distinfo,v 1.4 2002/09/21 01:34:50 jlam Exp $ SHA1 (dscope-1.2.tar.gz) = 5a4750c0a8170c1e2d263df1212262b3adad1210 Size (dscope-1.2.tar.gz) = 34353 bytes -SHA1 (patch-aa) = ea612e13db0e4bd4bd52d0644c56739817e141c5 +SHA1 (patch-aa) = 1dec86cbec9d870ee2586d3f209e4bbb7ecacfb5 diff --git a/audio/xmms-dscope/patches/patch-aa b/audio/xmms-dscope/patches/patch-aa index 3f9a44b6819..bdf0d1d3fcc 100644 --- a/audio/xmms-dscope/patches/patch-aa +++ b/audio/xmms-dscope/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2001/08/16 04:40:29 zuntum Exp $ +$NetBSD: patch-aa,v 1.4 2002/09/21 01:34:50 jlam Exp $ ---- Makefile.orig Sat Jan 20 15:18:28 2001 +--- Makefile.orig Sat Jan 20 06:18:28 2001 +++ Makefile -@@ -1,34 +1,37 @@ +@@ -1,12 +1,12 @@ # Change paths & OPT if necessary -CC = gcc @@ -14,15 +14,13 @@ $NetBSD: patch-aa,v 1.3 2001/08/16 04:40:29 zuntum Exp $ -CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread` -LFLAGS = -shared -fPIC -L/usr/local/lib -OBJ = dscope.o --INSTALL-DIR=`xmms-config --visualization-plugin-dir` --XMMS_DATADIR=`xmms-config --data-dir` -+CFLAGS+= $(OPT) -Wall -fPIC `${GTK_CONFIG} --cflags gthread` ++CFLAGS+= $(OPT) -Wall -fPIC `gtk-config --cflags gthread` +#LFLAGS = -shared -fPIC -L/usr/local/lib +OBJ = dscope.lo -+INSTALL-DIR=`$(XMMS_CONFIG) --visualization-plugin-dir` -+XMMS_DATADIR=`$(XMMS_CONFIG) --data-dir` + INSTALL-DIR=`xmms-config --visualization-plugin-dir` + XMMS_DATADIR=`xmms-config --data-dir` #INSTALL-DIR=$(HOME)/.xmms/Plugins - #XMMS_DATADIR=$(HOME)/.xmms +@@ -14,21 +14,24 @@ XMMS_DATADIR=`xmms-config --data-dir` THEME_SUBDIR=dscope_themes XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\" |