From 62f78c53151be9896963f00104876941c74c2fde Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 21 Sep 2002 02:00:12 +0000 Subject: buildlink1 -> buildlink2 --- audio/xmms-fmradio/Makefile | 11 ++++++----- audio/xmms-gdancer/Makefile | 8 ++++---- audio/xmms-neato/Makefile | 30 +++++++++++++++--------------- audio/xmms-neato/distinfo | 4 ++-- audio/xmms-neato/patches/patch-aa | 4 ++-- audio/xmms-vismsa/Makefile | 10 +++++----- audio/xmms-vismsa/distinfo | 4 ++-- audio/xmms-vismsa/patches/patch-aa | 12 +++++------- 8 files changed, 41 insertions(+), 42 deletions(-) diff --git a/audio/xmms-fmradio/Makefile b/audio/xmms-fmradio/Makefile index f7dfd62291a..6155149b547 100644 --- a/audio/xmms-fmradio/Makefile +++ b/audio/xmms-fmradio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/01/14 15:28:38 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 02:00:12 jlam Exp $ # DISTNAME= xmms-FMRadio-1.4 @@ -13,11 +13,12 @@ COMMENT= Use a Radio Tuner card in XMMS ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-*-* NetBSD-1.[6-9]*-* -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES BINOWN?= root BINGRP?= wheel -.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-gdancer/Makefile b/audio/xmms-gdancer/Makefile index 9e2dc35e62e..1dcb10f2693 100644 --- a/audio/xmms-gdancer/Makefile +++ b/audio/xmms-gdancer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/24 22:10:46 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/09/21 02:00:14 jlam Exp $ # DISTNAME= gdancer-0.4.3 @@ -10,11 +10,11 @@ MAINTAINER= zuntum@netbsd.org HOMEPAGE= http://figz.com/gdancer/ COMMENT= XMMS plugin to animate characters to the beat of the music -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES GNU_CONFIGURE= 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-neato/Makefile b/audio/xmms-neato/Makefile index f2392999a96..a23dc63e174 100644 --- a/audio/xmms-neato/Makefile +++ b/audio/xmms-neato/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/08/08 15:29:48 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2002/09/21 02:00:53 jlam Exp $ # DISTNAME= neato @@ -11,26 +11,26 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.rpi.edu/~mullr/xmms/ COMMENT= Circle effect XMMS plugin +USE_BUILDLINK2= yes +USE_X11= yes +USE_GMAKE= yes GNU_CONFIGURE= yes -USE_BUILDLINK_ONLY= yes USE_LIBTOOL= yes -USE_GMAKE= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= YES post-extract: - cd ${WRKSRC} ; \ - ${RM} mkinstalldirs ; \ - ${ECHO} "#!/bin/sh" >>mkinstalldirs ; \ - ${ECHO} 'exec ${MKDIR} "$$@"' >>mkinstalldirs ; \ - ${CHMOD} +x mkinstalldirs ; \ - ${RM} install-sh ; \ - ${ECHO} "#!/bin/sh" >>install-sh ; \ - ${ECHO} 'exec ${INSTALL} "$$@"' >>install-sh ; \ - ${CHMOD} +x install-sh ; \ - ${MAKE} distclean + cd ${WRKSRC} ; \ + ${RM} mkinstalldirs ; \ + ${ECHO} "#!/bin/sh" >>mkinstalldirs ; \ + ${ECHO} 'exec ${MKDIR} "$$@"' >>mkinstalldirs ; \ + ${CHMOD} +x mkinstalldirs ; \ + ${RM} install-sh ; \ + ${ECHO} "#!/bin/sh" >>install-sh ; \ + ${ECHO} 'exec ${INSTALL} "$$@"' >>install-sh ; \ + ${CHMOD} +x install-sh ; \ + ${MAKE} distclean -.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-neato/distinfo b/audio/xmms-neato/distinfo index 8c0b2dbd4c9..17626dd6fdf 100644 --- a/audio/xmms-neato/distinfo +++ b/audio/xmms-neato/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/08/18 05:02:21 hubertf Exp $ +$NetBSD: distinfo,v 1.2 2002/09/21 02:00:53 jlam Exp $ SHA1 (neato.tar.gz) = 43bbbf0f87a24073924dd0f6b7c095c468cec867 Size (neato.tar.gz) = 138206 bytes -SHA1 (patch-aa) = 6dc4a0037cd4aa3374dc2cc43b300c541cd28261 +SHA1 (patch-aa) = e91166f84d265f36aa8a0690391dd228b823defa diff --git a/audio/xmms-neato/patches/patch-aa b/audio/xmms-neato/patches/patch-aa index 38df586fbe5..9cc68b7a213 100644 --- a/audio/xmms-neato/patches/patch-aa +++ b/audio/xmms-neato/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/08/18 05:02:21 hubertf Exp $ +$NetBSD: patch-aa,v 1.2 2002/09/21 02:00:53 jlam Exp $ --- Makefile.in.orig Sat Dec 25 23:16:10 1999 +++ Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/08/18 05:02:21 hubertf Exp $ lib_LTLIBRARIES = neato.la -libdir = /usr/lib/xmms/Visualization -+libdir = `${XMMS_CONFIG} --visualization-plugin-dir` ++libdir = `xmms-config --visualization-plugin-dir` neato_la_LDFLAGS = -module -avoid-version LIBS = @GTK_LIBS@ diff --git a/audio/xmms-vismsa/Makefile b/audio/xmms-vismsa/Makefile index c128f32e005..eec995c4419 100644 --- a/audio/xmms-vismsa/Makefile +++ b/audio/xmms-vismsa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/10/24 22:10:46 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/09/21 02:09:35 jlam Exp $ # DISTNAME= vismsa-xmms-plugin-0.2 @@ -10,12 +10,12 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://a.godau.org/ COMMENT= vis plugin similar to the Spectrum Analyser from Open Cubic Player -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-vismsa/distinfo b/audio/xmms-vismsa/distinfo index 9dcb75f51d5..5a56a15ccb7 100644 --- a/audio/xmms-vismsa/distinfo +++ b/audio/xmms-vismsa/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2001/08/23 14:48:17 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/09/21 02:09:35 jlam Exp $ SHA1 (vismsa-xmms-plugin-0.2.tar.gz) = c3e44f2097e6f0c6ed1b41fa652e41650f0722ee Size (vismsa-xmms-plugin-0.2.tar.gz) = 13694 bytes -SHA1 (patch-aa) = ac143136a7f32c4aa68dfe44a804370b60f8f576 +SHA1 (patch-aa) = 69221322c242ee59e38c7f304aaf0eb89d208c51 diff --git a/audio/xmms-vismsa/patches/patch-aa b/audio/xmms-vismsa/patches/patch-aa index f229838ed2a..495881edc19 100644 --- a/audio/xmms-vismsa/patches/patch-aa +++ b/audio/xmms-vismsa/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2001/08/23 14:48:17 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2002/09/21 02:09:36 jlam Exp $ ---- Makefile.orig Fri Mar 23 23:36:18 2001 +--- Makefile.orig Fri Mar 23 14:36:18 2001 +++ Makefile @@ -1,31 +1,34 @@ # Change paths & OPT if necessary @@ -14,13 +14,11 @@ $NetBSD: patch-aa,v 1.3 2001/08/23 14:48:17 jlam Exp $ -CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread` -LFLAGS = -shared -fPIC -L/usr/local/lib -OBJ = vismsa.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 = vismsa.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 #XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\" -- cgit v1.2.3