From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 25 23:30:07 2005 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 F184916A41F for ; Fri, 25 Nov 2005 23:30:06 +0000 (GMT) (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 838DC43D60 for ; Fri, 25 Nov 2005 23:30:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jAPNU38X055973 for ; Fri, 25 Nov 2005 23:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jAPNU3en055972; Fri, 25 Nov 2005 23:30:03 GMT (envelope-from gnats) Resent-Date: Fri, 25 Nov 2005 23:30:03 GMT Resent-Message-Id: <200511252330.jAPNU3en055972@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, "Matthew D.Fuller" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4DFEF16A41F for ; Fri, 25 Nov 2005 23:28:11 +0000 (GMT) (envelope-from fullermd@over-yonder.net) Received: from mail.localelinks.com (web.localelinks.com [65.170.254.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE3C843D55 for ; Fri, 25 Nov 2005 23:28:10 +0000 (GMT) (envelope-from fullermd@over-yonder.net) Received: from draco.over-yonder.net (adsl-222-77-237.jan.bellsouth.net [68.222.77.237]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.localelinks.com (Postfix) with ESMTP id 20B4E9D for ; Fri, 25 Nov 2005 17:28:10 -0600 (CST) Received: from mortis.over-yonder.net (mortis.sighup.org [10.20.30.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by draco.over-yonder.net (Postfix) with ESMTP id 5157B61C19 for ; Fri, 25 Nov 2005 17:28:09 -0600 (CST) Received: by mortis.over-yonder.net (Postfix, from userid 100) id 56A7F20FDD; Fri, 25 Nov 2005 17:28:08 -0600 (CST) Message-Id: <20051125232808.56A7F20FDD@mortis.over-yonder.net> Date: Fri, 25 Nov 2005 17:28:08 -0600 (CST) From: "Matthew D.Fuller" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/89557: [MAINTAINER] [PATCH] x11/bgrot PREFIX fixups X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Matthew D.Fuller" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Nov 2005 23:30:07 -0000 >Number: 89557 >Category: ports >Synopsis: [MAINTAINER] [PATCH] x11/bgrot PREFIX fixups >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: Fri Nov 25 23:30:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Matthew D. Fuller >Release: FreeBSD 7.0-CURRENT i386 >Organization: >Environment: System: FreeBSD mortis.sighup.org 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Sat Oct 1 19:41:00 CDT 2005 fullermd@mortis:/usr/obj/usr/src/sys/MORTIS i386 >Description: >How-To-Repeat: >Fix: (note added files/patch-setconfdir.pl) Index: files/patch-Makefile =================================================================== RCS file: /usr/cvs/ports/x11/bgrot/files/patch-Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-Makefile --- files/patch-Makefile 1 Nov 2002 09:53:39 -0000 1.1 +++ files/patch-Makefile 25 Nov 2005 23:13:13 -0000 @@ -1,6 +1,31 @@ ---- Makefile.old Sun Sep 22 19:03:43 2002 -+++ Makefile Sun Sep 22 19:04:30 2002 -@@ -52,7 +52,7 @@ +--- Makefile.orig Wed Jun 21 05:50:30 2000 ++++ Makefile Fri Nov 25 17:13:07 2005 +@@ -4,12 +4,13 @@ + # Written by Matthew Fuller + + # OK, first: config stuff ++PREFIX ?= /usr/local + + # BINDIR: Where the programs are +-BINDIR = /usr/local/bin ++BINDIR = ${PREFIX}/bin + + # CONFDIR: Where the system-wide config goes +-CONFDIR = /usr/local/etc ++CONFDIR = ${PREFIX}/etc + + # DIRMODE: Permission bits for directories + # FILEMODE: Permission bits for files +@@ -22,7 +23,7 @@ + BINGRP = bin + + # MANDIR: Where is your manpage base? +-MANDIR = /usr/local/man ++MANDIR = ${PREFIX}/man + + # OK, that's about it for user stuff + # Touch the rest of this file at your own risk +@@ -52,7 +53,7 @@ .endif @echo Installing files... -install -o ${BINOWN} -g ${BINGRP} -m ${FILEMODE} -c ${INSTALLFILES} ${BINDIR} @@ -9,7 +34,7 @@ @echo Compressing manpage... @gzip -c bgrot.1 > bgrot.1.gz @echo Installing manpage... -@@ -88,7 +88,7 @@ +@@ -88,7 +89,7 @@ rm -f ${BINDIR}/$${entry}; \ done @echo Uninstalling configuration... @@ -18,4 +43,3 @@ @echo Uninstalling manpage... @rm -f ${MANDIR}/man1/bgrot.1.gz @echo Done. - Index: files/patch-setconfdir.pl =================================================================== RCS file: files/patch-setconfdir.pl diff -N files/patch-setconfdir.pl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-setconfdir.pl 25 Nov 2005 23:15:54 -0000 @@ -0,0 +1,13 @@ +--- setconfdir.pl.orig Fri Nov 25 17:15:32 2005 ++++ setconfdir.pl Fri Nov 25 17:15:44 2005 +@@ -16,8 +16,8 @@ + + foreach() { + chomp; +- if(/^\$CONFDIR\=/) { +- $_ = "\$CONFDIR=\"$CONFDIR\""; ++ if(/^\CONFDIR\=/) { ++ $_ = "\CONFDIR=\"$CONFDIR\""; + } + print OUT "$_\n"; + } >Release-Note: >Audit-Trail: >Unformatted: