From 28d18d8fe6eb69a5695419036b68a962f3352207 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 21 Sep 2002 01:46:52 +0000 Subject: buildlink1 -> buildlink2 --- audio/xmms-dspectogram/Makefile | 10 +++++----- audio/xmms-dspectogram/distinfo | 4 ++-- audio/xmms-dspectogram/patches/patch-aa | 16 +++++++--------- audio/xmms-dspectralizer/Makefile | 10 +++++----- audio/xmms-dspectralizer/distinfo | 4 ++-- audio/xmms-dspectralizer/patches/patch-aa | 10 +++++----- 6 files changed, 26 insertions(+), 28 deletions(-) diff --git a/audio/xmms-dspectogram/Makefile b/audio/xmms-dspectogram/Makefile index 64fca03603a..c3fcc2f08dd 100644 --- a/audio/xmms-dspectogram/Makefile +++ b/audio/xmms-dspectogram/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:46:52 jlam Exp $ # DISTNAME= dspectogram-1.2 @@ -10,12 +10,12 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html COMMENT= XMMS plugin for dual spectogram -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-dspectogram/distinfo b/audio/xmms-dspectogram/distinfo index 63c230ff445..59fbcd58425 100644 --- a/audio/xmms-dspectogram/distinfo +++ b/audio/xmms-dspectogram/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2001/08/16 04:59:59 zuntum Exp $ +$NetBSD: distinfo,v 1.4 2002/09/21 01:46:52 jlam Exp $ SHA1 (dspectogram-1.2.tar.gz) = defad396e898efdaa597312629afc1b46bd7e9c9 Size (dspectogram-1.2.tar.gz) = 40791 bytes -SHA1 (patch-aa) = 898302d39374a09cdd90736b344854f94cb5ed73 +SHA1 (patch-aa) = b08397f747f762d4da09471a3f91a03cba173603 diff --git a/audio/xmms-dspectogram/patches/patch-aa b/audio/xmms-dspectogram/patches/patch-aa index a3f72889be7..fd242a0acab 100644 --- a/audio/xmms-dspectogram/patches/patch-aa +++ b/audio/xmms-dspectogram/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2001/08/16 04:59:59 zuntum Exp $ +$NetBSD: patch-aa,v 1.4 2002/09/21 01:46:52 jlam Exp $ ---- Makefile.orig Sat Jan 20 15:20:49 2001 +--- Makefile.orig Sat Jan 20 06:20:49 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:59:59 zuntum Exp $ -CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread` -LFLAGS = -shared -fPIC -L/usr/local/lib -OBJ = dspectogram.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 = dspectogram.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=dspectogram_themes XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\" diff --git a/audio/xmms-dspectralizer/Makefile b/audio/xmms-dspectralizer/Makefile index 68688d0eb5a..0a22087f4c9 100644 --- a/audio/xmms-dspectralizer/Makefile +++ b/audio/xmms-dspectralizer/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:46:59 jlam Exp $ # DISTNAME= dspectral-1.2 @@ -10,12 +10,12 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html COMMENT= XMMS plugin for dual spectral analyzer -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-dspectralizer/distinfo b/audio/xmms-dspectralizer/distinfo index 602a7fe5e82..0f24aead533 100644 --- a/audio/xmms-dspectralizer/distinfo +++ b/audio/xmms-dspectralizer/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2001/12/06 04:38:39 jmc Exp $ +$NetBSD: distinfo,v 1.4 2002/09/21 01:46:59 jlam Exp $ SHA1 (dspectral-1.2.tar.gz) = da32adcdcfef1cc2e32e4d5013623be64922c430 Size (dspectral-1.2.tar.gz) = 41866 bytes -SHA1 (patch-aa) = 0cd4f6a71b4d98687a2fa7a53fd532e05191950c +SHA1 (patch-aa) = ba20a05edbc3f1cccde8593933186bea2c37286f diff --git a/audio/xmms-dspectralizer/patches/patch-aa b/audio/xmms-dspectralizer/patches/patch-aa index 72659d710e4..2e97210f214 100644 --- a/audio/xmms-dspectralizer/patches/patch-aa +++ b/audio/xmms-dspectralizer/patches/patch-aa @@ -1,26 +1,26 @@ -$NetBSD: patch-aa,v 1.3 2001/12/06 04:38:40 jmc Exp $ +$NetBSD: patch-aa,v 1.4 2002/09/21 01:46:59 jlam Exp $ ---- Makefile.orig Sat Jan 20 15:19:26 2001 +--- Makefile.orig Sat Jan 20 06:19:26 2001 +++ Makefile @@ -1,12 +1,12 @@ # Change paths & OPT if necessary -CC = gcc -+#CC = gcc -OPT = -m486 -O2 ++#CC = gcc +OPT = -O2 #OPT = -mpentium -O6 #OPT = -mcpu=k6 -march=k6 -O6 -CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread` -LFLAGS = -shared -fPIC -L/usr/local/lib -OBJ = dspectral.o -+CFLAGS+= $(OPT) -Wall -fPIC `${GTK_CONFIG} --cflags gthread` ++CFLAGS+= $(OPT) -Wall -fPIC `gtk-config --cflags gthread` +#LFLAGS = -shared -fPIC -L/usr/local/lib +OBJ = dspectral.lo INSTALL-DIR=`xmms-config --visualization-plugin-dir` XMMS_DATADIR=`xmms-config --data-dir` #INSTALL-DIR=$(HOME)/.xmms/Plugins -@@ -14,21 +14,24 @@ +@@ -14,21 +14,24 @@ XMMS_DATADIR=`xmms-config --data-dir` THEME_SUBDIR=dspectral_themes XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\" -- cgit v1.2.3