o set USE_BUILDLINK_ONLY

o use XMMS_CONFIG
o derive PKGNAME from DISTNAME
This commit is contained in:
zuntum 2001-08-16 04:59:59 +00:00
parent 5bb4885157
commit a5831930e2
3 changed files with 13 additions and 9 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.4 2001/08/16 03:34:22 zuntum Exp $ # $NetBSD: Makefile,v 1.5 2001/08/16 04:59:59 zuntum Exp $
# #
DISTNAME= dspectogram-1.2 DISTNAME= dspectogram-1.2
PKGNAME= xmms-dspectogram-1.2 PKGNAME= xmms-${DISTNAME}
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= http://hem.passagen.se/joakime/ MASTER_SITES= http://hem.passagen.se/joakime/
@ -10,9 +10,11 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html HOMEPAGE= http://hem.passagen.se/joakime/linuxapp.html
COMMENT= XMMS plugin for dual spectogram COMMENT= XMMS plugin for dual spectogram
USE_BUILDLINK_ONLY= YES
USE_X11= yes USE_X11= yes
USE_LIBTOOL= yes USE_LIBTOOL= yes
MAKE_ENV+= GTK_CONFIG=${BUILDLINK_CONFIG_WRAPPER.gtk} MAKE_ENV+= GTK_CONFIG=${BUILDLINK_CONFIG_WRAPPER.gtk}
MAKE_ENV+= XMMS_CONFIG=${BUILDLINK_CONFIG_WRAPPER.xmms}
pre-build: pre-build:
cd ${WRKSRC} ; ${MAKE} clean cd ${WRKSRC} ; ${MAKE} clean

View file

@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.2 2001/08/16 03:20:46 hubertf Exp $ $NetBSD: distinfo,v 1.3 2001/08/16 04:59:59 zuntum Exp $
SHA1 (dspectogram-1.2.tar.gz) = defad396e898efdaa597312629afc1b46bd7e9c9 SHA1 (dspectogram-1.2.tar.gz) = defad396e898efdaa597312629afc1b46bd7e9c9
Size (dspectogram-1.2.tar.gz) = 40791 bytes Size (dspectogram-1.2.tar.gz) = 40791 bytes
SHA1 (patch-aa) = f61a8b8e6243c1da1ef4da356cf7f2a25d7a1e92 SHA1 (patch-aa) = 898302d39374a09cdd90736b344854f94cb5ed73

View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.2 2001/08/16 03:20:46 hubertf Exp $ $NetBSD: patch-aa,v 1.3 2001/08/16 04:59:59 zuntum Exp $
--- Makefile.orig Sat Jan 20 15:20:49 2001 --- Makefile.orig Sat Jan 20 15:20:49 2001
+++ Makefile +++ Makefile
@@ -1,12 +1,12 @@ @@ -1,34 +1,37 @@
# Change paths & OPT if necessary # Change paths & OPT if necessary
-CC = gcc -CC = gcc
@ -14,13 +14,15 @@ $NetBSD: patch-aa,v 1.2 2001/08/16 03:20:46 hubertf Exp $
-CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread` -CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
-LFLAGS = -shared -fPIC -L/usr/local/lib -LFLAGS = -shared -fPIC -L/usr/local/lib
-OBJ = dspectogram.o -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 +#LFLAGS = -shared -fPIC -L/usr/local/lib
+OBJ = dspectogram.lo +OBJ = dspectogram.lo
INSTALL-DIR=`xmms-config --visualization-plugin-dir` +INSTALL-DIR=`$(XMMS_CONFIG) --visualization-plugin-dir`
XMMS_DATADIR=`xmms-config --data-dir` +XMMS_DATADIR=`$(XMMS_CONFIG) --data-dir`
#INSTALL-DIR=$(HOME)/.xmms/Plugins #INSTALL-DIR=$(HOME)/.xmms/Plugins
@@ -14,21 +14,24 @@ #XMMS_DATADIR=$(HOME)/.xmms
THEME_SUBDIR=dspectogram_themes THEME_SUBDIR=dspectogram_themes
XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\" XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\"