added rplay dependency; renamed patches

x11/fvwm95/Makefile

@@ -1,21 +1,24 @@
-# $OpenBSD: Makefile,v 1.2 2000/07/10 20:28:03 danh Exp $
+# $OpenBSD: Makefile,v 1.3 2000/09/23 19:47:41 danh Exp $
 
 DISTNAME=	fvwm95-2.0.43a-Autoconf
-EXTRACT_SUFX=		.tgz
 PKGNAME=	fvwm95-2.0.43a
 CATEGORIES=     x11
-NEED_VERSION=		1.310
+NEED_VERSION=	1.334
+MASTER_SITES=	ftp://mitac11.uia.ac.be/pub/fvwm95/	\
+		ftp://ftp.plig.org/pub/fvwm95/
+EXTRACT_SUFX=	.tgz
+
 HOMEPAGE=	ftp://mitac11.uia.ac.be/html-test/fvwm95.html
-MAINTAINER=		danh@openbsd.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/librplay.a::audio/rplay
+
+MAINTAINER=	Dan Harnett <danh@openbsd.org>
 
 PERMIT_PACKAGE_CDROM=	Yes 
 PERMIT_PACKAGE_FTP=	Yes 
 PERMIT_DISTFILES_CDROM=	Yes 
 PERMIT_DISTFILES_FTP=	Yes 
 
-MASTER_SITES=		ftp://mitac11.uia.ac.be/pub/fvwm95/	\
-			ftp://ftp.plig.org/pub/fvwm95/
-
 USE_X11=	Yes
 
 CONFIGURE_STYLE= gnu dest

x11/fvwm95/patches/patch-aa

@@ -1,11 +0,0 @@
---- modules/FvwmAudio/Makefile.in.orig	Wed May 31 13:05:08 2000
-+++ modules/FvwmAudio/Makefile.in	Wed May 31 13:05:21 2000
-@@ -23,7 +23,7 @@
- XPM_LIBRARY=-lXpm
- XEXT_LIBRARY=-lXext
- FVWM_LIBRARY=-l${fvwm_name}
--RPLAY_LIBRARY=-lrplay
-+RPLAY_LIBRARY=
- LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} ${RPLAY_LIBRARY}
- 
- EXTRA_DEFINES=-DXPM -DSHAPE

x11/fvwm95/patches/patch-modules_FvwmAudio_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-modules_FvwmAudio_Makefile_in,v 1.1 2000/09/23 19:47:42 danh Exp $
+--- modules/FvwmAudio/Makefile.in.orig	Sat Sep 23 15:40:52 2000
++++ modules/FvwmAudio/Makefile.in	Sat Sep 23 15:41:14 2000
+@@ -23,7 +23,7 @@ X_LIBRARY=-lX11 @LIBS@
+ XPM_LIBRARY=-lXpm
+ XEXT_LIBRARY=-lXext
+ FVWM_LIBRARY=-l${fvwm_name}
+-RPLAY_LIBRARY=-lrplay
++RPLAY_LIBRARY=-L/usr/local/lib -lrplay
+ LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} ${RPLAY_LIBRARY}
+ 
+ EXTRA_DEFINES=-DXPM -DSHAPE