* Really complete buildlinkization:

  * Remove explicit references to /usr/local/include and /usr/local/lib
    added by the configure script.
  * Note that wslib/get-wsound-flags needs to have references to
    ${BUILDLINK_DIR} removed before installation by listing it in
    REPLACE_BUILDLINK.
* Remove patches that add -Wl,-R${X11BASE}/lib to the link flags of
  various libraries and programs.  This already should be passed in via
  LDFLAGS, and if additional flags are needed on Solaris, then we should
  just set the additional LDFLAGS in the package Makefile.

5 files changed, 24 insertions, 45 deletions

diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 1fc3e733f92..00a3e03d875 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/07/22 16:54:22 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/07/24 10:39:01 jlam Exp $
 #
 
 DISTNAME=	WSoundServer-0.4.0
@@ -11,10 +11,12 @@ HOMEPAGE=	http://shadowmere.student.utwente.nl/
 COMMENT=	sound server for windowmaker
 
 USE_BUILDLINK_ONLY=	YES
+REPLACE_BUILDLINK=	wslib/get-wsound-flags
+
+USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-USE_X11BASE=		YES
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -34,13 +36,14 @@ post-patch:
 		g=`${ECHO} $$f | ${SED} "s/x$$//"`;			\
 		${MV} $$f $$g;						\
 	done
-	${SED} "s|@PREFIX@|${PREFIX}|" ${FILESDIR}/WMSound > ${WRKSRC}/WMSound
+	${SED} -e "s|@PREFIX@|${PREFIX}|g"				\
+		${FILESDIR}/WMSound > ${WRKSRC}/WMSound
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/WMSound ${PREFIX}/etc/WindowMaker
 
 .include "../../audio/libaudiofile/buildlink.mk"
 .include "../../devel/libdockapp/buildlink.mk"
-.include "../../devel/libproplist/buildlink.mk"
 .include "../../wm/windowmaker/buildlink.mk"
+.include "../../mk/ossaudio.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/wsoundserver/distinfo b/audio/wsoundserver/distinfo
index 0d294c5a32e..351e6025807 100644
--- a/audio/wsoundserver/distinfo
+++ b/audio/wsoundserver/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/07/07 17:15:05 tron Exp $
+$NetBSD: distinfo,v 1.4 2001/07/24 10:39:01 jlam Exp $
 
 SHA1 (WSoundServer-0.4.0.tar.gz) = b414025f0f19e66cd9146546ecf634564941b1e4
 Size (WSoundServer-0.4.0.tar.gz) = 147044 bytes
-SHA1 (patch-aa) = 8613c67a3b87007255cd075128c7c5a62cdaf4a3
-SHA1 (patch-ab) = 93853707636168459e842c90c6dc313ded1cb02a
 SHA1 (patch-ac) = a8968a49ad6d2e3ae755e7f980704819c15d9654
 SHA1 (patch-ad) = 998cc4b2f87c4bce4d8c32e42aa9c06134633252
 SHA1 (patch-ae) = 3a008dc50f6e78070ceb78b1f564d7c94be2dfea
 SHA1 (patch-af) = 1ea20d0e00d19a2c23bb8e07cdf182e43db28ca8
+SHA1 (patch-ag) = 68b18901688afb4e9c2d6369dce33b841109a06d
diff --git a/audio/wsoundserver/patches/patch-aa b/audio/wsoundserver/patches/patch-aa
deleted file mode 100644
index c09bc0b74fe..00000000000
--- a/audio/wsoundserver/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/12 21:10:25 wiz Exp $
-
---- src/Makefile.in.orig	Fri Mar 31 22:10:25 2000
-+++ src/Makefile.in
-@@ -106,7 +106,7 @@
- INCLUDES =  	-I$(top_srcdir)/wslib @HEADER_SEARCH_PATH@
- 
- 
--wsoundserver_LDADD =  	$(top_builddir)/wslib/libwsound.la 	@LIBRARY_SEARCH_PATH@ 	@LIBPL@ 	@XLIBS@ 	@LIBDA@
-+wsoundserver_LDADD =  	$(top_builddir)/wslib/libwsound.la 	@LIBRARY_SEARCH_PATH@ 	@LIBPL@ -Wl,-R${X11BASE}/lib	@XLIBS@ 	@LIBDA@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = 
diff --git a/audio/wsoundserver/patches/patch-ab b/audio/wsoundserver/patches/patch-ab
deleted file mode 100644
index ccbf643ced0..00000000000
--- a/audio/wsoundserver/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/12 21:10:25 wiz Exp $
-
---- util/Makefile.in.orig	Fri Mar 31 22:10:25 2000
-+++ util/Makefile.in
-@@ -103,17 +103,17 @@
- # X_EXTRA_LIBS is for libproplist in systems that need -lsocket
- liblist = @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@
- 
--wsoundplay_LDADD =  	$(top_builddir)/wslib/libwsound.la 	@LIBRARY_SEARCH_PATH@ 	@LIBPL@ 	@XLIBS@
-+wsoundplay_LDADD =  	$(top_builddir)/wslib/libwsound.la 	@LIBRARY_SEARCH_PATH@ 	@LIBPL@ -Wl,-R${X11BASE}/lib	@XLIBS@
- 
- 
- wsoundplay_SOURCES = wsoundplay.c
- 
--getsoundset_LDADD =  	$(top_builddir)/wslib/libwsound.la 	@LIBRARY_SEARCH_PATH@ 	@LIBPL@ 	@XLIBS@
-+getsoundset_LDADD =  	$(top_builddir)/wslib/libwsound.la 	@LIBRARY_SEARCH_PATH@ 	@LIBPL@ -Wl,-R${X11BASE}/lib 	@XLIBS@
- 
- 
- getsoundset_SOURCES = getsoundset.c
- 
--setsoundset_LDADD =  	$(top_builddir)/wslib/libwsound.la 	@LIBRARY_SEARCH_PATH@ 	@LIBPL@ 	@XLIBS@
-+setsoundset_LDADD =  	$(top_builddir)/wslib/libwsound.la 	@LIBRARY_SEARCH_PATH@ 	@LIBPL@ -Wl,-R${X11BASE}/lib 	@XLIBS@
- 
- 
- setsoundset_SOURCES = setsoundset.c
diff --git a/audio/wsoundserver/patches/patch-ag b/audio/wsoundserver/patches/patch-ag
new file mode 100644
index 00000000000..c9f2107de9a
--- /dev/null
+++ b/audio/wsoundserver/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2001/07/24 10:39:02 jlam Exp $
+
+--- configure.orig	Fri Mar 31 12:10:25 2000
++++ configure
+@@ -2900,8 +2900,8 @@
+ XLIBS="-lX11 $X_EXTRA_LIBS"
+ 
+ 
+-lib_search_path="$lib_search_path $XLFLAGS -L/usr/local/lib"
+-inc_search_path="$inc_search_path $XCFLAGS -I/usr/local/include"
++lib_search_path="$lib_search_path $XLFLAGS"
++inc_search_path="$inc_search_path $XCFLAGS"
+ 
+ 
+