[Midnightbsd-cvs] mports [17318] trunk/audio/esound: fix shared lib reference

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Sep 15 21:17:47 EDT 2014


Revision: 17318
          http://svnweb.midnightbsd.org/mports/?rev=17318
Author:   laffer1
Date:     2014-09-15 21:17:47 -0400 (Mon, 15 Sep 2014)
Log Message:
-----------
fix shared lib reference

Modified Paths:
--------------
    trunk/audio/esound/Makefile
    trunk/audio/esound/pkg-plist

Modified: trunk/audio/esound/Makefile
===================================================================
--- trunk/audio/esound/Makefile	2014-09-16 00:39:12 UTC (rev 17317)
+++ trunk/audio/esound/Makefile	2014-09-16 01:17:47 UTC (rev 17318)
@@ -3,7 +3,7 @@
 
 PORTNAME=	esound
 PORTVERSION=	0.2.41
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -13,28 +13,22 @@
 
 LICENSE=	gpl2
 
-LIB_DEPENDS=	audiofile:${PORTSDIR}/audio/libaudiofile
+LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile
 
-USES=		tar:bzip2
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	 gnomehack
+USES=		libtool:keepla pathfix pkgconfig:both tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=	JW=false
+INSTALL_TARGET=	install-strip
 
-
 CONFLICTS=	py*-ro-[0-9]*
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|esdconf_DATA = esd.conf|esdconf_DATA = |g' \
+		-e '/^esd_LDADD =/s/$$/ -lm/' \
 		${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
+	${INSTALL_DATA} ${WRKSRC}/esd.conf ${STAGEDIR}${PREFIX}/etc/esd.conf.sample
 
 .include <bsd.port.mk>

Modified: trunk/audio/esound/pkg-plist
===================================================================
--- trunk/audio/esound/pkg-plist	2014-09-16 00:39:12 UTC (rev 17317)
+++ trunk/audio/esound/pkg-plist	2014-09-16 01:17:47 UTC (rev 17318)
@@ -9,8 +9,8 @@
 bin/esdplay
 bin/esdrec
 bin/esdsample
- 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 unexec if cmp -s %D/etc/esd.conf %D/etc/esd.conf.sample; then rm -f %D/etc/esd.conf; fi
+etc/esd.conf.sample
 @exec [ -f %B/esd.conf ] || cp %B/%f %B/esd.conf
 include/esd.h
 lib/libesd.a



More information about the Midnightbsd-cvs mailing list