From owner-svn-ports-all@FreeBSD.ORG Thu Jun 26 13:31:21 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 D8BA4FEB; Thu, 26 Jun 2014 13:31:21 +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 C6746295B; Thu, 26 Jun 2014 13:31:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QDVLwh093672; Thu, 26 Jun 2014 13:31:21 GMT (envelope-from sanpei@svn.freebsd.org) Received: (from sanpei@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5QDVLwB093670; Thu, 26 Jun 2014 13:31:21 GMT (envelope-from sanpei@svn.freebsd.org) Message-Id: <201406261331.s5QDVLwB093670@svn.freebsd.org> From: MIHIRA Sanpei Yoshiro Date: Thu, 26 Jun 2014 13:31:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359351 - head/net/mediatomb 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: Thu, 26 Jun 2014 13:31:22 -0000 Author: sanpei Date: Thu Jun 26 13:31:21 2014 New Revision: 359351 URL: http://svnweb.freebsd.org/changeset/ports/359351 QAT: https://qat.redports.org/buildarchive/r359351/ Log: support stage. Modified: head/net/mediatomb/Makefile head/net/mediatomb/pkg-plist Modified: head/net/mediatomb/Makefile ============================================================================== --- head/net/mediatomb/Makefile Thu Jun 26 13:30:24 2014 (r359350) +++ head/net/mediatomb/Makefile Thu Jun 26 13:31:21 2014 (r359351) @@ -12,7 +12,6 @@ COMMENT= UPnP AV MediaServer LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 -MAN1= mediatomb.1 GNU_CONFIGURE= yes LDFLAGS+= ${PTHREAD_LIBS} CFLAGS+= ${PTHREAD_CFLAGS} @@ -64,7 +63,6 @@ EXTERNAL_TRANSCODING_DESC= external tran ID3LIB_DESC= id3lib support LIBEXTRACTOR_DESC= libextractor support -NO_STAGE= yes .include .if ${PORT_OPTIONS:MSQLITE} @@ -169,16 +167,7 @@ pre-install: PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @${MKDIR} -m ${MEDIATOMB_MASK} -p ${PREFIX}/etc/mediatomb - @${CHOWN} ${MEDIATOMB_USER}:${MEDIATOMB_GROUP} ${PREFIX}/etc/mediatomb - @${INSTALL} ${COPY} -o ${MEDIATOMB_USER} -g ${MEDIATOMB_GROUP} -m 640 ${WRKDIR}/config.xml.dist ${PREFIX}/etc/mediatomb/config.xml.dist - @if [ ! -f ${PREFIX}/etc/mediatomb/config.xml ]; then \ - ${CP} -p ${PREFIX}/etc/mediatomb/config.xml.dist ${PREFIX}/etc/mediatomb/config.xml ; \ - fi - @${CHGRP} ${MEDIATOMB_GROUP} ${PREFIX}/bin/mediatomb - @${CHMOD} a-x ${PREFIX}/bin/mediatomb - @${CHMOD} g+x ${PREFIX}/bin/mediatomb - @${MKDIR} -m ${MEDIATOMB_MASK} -p ${MEDIATOMB_DIR} - @${CHOWN} ${MEDIATOMB_USER}:${MEDIATOMB_GROUP} ${MEDIATOMB_DIR} + @${MKDIR} -m ${MEDIATOMB_MASK} -p ${STAGEDIR}${PREFIX}/etc/mediatomb + @${INSTALL} ${COPY} ${WRKDIR}/config.xml.dist ${STAGEDIR}${PREFIX}/etc/mediatomb/config.xml.dist .include Modified: head/net/mediatomb/pkg-plist ============================================================================== --- head/net/mediatomb/pkg-plist Thu Jun 26 13:30:24 2014 (r359350) +++ head/net/mediatomb/pkg-plist Thu Jun 26 13:31:21 2014 (r359351) @@ -1,4 +1,8 @@ bin/mediatomb +@exec chgrp %%MEDIATOMB_GROUP%% %D/bin/mediatomb +@exec chmod a-x %D/bin/mediatomb +@exec chmod g+x %D/bin/mediatomb +man/man1/mediatomb.1.gz %%DATADIR%%/js/import.js %%DATADIR%%/js/playlists.js %%DATADIR%%/js/common.js @@ -88,15 +92,17 @@ bin/mediatomb %%DATADIR%%/web/topright.html @owner %%MEDIATOMB_USER%% @group %%MEDIATOMB_GROUP%% -@exec mkdir -m %%MEDIATOMB_MASK%% -p %D/etc/mediatomb -@exec chown %%MEDIATOMB_USER%%:%%MEDIATOMB_GROUP%% %D/etc/mediatomb @unexec if cmp -s %D/etc/mediatomb/config.xml.dist %D/etc/mediatomb/config.xml; then rm -f %D/etc/mediatomb/config.xml; fi +@dirrmtry etc/mediatomb etc/mediatomb/config.xml.dist +@exec mkdir -m %%MEDIATOMB_MASK%% -p %D/etc/mediatomb +@exec chown %%MEDIATOMB_USER%%:%%MEDIATOMB_GROUP%% %D/etc/mediatomb +@exec chown %%MEDIATOMB_USER%%:%%MEDIATOMB_GROUP%% %D/etc/mediatomb/config.xml.dist +@exec chmod 640 %D/etc/mediatomb/config.xml.dist @exec [ -f %B/config.xml ] || cp -p %B/%f %B/config.xml @unexec rmdir %%MEDIATOMB_DIR%% 2>/dev/null 1>&2 || true @exec mkdir -m %%MEDIATOMB_MASK%% -p %%MEDIATOMB_DIR%% @exec chown %%MEDIATOMB_USER%%:%%MEDIATOMB_GROUP%% %%MEDIATOMB_DIR%% -@dirrmtry etc/mediatomb @dirrm %%DATADIR%%/js @dirrm %%DATADIR%%/web/icons/nanotree/images @dirrm %%DATADIR%%/web/icons/nanotree