From owner-svn-ports-all@FreeBSD.ORG Tue Apr 8 10:10:42 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6F19DC07; Tue, 8 Apr 2014 10:10:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C6911D89; Tue, 8 Apr 2014 10:10:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s38AAg3o043248; Tue, 8 Apr 2014 10:10:42 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s38AAgLW043243; Tue, 8 Apr 2014 10:10:42 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404081010.s38AAgLW043243@svn.freebsd.org> From: Pawel Pekala Date: Tue, 8 Apr 2014 10:10:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350593 - head/audio/rplay X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2014 10:10:42 -0000 Author: pawel Date: Tue Apr 8 10:10:41 2014 New Revision: 350593 URL: http://svnweb.freebsd.org/changeset/ports/350593 QAT: https://qat.redports.org/buildarchive/r350593/ Log: - Add staging support - Silence cmp execution in pkg-plist Modified: head/audio/rplay/Makefile head/audio/rplay/pkg-plist Modified: head/audio/rplay/Makefile ============================================================================== --- head/audio/rplay/Makefile Tue Apr 8 10:05:25 2014 (r350592) +++ head/audio/rplay/Makefile Tue Apr 8 10:10:41 2014 (r350593) @@ -13,15 +13,10 @@ COMMENT= Network audio player LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm USE_LDCONFIG= yes -NO_STAGE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include -MAN1= rplay.1 rptp.1 -MAN5= rplay.conf.5 rplay.helpers.5 rplay.hosts.5 rplay.servers.5 -MAN8= rplayd.8 - INFO= RPLAY RPTP librplay rplayd .include @@ -37,18 +32,20 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-a post-extract: @${CP} ${WRKSRC}/doc/rplay.texi ${WRKSRC}/doc/rplayd.texi +post-patch: + @${REINPLACE_CMD} -E \ + 's,(bin|include|info|lib|man|sbin)dir),DESTDIR)$$(&,' \ + ${WRKSRC}/include/Makefile.in \ + ${WRKSRC}/librplay/Makefile.in \ + ${WRKSRC}/rplayd/Makefile.in \ + ${WRKSRC}/rplay/Makefile.in \ + ${WRKSRC}/rptp/Makefile.in \ + ${WRKSRC}/doc/Makefile.in + post-install: - @${ECHO_MSG} "===> startup file as ${PREFIX}/etc/rc.d/rplayd" - @${MKDIR} ${PREFIX}/etc/ - for na in rplay.conf rplay.helpers rplay.servers rplay.hosts; do \ - ${CP} ${WRKSRC}/etc/$$na ${PREFIX}/etc/$$na.sample; \ - if [ ! -f ${PREFIX}/etc/$$na ]; then \ - ${CP} ${WRKSRC}/etc/$$na ${PREFIX}/etc/$$na; \ - fi; \ - done -.if !exists(${PREFIX}/etc/rplay.hosts) - @${ECHO_CMD} localhost > ${PREFIX}/etc/rplay.hosts -.endif - @${ECHO_CMD} localhost > ${PREFIX}/etc/rplay.hosts.sample +.for file in rplay.conf rplay.helpers rplay.servers rplay.hosts + ${CP} ${WRKSRC}/etc/${file} ${STAGEDIR}${PREFIX}/etc/${file}.sample +.endfor + @${ECHO_CMD} localhost > ${STAGEDIR}${PREFIX}/etc/rplay.hosts.sample .include Modified: head/audio/rplay/pkg-plist ============================================================================== --- head/audio/rplay/pkg-plist Tue Apr 8 10:05:25 2014 (r350592) +++ head/audio/rplay/pkg-plist Tue Apr 8 10:10:41 2014 (r350593) @@ -1,12 +1,16 @@ @unexec rm -f %D/etc/rc.d/rplayd.sh* -@unexec if cmp %D/etc/rplay.hosts.sample %D/etc/rplay.hosts 2>/dev/null; then rm -f %D/etc/rplay.hosts; fi +@unexec if cmp -s %D/etc/rplay.hosts.sample %D/etc/rplay.hosts 2>/dev/null; then rm -f %D/etc/rplay.hosts; fi etc/rplay.hosts.sample -@unexec if cmp %D/etc/rplay.conf.sample %D/etc/rplay.conf 2>/dev/null; then rm -f %D/etc/rplay.conf; fi +@exec if [ ! -f %D/etc/rplay.hosts ]; then cp -p %D/%F %D/etc/rplay.hosts; fi +@unexec if cmp -s %D/etc/rplay.conf.sample %D/etc/rplay.conf 2>/dev/null; then rm -f %D/etc/rplay.conf; fi etc/rplay.conf.sample -@unexec if cmp %D/etc/rplay.helpers.sample %D/etc/rplay.helpers 2>/dev/null; then rm -f %D/etc/rplay.helpers; fi +@exec if [ ! -f %D/etc/rplay.conf ]; then cp -p %D/%F %D/etc/rplay.conf; fi +@unexec if cmp -s %D/etc/rplay.helpers.sample %D/etc/rplay.helpers 2>/dev/null; then rm -f %D/etc/rplay.helpers; fi etc/rplay.helpers.sample -@unexec if cmp %D/etc/rplay.servers.sample %D/etc/rplay.servers 2>/dev/null; then rm -f %D/etc/rplay.servers; fi +@exec if [ ! -f %D/etc/rplay.helpers ]; then cp -p %D/%F %D/etc/rplay.helpers; fi +@unexec if cmp -s %D/etc/rplay.servers.sample %D/etc/rplay.servers 2>/dev/null; then rm -f %D/etc/rplay.servers; fi etc/rplay.servers.sample +@exec if [ ! -f %D/etc/rplay.servers ]; then cp -p %D/%F %D/etc/rplay.servers; fi bin/rplay bin/rptp sbin/rplayd @@ -14,3 +18,10 @@ include/rplay.h lib/librplay.a lib/librplay.so lib/librplay.so.1 +man/man1/rplay.1.gz +man/man1/rptp.1.gz +man/man5/rplay.conf.5.gz +man/man5/rplay.helpers.5.gz +man/man5/rplay.hosts.5.gz +man/man5/rplay.servers.5.gz +man/man8/rplayd.8.gz