From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 8 20:00:40 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB37F16A500 for ; Tue, 8 Aug 2006 20:00:40 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E09C43D5C for ; Tue, 8 Aug 2006 20:00:32 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k78K0Wdw015047 for ; Tue, 8 Aug 2006 20:00:32 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k78K0WNS015046; Tue, 8 Aug 2006 20:00:32 GMT (envelope-from gnats) Resent-Date: Tue, 8 Aug 2006 20:00:32 GMT Resent-Message-Id: <200608082000.k78K0WNS015046@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gabor Kovesdan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4ADB416A4DE for ; Tue, 8 Aug 2006 19:56:48 +0000 (UTC) (envelope-from root@catv-50635cb6.catv.broadband.hu) Received: from catv-50635cb6.catv.broadband.hu (catv-50635cb6.catv.broadband.hu [80.99.92.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C31F43D76 for ; Tue, 8 Aug 2006 19:56:41 +0000 (GMT) (envelope-from root@catv-50635cb6.catv.broadband.hu) Received: by catv-50635cb6.catv.broadband.hu (Postfix, from userid 0) id 9C38D289D52; Tue, 8 Aug 2006 21:56:44 +0200 (CEST) Message-Id: <20060808195644.9C38D289D52@catv-50635cb6.catv.broadband.hu> Date: Tue, 8 Aug 2006 21:56:44 +0200 (CEST) From: Gabor Kovesdan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Gabor Kovesdan Subject: ports/101670: [maintainer update] audio/linux-shoutcast X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Gabor Kovesdan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Aug 2006 20:00:40 -0000 >Number: 101670 >Category: ports >Synopsis: [maintainer update] audio/linux-shoutcast >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Aug 08 20:00:31 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Gabor Kovesdan >Release: FreeBSD 6.1-STABLE i386 >Organization: n/a >Environment: System: FreeBSD spitfire 6.1-STABLE FreeBSD 6.1-STABLE #0: Sat Jul 29 18:31:18 CEST 2006 gabor@spitfire:/usr/src/sys/i386/compile/SPITFIRE i386 >Description: - Respect DESTDIR - Hide some command invocations in port Makefile >How-To-Repeat: >Fix: --- audio-linux-shoutcast.diff begins here --- Index: Makefile =================================================================== RCS file: /usr/cvs/ports/audio/linux-shoutcast/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- Makefile 10 Jul 2006 20:49:22 -0000 1.2 +++ Makefile 8 Aug 2006 19:52:01 -0000 @@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR} 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|' \ @@ -36,19 +36,19 @@ ${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 - ${BRANDELF} -t Linux ${PREFIX}/sbin/sc_serv + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${BRANDELF} -t Linux ${TARGETDIR}/sbin/sc_serv .include Index: pkg-install =================================================================== RCS file: /usr/cvs/ports/audio/linux-shoutcast/pkg-install,v retrieving revision 1.1 diff -u -r1.1 pkg-install --- pkg-install 5 Jun 2006 10:39:01 -0000 1.1 +++ pkg-install 8 Aug 2006 19:51:06 -0000 @@ -8,7 +8,12 @@ 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 --- audio-linux-shoutcast.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: