[45424] trunk/dports/www/autobench
toby at macports.org
toby at macports.org
Thu Jan 15 12:34:03 PST 2009
Revision: 45424
http://trac.macports.org/changeset/45424
Author: toby at macports.org
Date: 2009-01-15 12:34:02 -0800 (Thu, 15 Jan 2009)
Log Message:
-----------
get $destroot out of final installed files, should be using /opt/local/etc/autobench.conf now (fixes #18001)
Modified Paths:
--------------
trunk/dports/www/autobench/Portfile
Added Paths:
-----------
trunk/dports/www/autobench/files/
trunk/dports/www/autobench/files/Makefile.diff
Modified: trunk/dports/www/autobench/Portfile
===================================================================
--- trunk/dports/www/autobench/Portfile 2009-01-15 20:27:37 UTC (rev 45423)
+++ trunk/dports/www/autobench/Portfile 2009-01-15 20:34:02 UTC (rev 45424)
@@ -23,9 +23,8 @@
depends_run bin:httperf:httperf
-patch {
- reinplace "s|/man|/share/man|" ${worksrcpath}/Makefile
+patchfiles Makefile.diff
+
+configure {
+ reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/Makefile
}
-use_configure no
-build.args PREFIX=${prefix}
-destroot.destdir PREFIX=${destroot}${prefix}
Added: trunk/dports/www/autobench/files/Makefile.diff
===================================================================
--- trunk/dports/www/autobench/files/Makefile.diff (rev 0)
+++ trunk/dports/www/autobench/files/Makefile.diff 2009-01-15 20:34:02 UTC (rev 45424)
@@ -0,0 +1,35 @@
+--- Makefile.orig 2009-01-15 12:31:45.000000000 -0800
++++ Makefile 2009-01-15 12:32:16.000000000 -0800
+@@ -1,6 +1,6 @@
+ # Makefile for autobench scripts
+ VERSION = 2.1.2
+-PREFIX = /usr/local
++PREFIX = __PREFIX__
+
+ # Automatically set correct paths for building Debian packages
+ ifdef DEB_BUILD_ARCH
+@@ -10,7 +10,7 @@
+ endif
+
+ BINDIR = $(PREFIX)$(ROOTBIN_PREFIX)/bin
+-MANDIR = $(PREFIX)$(ROOTMAN_PREFIX)/man/man1
++MANDIR = $(PREFIX)$(ROOTMAN_PREFIX)/share/man/man1
+ ETCDIR = $(PREFIX)/etc
+
+ ifdef DEB_BUILD_ARCH
+@@ -51,11 +51,11 @@
+ $(CC) $(DEBUG_FLAGS) -o crfile crfile.c
+
+ install: crfile sesslog
+- mkdir -p $(BINDIR) $(ETCDIR) $(MANDIR)
++ mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(ETCDIR) $(DESTDIR)$(MANDIR)
+ perl -pi -e 's/my \$$MASTER_CONFIG =.*$$/my \$$MASTER_CONFIG = "$$ENV{AB_CFG}";/' autobench
+- cp crfile autobench autobenchd autobench_admin sesslog bench2graph $(BINDIR)
+- cp autobenchd.1 autobench_admin.1 crfile.1 autobench.1 sesslog.1 bench2graph.1 $(MANDIR)
+- cp autobench.conf $(ETCDIR)
++ cp crfile autobench autobenchd autobench_admin sesslog bench2graph $(DESTDIR)$(BINDIR)
++ cp autobenchd.1 autobench_admin.1 crfile.1 autobench.1 sesslog.1 bench2graph.1 $(DESTDIR)$(MANDIR)
++ cp autobench.conf $(DESTDIR)$(ETCDIR)
+
+ clean:
+ rm -f crfile sesslog
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090115/6ca93a44/attachment.html>
More information about the macports-changes
mailing list