diff options
| author | erwin <erwin@FreeBSD.org> | 2006-08-12 21:01:25 +0800 |
|---|---|---|
| committer | erwin <erwin@FreeBSD.org> | 2006-08-12 21:01:25 +0800 |
| commit | a5850fb1de3a8c05e3596513fb5ec74e4e2ec3d4 (patch) | |
| tree | d5902162dd723e2a32abe4e6f6b029346402dd6e | |
| parent | 2ed40ae1d44692172461a925a1558c878e23590c (diff) | |
| download | freebsd-ports-gnome-a5850fb1de3a8c05e3596513fb5ec74e4e2ec3d4.tar.gz freebsd-ports-gnome-a5850fb1de3a8c05e3596513fb5ec74e4e2ec3d4.tar.zst freebsd-ports-gnome-a5850fb1de3a8c05e3596513fb5ec74e4e2ec3d4.zip | |
- Respect DESTDIR
- Hide some command invocations in port Makefile
PR: 101669
Submitted by: gabor (maintainer)
| -rw-r--r-- | audio/shoutcast/Makefile | 18 | ||||
| -rw-r--r-- | audio/shoutcast/pkg-install | 7 |
2 files changed, 15 insertions, 10 deletions
diff --git a/audio/shoutcast/Makefile b/audio/shoutcast/Makefile index ac3644c61011..e21381cbc1f0 100644 --- a/audio/shoutcast/Makefile +++ b/audio/shoutcast/Makefile @@ -37,7 +37,7 @@ BROKEN= unsupported FreeBSD version .endif post-patch: - ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' \ + @${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' \ -e 's|=sc_serv.log|=/var/log/sc_serv.log|' \ -e 's|=sc_w3c.log|=/var/log/sc_w3c.log|' \ -e 's|ScreenLog=1|ScreenLog=0|' \ @@ -47,17 +47,17 @@ post-patch: ${WRKSRC}/sc_serv.conf do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sc_serv ${PREFIX}/sbin - ${MKDIR} ${PREFIX}/etc/shoutcast - ${INSTALL_DATA} ${WRKSRC}/sc_serv.conf ${PREFIX}/etc/shoutcast/sc_serv.conf.sample - @[ -f ${PREFIX}/etc/shoutcast/sc_serv.conf ] || \ - ${INSTALL_DATA} ${WRKSRC}/sc_serv.conf ${PREFIX}/etc/shoutcast/sc_serv.conf + @${INSTALL_PROGRAM} ${WRKSRC}/sc_serv ${TARGETDIR}/sbin + @${MKDIR} ${TARGETDIR}/etc/shoutcast + @${INSTALL_DATA} ${WRKSRC}/sc_serv.conf ${TARGETDIR}/etc/shoutcast/sc_serv.conf.sample + @[ -f ${TARGETDIR}/etc/shoutcast/sc_serv.conf ] || \ + ${INSTALL_DATA} ${WRKSRC}/sc_serv.conf ${TARGETDIR}/etc/shoutcast/sc_serv.conf .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.TXT ${DOCSDIR} + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/README.TXT ${DOCSDIR} .endif post-install: - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/audio/shoutcast/pkg-install b/audio/shoutcast/pkg-install index bb97ac95dde2..75387ad52143 100644 --- a/audio/shoutcast/pkg-install +++ b/audio/shoutcast/pkg-install @@ -8,7 +8,12 @@ SC_GROUP=shoutcast SC_USER=shoutcast SC_SHELL=/bin/sh SC_HOME=/nonexistent -PW=/usr/sbin/pw + +if [ -n "${DESTDIR}" ] ; then + PW="/usr/sbin/chroot ${DESTDIR} /usr/sbin/pw" +else + PW="/usr/sbin/pw" +fi if ! ${PW} show group ${SC_GROUP} -q >/dev/null; then gid=210 |