[PATCH] Respect the esd.conf, ports/69175..

[Jeremy Messenger]

Hello,

It's my first time to work with the respect *.conf stuff, so it works for  
me so far. Also, I did a few clean up such as remove patch-configure and  
make the portlint a happy man. Does it (attaching esound.diff) looks good  
to you, team?

Cheers,
Mezz


-- 
mezz7 at cox.net  -  mezz at FreeBSD.org
FreeBSD GNOME Team
http://www.FreeBSD.org/gnome/ - gnome at FreeBSD.org
-------------- next part --------------
Index: esound/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/esound/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- esound/Makefile	12 Aug 2004 17:31:26 -0000	1.52
+++ esound/Makefile	17 Aug 2004 04:57:55 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	esound
 PORTVERSION=	0.2.35
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
@@ -17,15 +18,28 @@
 
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 
-USE_GETOPT_LONG=	yes
 USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
 USE_GNOME=	gnometarget gnomehack
+USE_REINPLACE=	yes
+INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=15
+USE_GETOPT_LONG=yes
 
-CONFLICTS=	py*-ro-*
+CONFLICTS=	py*-ro-[0-9]*
 
 MAN1=	esd-config.1 esd.1 esdcat.1 esdctl.1 esddsp.1 esdfilt.1 esdloop.1 \
 	esdmon.1 esdplay.1 esdrec.1 esdsample.1
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|esdconf_DATA = esd.conf|esdconf_DATA = |g' \
+		${WRKSRC}/Makefile.in
+
+post-install:
+	if [ ! -f ${PREFIX}/etc/esd.conf ]; then \
+		${INSTALL_DATA} ${WRKSRC}/esd.conf ${PREFIX}/etc/esd.conf; \
+		${INSTALL_DATA} ${WRKSRC}/esd.conf ${PREFIX}/etc/esd.conf.default; \
+	else \
+		${INSTALL_DATA} ${WRKSRC}/esd.conf ${PREFIX}/etc/esd.conf.default; \
+	fi
 
 .include <bsd.port.mk>
Index: esound/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/audio/esound/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- esound/pkg-plist	24 Oct 2001 07:22:47 -0000	1.8
+++ esound/pkg-plist	17 Aug 2004 04:57:55 -0000
@@ -9,7 +9,9 @@
 bin/esdplay
 bin/esdrec
 bin/esdsample
-etc/esd.conf
+ at unexec if cmp -s %D/etc/esd.conf %D/etc/esd.conf.default; then rm -f %D/etc/esd.conf; fi
+etc/esd.conf.default
+ at exec [ -f %B/esd.conf ] || cp %B/%f %B/esd.conf
 include/esd.h
 lib/libesd.a
 lib/libesd.so
Index: esound/files/patch-configure
===================================================================
RCS file: esound/files/patch-configure
diff -N esound/files/patch-configure
--- esound/files/patch-configure	7 May 2002 06:42:25 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-
-$FreeBSD: ports/audio/esound/files/patch-configure,v 1.1 2002/05/07 06:42:25 sobomax Exp $
-
---- configure	2002/05/07 06:39:43	1.1
-+++ configure	2002/05/07 06:39:55
-@@ -5308,6 +5308,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'