From owner-freebsd-ports Mon Aug 6 1:10:11 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 029E637B409 for ; Mon, 6 Aug 2001 01:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f768A0G42944; Mon, 6 Aug 2001 01:10:00 -0700 (PDT) (envelope-from gnats) Received: from cc92687-a.wlgrv1.pa.home.com (cc92687-a.wlgrv1.pa.home.com [24.5.63.190]) by hub.freebsd.org (Postfix) with ESMTP id DD6AB37B403 for ; Mon, 6 Aug 2001 01:09:27 -0700 (PDT) (envelope-from root@cc92687-a.wlgrv1.pa.home.com) Received: (from root@localhost) by cc92687-a.wlgrv1.pa.home.com (8.11.5/8.11.5) id f7689R000812; Mon, 6 Aug 2001 04:09:27 -0400 (EDT) (envelope-from root) Message-Id: <200108060809.f7689R000812@cc92687-a.wlgrv1.pa.home.com> Date: Mon, 6 Aug 2001 04:09:27 -0400 (EDT) From: pat@databits.net Reply-To: pat@databits.net To: FreeBSD-gnats-submit@freebsd.org Cc: jmrobins@samurai.ruin.org X-Send-Pr-Version: 3.113 Subject: ports/29481: Fix www/bacon Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 29481 >Category: ports >Synopsis: Fix www/bacon >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Aug 06 01:10:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Patrick Li >Release: FreeBSD 4.4-PRERELEASE i386 >Organization: N/A >Environment: System: FreeBSD bottlenek 4.4-PRERELEASE FreeBSD 4.4-PRERELEASE #0: Sun Aug 5 00:29:13 EDT 2001 root@bottlenek:/usr/src/sys/compile/BOTTLENEK i386 >Description: - Add NOPORTDOCS - Tweak Makefile a bit - Remove www and www/cgi-bin directories properly to not cause error by bento - Better display pkg-message >How-To-Repeat: N/A >Fix: diff -ruN /usr/ports/www/bacon/Makefile bacon/Makefile --- /usr/ports/www/bacon/Makefile Mon Feb 5 10:33:13 2001 +++ bacon/Makefile Mon Aug 6 01:28:31 2001 @@ -12,22 +12,22 @@ MAINTAINER= jmrobins@samurai.ruin.org -USE_PERL5= YES +USE_PERL5= yes +NO_BUILD= yes -DIST= bacon.pl - -do-build: - @cd ${WRKSRC}; ${MV} ${DIST} ${DIST}.orig; \ - ${SED} -e 's;^#! */usr/local/bin/perl *;#!${PERL5};' \ - ${DIST}.orig > ${DIST} +pre-patch: + @${PERL} -pi.orig -e 's|${LOCALBASE}/bin/perl|/usr/bin/perl|' \ + ${WRKSRC}/bacon.pl do-install: ${MKDIR} ${PREFIX}/www/cgi-bin ${INSTALL_SCRIPT} ${WRKSRC}/bacon.pl ${PREFIX}/www/cgi-bin/bacon.pl post-install: - ${MKDIR} ${PREFIX}/share/doc/bacon/ - ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/bacon/INSTALL - @${CAT} ${PKGMESSAGE} +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR} +.endif + @${SED} -e "s|INSTALL|${DOCSDIR}/INSTALL|" ${PKGMESSAGE} .include diff -ruN /usr/ports/www/bacon/pkg-message bacon/pkg-message --- /usr/ports/www/bacon/pkg-message Thu Sep 9 10:55:08 1999 +++ bacon/pkg-message Mon Aug 6 01:19:43 2001 @@ -1,6 +1,6 @@ --------------------------------------------------------------------- -Please read the ${PREFIX}/share/doc/bacon/INSTALL file for info on +Please read the INSTALL file for info on configuring this program." --------------------------------------------------------------------- diff -ruN /usr/ports/www/bacon/pkg-plist bacon/pkg-plist --- /usr/ports/www/bacon/pkg-plist Thu Sep 9 10:55:08 1999 +++ bacon/pkg-plist Mon Aug 6 01:18:17 2001 @@ -1,3 +1,5 @@ www/cgi-bin/bacon.pl -share/doc/bacon/INSTALL -@dirrm share/doc/bacon +%%PORTDOCS%%share/doc/bacon/INSTALL +%%PORTDOCS%%@dirrm share/doc/bacon +@unexec rmdir %D/www/cgi-bin 2>/dev/null || true +@unexec rmdir %D/www 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message