From owner-svn-ports-all@FreeBSD.ORG Fri Jun 27 15:55:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 135AEC6E; Fri, 27 Jun 2014 15:55:13 +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 E6A062E14; Fri, 27 Jun 2014 15:55:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5RFtCHg054178; Fri, 27 Jun 2014 15:55:12 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5RFtCrR054176; Fri, 27 Jun 2014 15:55:12 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201406271555.s5RFtCrR054176@svn.freebsd.org> From: William Grzybowski Date: Fri, 27 Jun 2014 15:55:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359557 - head/audio/firefly 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.18 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: Fri, 27 Jun 2014 15:55:13 -0000 Author: wg Date: Fri Jun 27 15:55:12 2014 New Revision: 359557 URL: http://svnweb.freebsd.org/changeset/ports/359557 QAT: https://qat.redports.org/buildarchive/r359557/ Log: audio/firefly: support stage - Use @sample Approved by: portmgr (stage blanket) Modified: head/audio/firefly/Makefile head/audio/firefly/pkg-plist Modified: head/audio/firefly/Makefile ============================================================================== --- head/audio/firefly/Makefile Fri Jun 27 15:50:55 2014 (r359556) +++ head/audio/firefly/Makefile Fri Jun 27 15:55:12 2014 (r359557) @@ -23,7 +23,6 @@ LIB_DEPENDS= libogg.so:${PORTSDIR}/audio libid3tag.so:${PORTSDIR}/audio/libid3tag GNU_CONFIGURE= yes -NO_STAGE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -37,7 +36,10 @@ USE_RC_SUBR= mt-daapd USERS= ${DAAPD_USER} GROUPS= ${DAAPD_GROUP} -PLIST_SUB+= DAAPD_DBDIR=${DAAPD_DBDIR} +PLIST_SUB+= DAAPD_DBDIR=${DAAPD_DBDIR} \ + DAAPD_USER=${DAAPD_USER} \ + DAAPD_GROUP=${DAAPD_GROUP} \ + DATADIR=${DATADIR} USE_LDCONFIG= yes @@ -66,25 +68,17 @@ post-patch: post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README AUTHORS COPYING CREDITS \ ChangeLog INSTALL NEWS TODO - @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .endif - @[ -f ${PREFIX}/etc/mt-daapd.conf.sample ] || \ - ${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.conf \ - ${PREFIX}/etc/mt-daapd.conf.sample - @${MKDIR} ${DAAPD_DBDIR} - @${MKDIR} ${DATADIR} - @${CHMOD} 0755 ${DAAPD_DBDIR} - @${CHMOD} 0755 ${DATADIR} - @${CHOWN} ${DAAPD_USER}:${DAAPD_GROUP} ${DAAPD_DBDIR} - @${CHOWN} ${DAAPD_USER}:${DAAPD_GROUP} ${DATADIR} - - @${ECHO_MSG} "This port installs a sample configuration file in" - @${ECHO_MSG} "${LOCALBASE}/etc/mt-daapd.conf.sample" - @${ECHO_MSG} "You probably should move/copy this file to mt-daapd.conf" - @${ECHO_MSG} "and customize to fit your needs." + ${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.conf \ + ${STAGEDIR}${PREFIX}/etc/mt-daapd.conf.sample + @${MKDIR} ${STAGEDIR}${DAAPD_DBDIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + @${CHMOD} 0755 ${STAGEDIR}${DAAPD_DBDIR} + @${CHMOD} 0755 ${STAGEDIR}${DATADIR} .include Modified: head/audio/firefly/pkg-plist ============================================================================== --- head/audio/firefly/pkg-plist Fri Jun 27 15:50:55 2014 (r359556) +++ head/audio/firefly/pkg-plist Fri Jun 27 15:55:12 2014 (r359557) @@ -1,7 +1,6 @@ -@unexec if cmp -s %D/etc/mt-daapd.conf.sample %D/etc/mt-daapd.conf; then rm -f %D/etc/mt-daapd.conf; fi +@sample etc/mt-daapd.conf.sample bin/mt-daapd-ssc.sh bin/wavstreamer -etc/mt-daapd.conf.sample lib/mt-daapd/plugins/out-daap.a lib/mt-daapd/plugins/out-daap.la lib/mt-daapd/plugins/out-daap.so @@ -67,6 +66,8 @@ share/mt-daapd/admin-root/xiph-license.h share/mt-daapd/admin-root/xiph-license.txt share/mt-daapd/admin-root/zlib-license.html share/mt-daapd/admin-root/zlib-license.txt +@exec chown %%DAAPD_USER%%:%%DAAPD_GROUP%% %%DAAPD_DBDIR%% +@exec chown %%DAAPD_USER%%:%%DAAPD_GROUP%% %%DATADIR%% @dirrmtry share/mt-daapd/admin-root/lib-js/script.aculo.us @dirrmtry share/mt-daapd/admin-root/lib-js @dirrmtry share/mt-daapd/admin-root