summaryrefslogtreecommitdiff
path: root/audio/snd
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>1998-05-19 11:33:09 +0000
committeragc <agc@pkgsrc.org>1998-05-19 11:33:09 +0000
commit0b522512029e9a734d74c08fc68dfdb409884cf5 (patch)
tree20645560abc1e58a622cef261112a394581263f3 /audio/snd
parent6630abd153c61b6a643df62b39374627af2c594e (diff)
downloadpkgsrc-0b522512029e9a734d74c08fc68dfdb409884cf5.tar.gz
Rather than using sed to patch the makefile.netbsd file for @X11BASE@
and @LOCALBASE@ values, use the X11BASE and LOCALBASE values that are passed through the environment.
Diffstat (limited to 'audio/snd')
-rw-r--r--audio/snd/Makefile13
-rw-r--r--audio/snd/patches/patch-ae6
2 files changed, 6 insertions, 13 deletions
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index fe1d1f15e95..fb3d2943267 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/05/11 11:34:05 frueauf Exp $
+# $NetBSD: Makefile,v 1.10 1998/05/19 11:33:10 agc Exp $
#
DISTNAME= snd
@@ -11,18 +11,11 @@ MAINTAINER= hubertf@netbsd.org
DEPENDS+= xpm-3.4j:../../graphics/xpm
-USE_X11= YES
-REQUIRES_MOTIF= YES
+USE_X11= yes
+REQUIRES_MOTIF= yes
MAKEFILE= makefile.netbsd
ALL_TARGET= snd
-post-patch:
- ${MV} ${WRKSRC}/makefile.netbsd ${WRKSRC}/makefile.netbsd.bak
- ${CAT} ${WRKSRC}/makefile.netbsd.bak | \
- ${SED} s/@LOCALBASE@/${LOCALBASE:S/\//\\\\\//g}/g | \
- ${SED} s/@X11BASE@/${X11BASE:S/\//\\\\\//g}/g \
- > ${WRKSRC}/makefile.netbsd
-
do-install:
cd ${WRKSRC} ; ${INSTALL_PROGRAM} snd ${PREFIX}/bin
cd ${WRKSRC} ; ${INSTALL_DATA} Snd.ad ${PREFIX}/lib/X11/app-defaults/Snd
diff --git a/audio/snd/patches/patch-ae b/audio/snd/patches/patch-ae
index a7e912e9604..f8192b3c0aa 100644
--- a/audio/snd/patches/patch-ae
+++ b/audio/snd/patches/patch-ae
@@ -4,11 +4,11 @@
+# Snd make file for NetBSD, assuming Motif is available (audio currently stubbed out)
+
+CC = gcc
-+#CFLAGS = -O2 -DXPM -DHAVE_OSS -I@X11BASE@/include -I@LOCALBASE@/include
-+CFLAGS = -DXPM -DHAVE_OSS -I@X11BASE@/include -I@LOCALBASE@/include
++#CFLAGS = -O2 -DXPM -DHAVE_OSS -I${X11BASE}/include -I${LOCALBASE}/include
++CFLAGS = -DXPM -DHAVE_OSS -I${X11BASE}/include -I${LOCALBASE}/include
+CFLAGS += -g
+
-+LIBS = -L/usr/X11R6/lib -lMrm -lXm -lXpm -lXmu -lXt -lXext -lX11 -lm -lossaudio
++LIBS = -L${X11BASE}/lib -lMrm -lXm -lXpm -lXmu -lXt -lXext -lX11 -lm -lossaudio
+CLM_HEADERS = cmus_prototypes.h cmus.h sound_types.h
+SND_HEADERS = snd.h snd-0.h snd-1.h snd-ufun.h snd-strings.h sndclm.h
+SND_X_HEADERS = snd-x0.h snd-x1.h