From 9fe5fd99102e8cc21d83c4491ae7738c623c2ce0 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 24 Jul 2001 11:04:20 +0000
Subject: Make USE_BUILDLINK_ONLY true by using a buildlink.mk file for
 wsoundserver libraries and using the config wrappers.  Simplify the
 buildlink.mk inclusion by just including windowmaker/buildlink.mk instead of
 all the graphics libraries' buildlink.mk, and including
 wsoundserver/buildlink.mk instead of including libaudiofile/buildlink.mk
 directly.

---
 audio/wsoundprefs/Makefile         | 19 +++++++------------
 audio/wsoundprefs/distinfo         |  4 ++--
 audio/wsoundprefs/patches/patch-ab | 23 +++++++++++++++++++++--
 3 files changed, 30 insertions(+), 16 deletions(-)

(limited to 'audio/wsoundprefs')

diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index 4b16163b458..43ff4a609a8 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -1,23 +1,18 @@
-# $NetBSD: Makefile,v 1.8 2001/07/23 15:04:47 nra Exp $
+# $NetBSD: Makefile,v 1.9 2001/07/24 11:04:20 jlam Exp $
 
 DISTNAME=	WSoundPrefs-1.1.1
 PKGNAME=	wsoundprefs-1.1.1
 CATEGORIES=	audio wm
 MASTER_SITES=	ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
 
-MAINTAINER=	lamj@stat.cmu.edu
+MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://shadowmere.student.utwente.nl/
 COMMENT=	WSoundServer configuration utility
 
-DEPENDS+=	wsoundserver-0.4.0:../../audio/wsoundserver
+USE_BUILDLINK_ONLY=	YES
+USE_X11BASE=		YES
+USE_IMAKE=		YES
 
-USE_X11BASE=	YES
-USE_IMAKE=	YES
-USE_BUILDLINK_ONLY=YES
-
-.include "../../audio/libaudiofile/buildlink.mk"
-.include "../../devel/libproplist/buildlink.mk"
-.include "../../graphics/libungif/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
+.include "../../audio/wsoundserver/buildlink.mk"
+.include "../../wm/windowmaker/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/wsoundprefs/distinfo b/audio/wsoundprefs/distinfo
index 9c793010d08..d35161ed2fd 100644
--- a/audio/wsoundprefs/distinfo
+++ b/audio/wsoundprefs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 12:14:39 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/24 11:04:20 jlam Exp $
 
 SHA1 (WSoundPrefs-1.1.1.tar.gz) = 444571543e7a076cc49ee484dbcfd0aefc184316
 Size (WSoundPrefs-1.1.1.tar.gz) = 32042 bytes
 SHA1 (patch-aa) = 8ae650bc0a79ee02dbbefc5519eff735a02a722b
-SHA1 (patch-ab) = 7dc8c4a507972a37cfafb0b15ba2793dd40ae16b
+SHA1 (patch-ab) = b5c2e7e41a1ad4508e91dfd98446be73805dda0c
 SHA1 (patch-ac) = 592155f98fa0b51690e766eb75bde69531313533
 SHA1 (patch-ad) = 5d37585aea3950f2d01d66333cbd6fd59d3a42c8
 SHA1 (patch-ae) = 675b6b8039016f99b7bdb744eb01747f5f5f8c31
diff --git a/audio/wsoundprefs/patches/patch-ab b/audio/wsoundprefs/patches/patch-ab
index 8626b6c7f1a..84f3e857265 100644
--- a/audio/wsoundprefs/patches/patch-ab
+++ b/audio/wsoundprefs/patches/patch-ab
@@ -1,7 +1,26 @@
-$NetBSD: patch-ab,v 1.4 2001/03/12 21:19:10 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2001/07/24 11:04:21 jlam Exp $
 
---- src/Imakefile.orig	Mon Oct 18 10:35:58 1999
+--- src/Imakefile.orig	Mon Oct 18 01:35:58 1999
 +++ src/Imakefile
+@@ -12,12 +12,12 @@
+ XCOMM EFENCELIB = -lefence
+ EFENCELIB =
+ 
+-WSOUNDCFLAGS = `get-wsound-flags --cflags`
+-WSOUNDLFLAGS = `get-wsound-flags --lflags`
+-WSOUNDLIBS = `get-wsound-flags --libs`
+-WRASTERCFLAGS = `get-wraster-flags --cflags`
+-WRASTERLFLAGS = `get-wraster-flags --lflags`
+-WRASTERLIBS = `get-wraster-flags --libs`
++WSOUNDCFLAGS = `${BUILDLINK_DIR}/bin/get-wsound-flags --cflags`
++WSOUNDLFLAGS = `${BUILDLINK_DIR}/bin/get-wsound-flags --lflags`
++WSOUNDLIBS = `${BUILDLINK_DIR}/bin/get-wsound-flags --libs`
++WRASTERCFLAGS = `${BUILDLINK_DIR}/bin/get-wraster-flags --cflags`
++WRASTERLFLAGS = `${BUILDLINK_DIR}/bin/get-wraster-flags --lflags`
++WRASTERLIBS = `${BUILDLINK_DIR}/bin/get-wraster-flags --libs`
+ WINGSLIBS = -lWINGs -lPropList
+ 
+ STD_INCLUDES = $(WRASTERCFLAGS) $(WSOUNDCFLAGS)
 @@ -30,7 +30,7 @@
  SRCS = PLFunctions.c SoundEvents.c SoundPaths.c SystemInfo.c WSoundPrefs.c main.c
  OBJS = PLFunctions.o SoundEvents.o SoundPaths.o SystemInfo.o WSoundPrefs.o main.o
-- 
cgit v1.2.3