Date: Fri, 25 Nov 2005 17:28:08 -0600 (CST) From: "Matthew D.Fuller" <fullermd@over-yonder.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/89557: [MAINTAINER] [PATCH] x11/bgrot PREFIX fixups Message-ID: <20051125232808.56A7F20FDD@mortis.over-yonder.net> Resent-Message-ID: <200511252330.jAPNU3en055972@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <fullermd@over-yonder.net>
+
+ # 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(<SKEL>) {
+ chomp;
+- if(/^\$CONFDIR\=/) {
+- $_ = "\$CONFDIR=\"$CONFDIR\"";
++ if(/^\CONFDIR\=/) {
++ $_ = "\CONFDIR=\"$CONFDIR\"";
+ }
+ print OUT "$_\n";
+ }
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051125232808.56A7F20FDD>