From 38532ef4050fb51b6020232d3e4fa4cb92f3608c Mon Sep 17 00:00:00 2001 From: osa Date: Tue, 27 Jul 2004 06:31:58 +0000 Subject: Move package files from plist to Makefile, remove pkg-plist. Respect CFLAGS by comment on CDEBUGFLAGS (aka -O2 -g -Wall). --- audio/xmradio/Makefile | 2 ++ audio/xmradio/files/patch-aa | 18 +++++++++++++----- audio/xmradio/pkg-plist | 2 -- 3 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 audio/xmradio/pkg-plist (limited to 'audio') diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile index e4b3ec9ed88..e6d19a278b9 100644 --- a/audio/xmradio/Makefile +++ b/audio/xmradio/Makefile @@ -21,6 +21,8 @@ USE_IMAKE= yes USE_XPM= yes USE_MOTIF= yes +PLIST_FILES= bin/xmradio lib/X11/app-defaults/XMradio + .include .if ${OSVERSION} < 500000 diff --git a/audio/xmradio/files/patch-aa b/audio/xmradio/files/patch-aa index ddd3524b48c..35efdb7b0c9 100644 --- a/audio/xmradio/files/patch-aa +++ b/audio/xmradio/files/patch-aa @@ -1,8 +1,8 @@ ---- Imakefile.orig Wed Nov 1 09:53:30 2000 -+++ Imakefile Wed Nov 1 09:54:05 2000 +--- Imakefile.orig Wed Nov 14 01:33:48 2001 ++++ Imakefile Tue Jul 27 10:25:29 2004 @@ -4,9 +4,10 @@ #endif - + #ifdef NetBSDArchitecture -LOCAL_LIBRARIES = XmClientLibs ${XMULIB} -lXpm -lossaudio -lm +LOCAL_LIBRARIES = ${MOTIFLIB} ${XTOOLLIB} $(XPLIB) ${XLIB} ${XMULIB} -lXpm -los @@ -10,7 +10,15 @@ #else -LOCAL_LIBRARIES = XmClientLibs ${XMULIB} -lXpm -lm +LOCAL_LIBRARIES = ${MOTIFLIB} ${XTOOLLIB} $(XPLIB) ${XLIB} ${XMULIB} -lXpm -lm - + EXTRA_LDOPTIONS = -L/usr/local/lib -Wl,-R/usr/local/lib INCLUDES = -I/usr/local/include - +@@ -15,7 +16,7 @@ + SRCS = radio.c remote.c analyzer.c sample.c misc.c config.c version_check.c LiteClue.c lcd_net.c + OBJS = radio.o remote.o analyzer.o sample.o misc.o config.o version_check.o LiteClue.o lcd_net.o + +-CDEBUGFLAGS = -O2 -g -Wall ++#CDEBUGFLAGS = -O2 -g -Wall + + XCOMM CCOPTIONS= -DJUHA_DRIVER -DHAS_XPM + CCOPTIONS= -DHAS_XPM diff --git a/audio/xmradio/pkg-plist b/audio/xmradio/pkg-plist deleted file mode 100644 index b21ab1d1d8c..00000000000 --- a/audio/xmradio/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/xmradio -lib/X11/app-defaults/XMradio -- cgit