diff options
| -rw-r--r-- | net/mediatomb/Makefile | 15 | ||||
| -rw-r--r-- | net/mediatomb/pkg-plist | 12 |
2 files changed, 11 insertions, 16 deletions
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile index 5bb37362d5f4..c6ca5a12aa8c 100644 --- a/net/mediatomb/Makefile +++ b/net/mediatomb/Makefile @@ -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 transcoding support ID3LIB_DESC= id3lib support LIBEXTRACTOR_DESC= libextractor support -NO_STAGE= yes .include <bsd.port.pre.mk> .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 <bsd.port.post.mk> diff --git a/net/mediatomb/pkg-plist b/net/mediatomb/pkg-plist index ff291d94bd69..0b2b59a1cd42 100644 --- a/net/mediatomb/pkg-plist +++ b/net/mediatomb/pkg-plist @@ -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 |