diff options
Diffstat (limited to 'audio/firefly')
| -rw-r--r-- | audio/firefly/Makefile | 30 | ||||
| -rw-r--r-- | audio/firefly/pkg-plist | 5 |
2 files changed, 15 insertions, 20 deletions
diff --git a/audio/firefly/Makefile b/audio/firefly/Makefile index 15f3c5334c05..8eb4d5769bc3 100644 --- a/audio/firefly/Makefile +++ b/audio/firefly/Makefile @@ -23,7 +23,6 @@ LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg \ 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 <bsd.port.mk> diff --git a/audio/firefly/pkg-plist b/audio/firefly/pkg-plist index 1c51c7682ec0..0fff795c7f7b 100644 --- a/audio/firefly/pkg-plist +++ b/audio/firefly/pkg-plist @@ -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.html 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 |