Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.

4 files changed, 32 insertions, 31 deletions

diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 8af37697593..accf6de298f 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/02/25 04:17:37 hubertf Exp $
+# $NetBSD: Makefile,v 1.21 2001/06/30 21:14:10 jlam Exp $
 #
 
 DISTNAME=		snd
@@ -13,16 +13,17 @@ COMMENT=		X based sound editor
 
 NO_SRC_ON_FTP=		Already on MASTER_SITE_LOCAL
 
-USE_MOTIF=		YES
-USE_XPM=		YES
+USE_BUILDLINK_ONLY=	YES
 MAKEFILE=		makefile.netbsd
 ALL_TARGET=		snd
-MAKE_ENV+=		MOTIFBASE=${MOTIFBASE}
+HTMLDIR=		${PREFIX}/share/doc/html/snd
 
 do-install:
 	cd ${WRKSRC} ; ${INSTALL_PROGRAM} snd ${PREFIX}/bin
 	cd ${WRKSRC} ; ${INSTALL_DATA} Snd.ad ${PREFIX}/lib/X11/app-defaults/Snd
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snd
-	cd ${WRKSRC} ; ${INSTALL_DATA} *.gif *.html *.txt README.Snd ${PREFIX}/share/doc/snd
+	${INSTALL_DATA_DIR} ${HTMLDIR}
+	cd ${WRKSRC} ; ${INSTALL_DATA} *.gif *.html *.txt README.Snd ${HTMLDIR}
 
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../x11/lesstif/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/snd/distinfo b/audio/snd/distinfo
index c1bd8dad7d6..b16561dc4b3 100644
--- a/audio/snd/distinfo
+++ b/audio/snd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 12:14:38 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/06/30 21:14:10 jlam Exp $
 
 SHA1 (snd.tar.gz) = cb48922170602f30553b604bda039974c1706b65
 Size (snd.tar.gz) = 735422 bytes
@@ -6,7 +6,7 @@ SHA1 (patch-aa) = 3aa0e5bcc54730628d220515919d8dbf11951c1a
 SHA1 (patch-ab) = de7027da166eda24e9f19c8ffc86192027e7eee1
 SHA1 (patch-ac) = d3073b7d102abcd05d7588b57eb8a053f20b74a7
 SHA1 (patch-ad) = 19a185e3e5a9800e56c904c06613b5d9645e6d17
-SHA1 (patch-ae) = 55e21eed21bfcd881158ba599e7ca0798201a085
+SHA1 (patch-ae) = c4b33c31fb70107f0501228f3c1f66512febd945
 SHA1 (patch-af) = a8cf1931093397bcf88be08d36bd11efd9d4c161
 SHA1 (patch-ag) = 7a19ce85c0c45ef2844ca22bca74de9238aa3ad1
 SHA1 (patch-ah) = f744861a8736e4acf498a751b42708e0922d5ff2
diff --git a/audio/snd/patches/patch-ae b/audio/snd/patches/patch-ae
index 21737f1e56d..d9c10022176 100644
--- a/audio/snd/patches/patch-ae
+++ b/audio/snd/patches/patch-ae
@@ -1,16 +1,16 @@
-$NetBSD: patch-ae,v 1.6 2000/09/22 06:50:07 minoura Exp $
+$NetBSD: patch-ae,v 1.7 2001/06/30 21:14:10 jlam Exp $
 
 --- makefile.netbsd.orig	Mon Aug  9 19:22:24 1999
 +++ makefile.netbsd	Mon Aug  9 19:25:36 1999
 @@ -0,0 +1,30 @@
 +# 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${MOTIFBASE}/include -I${PREFIX}/include
++#CC = gcc
++#CFLAGS = -O2 -DXPM -DHAVE_OSS -I${X11BASE}/include -I${BUILDLINK_DIR}/include
++CFLAGS += -DXPM -DHAVE_OSS -I${X11BASE}/include -I${BUILDLINK_DIR}/include
 +CFLAGS += -g
 +
-+LIBS = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${MOTIFBASE}/lib -Wl,-R${MOTIFBASE}/lib -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lMrm -lXm -lXpm -lXmu -lSM -lXt -lXext -lX11 -lm -lossaudio
++LIBS = ${LDFLAGS} -lMrm -lXm -lXpm -lXmu -lSM -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
diff --git a/audio/snd/pkg/PLIST b/audio/snd/pkg/PLIST
index d9dee596a2a..fb0f59e0b40 100644
--- a/audio/snd/pkg/PLIST
+++ b/audio/snd/pkg/PLIST
@@ -1,20 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1 1998/02/22 23:25:55 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/06/30 21:14:10 jlam Exp $
 bin/snd
 lib/X11/app-defaults/Snd
-share/doc/snd/README.Snd
-share/doc/snd/auto.gif
-share/doc/snd/controls.gif
-share/doc/snd/d.gif
-share/doc/snd/fft.gif
-share/doc/snd/files.gif
-share/doc/snd/mixer.gif
-share/doc/snd/n.gif
-share/doc/snd/rec.gif
-share/doc/snd/regions.gif
-share/doc/snd/s.gif
-share/doc/snd/save.gif
-share/doc/snd/snd-widgets.txt
-share/doc/snd/snd.html
-share/doc/snd/snd.txt
-share/doc/snd/title.gif
-@dirrm share/doc/snd
+share/doc/html/snd/README.Snd
+share/doc/html/snd/auto.gif
+share/doc/html/snd/controls.gif
+share/doc/html/snd/d.gif
+share/doc/html/snd/fft.gif
+share/doc/html/snd/files.gif
+share/doc/html/snd/mixer.gif
+share/doc/html/snd/n.gif
+share/doc/html/snd/rec.gif
+share/doc/html/snd/regions.gif
+share/doc/html/snd/s.gif
+share/doc/html/snd/save.gif
+share/doc/html/snd/snd-widgets.txt
+share/doc/html/snd/snd.html
+share/doc/html/snd/snd.txt
+share/doc/html/snd/title.gif
+@dirrm share/doc/html/snd