[78199] trunk/dports/net/vnstat
and.damore at macports.org
and.damore at macports.org
Thu Apr 28 01:46:25 PDT 2011
Revision: 78199
http://trac.macports.org/changeset/78199
Author: and.damore at macports.org
Date: 2011-04-28 01:46:25 -0700 (Thu, 28 Apr 2011)
Log Message:
-----------
vnstat Portfile change, compiler and arch setting - patches moved in post-patch phases
Modified Paths:
--------------
trunk/dports/net/vnstat/Portfile
Added Paths:
-----------
trunk/dports/net/vnstat/files/patch-Makefile.diff
Removed Paths:
-------------
trunk/dports/net/vnstat/files/patch-makefile.diff
Modified: trunk/dports/net/vnstat/Portfile
===================================================================
--- trunk/dports/net/vnstat/Portfile 2011-04-28 07:03:57 UTC (rev 78198)
+++ trunk/dports/net/vnstat/Portfile 2011-04-28 08:46:25 UTC (rev 78199)
@@ -3,6 +3,7 @@
name vnstat
version 1.10
+revision 1
categories net
platforms darwin
maintainers and.damore openmaintainer
@@ -15,36 +16,35 @@
of system resources.
homepage http://wsapi.luaforge.net/
+depends_lib port:gd2
master_sites http://humdi.net/${name}
-
checksums md5 95421d968689130590348ceb80ff74a8 \
sha1 813177fb55296deaf5059bb111885616f4d8a86f \
rmd160 1fddc4343cb3206cce42516f7ff61024c65eed3f
+patchfiles patch-Makefile.diff
+post-patch {
+ reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/Makefile
+ reinplace "s|${prefix}/man|${prefix}/share/man|g" ${worksrcpath}/Makefile
+ reinplace "s|(DESTDIR)/etc/vnstat|(DESTDIR)${prefix}/etc/vnstat|g" ${worksrcpath}/Makefile
+# reinplace "s|install -D|install -d|g" ${worksrcpath}/Makefile
+}
+
use_configure no
+variant universal {}
+if {[variant_isset universal]} {
+ set archflags ${configure.universal_cflags} } else {
+ set archflags ${configure.cc_archflags} }
+build.env-append CC="${configure.cc} ${archflags}"
destroot.target bsdinstall
-depends_lib port:gd2
-
-patchfiles patch-makefile.diff
-
-#post-patch {
-# reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/Makefile
-# reinplace "s|DESTDIR)/etc/vnstat|DESTDIR)${prefix}/etc/vnstat|g" ${worksrcpath}/Makefile
-#}
-
post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 755 -d ${destroot}${prefix}/share/examples/${name}
- xinstall -m 644 \
- ${worksrcpath}/CHANGES \
- ${worksrcpath}/COPYING \
- ${worksrcpath}/FAQ \
- ${worksrcpath}/INSTALL \
- ${worksrcpath}/INSTALL_BSD \
- ${worksrcpath}/README \
- ${destroot}${prefix}/share/doc/${name}
+ xinstall -m 644 -W ${worksrcpath} \
+ CHANGES COPYING FAQ INSTALL INSTALL_BSD README \
+ ${destroot}${prefix}/share/doc/${name}
file copy {*}[glob ${worksrcpath}/examples/*] ${destroot}${prefix}/share/examples/${name}
}
Copied: trunk/dports/net/vnstat/files/patch-Makefile.diff (from rev 78164, trunk/dports/net/vnstat/files/patch-makefile.diff)
===================================================================
--- trunk/dports/net/vnstat/files/patch-Makefile.diff (rev 0)
+++ trunk/dports/net/vnstat/files/patch-Makefile.diff 2011-04-28 08:46:25 UTC (rev 78199)
@@ -0,0 +1,18 @@
+--- Makefile.orig 2011-04-28 10:21:34.000000000 +0200
++++ Makefile 2011-04-28 10:24:08.000000000 +0200
+@@ -138,12 +138,14 @@
+ # install default config if such doesn't exist
+ @if [ ! -f $(DESTDIR)/etc/vnstat.conf ]; \
+ then echo "Installing config to $(DESTDIR)/etc/vnstat.conf"; \
+- install -D -m 644 cfg/vnstat.conf $(DESTDIR)/etc/vnstat.conf; \
++ install -m 644 cfg/vnstat.conf $(DESTDIR)/etc/vnstat.conf; \
+ sed -e 's/lib/db/g' $(DESTDIR)/etc/vnstat.conf >$(DESTDIR)/etc/vnstat.conf.bsd; \
+ mv -f $(DESTDIR)/etc/vnstat.conf.bsd $(DESTDIR)/etc/vnstat.conf; \
+ fi
+
+ # update man page
++ install -d -m 644 $(MAN_BSD)/man1
++ install -d -m 644 $(MAN_BSD)/man5
+ install -m 644 man/vnstat.1 $(MAN_BSD)/man1
+ install -m 644 man/vnstatd.1 $(MAN_BSD)/man1
+ install -m 644 man/vnstat.conf.5 $(MAN_BSD)/man5
Deleted: trunk/dports/net/vnstat/files/patch-makefile.diff
===================================================================
--- trunk/dports/net/vnstat/files/patch-makefile.diff 2011-04-28 07:03:57 UTC (rev 78198)
+++ trunk/dports/net/vnstat/files/patch-makefile.diff 2011-04-28 08:46:25 UTC (rev 78199)
@@ -1,76 +0,0 @@
---- Makefile.orig 2011-04-23 20:41:36.000000000 +0200
-+++ Makefile 2011-04-23 20:42:09.000000000 +0200
-@@ -4,9 +4,9 @@
- MAN = $(DESTDIR)/usr/share/man
-
- # bin and man dirs for *BSD
--BIN_BSD = $(DESTDIR)/usr/local/bin
--SBIN_BSD = $(DESTDIR)/usr/local/sbin
--MAN_BSD = $(DESTDIR)/usr/local/man
-+BIN_BSD = $(DESTDIR)/opt/local/bin
-+SBIN_BSD = $(DESTDIR)/opt/local/sbin
-+MAN_BSD = $(DESTDIR)/opt/local/share/man
-
- default: vnstat
-
-@@ -41,15 +41,15 @@
- fi
-
- # remove some really old version binary if found
-- @if [ -x "$(DESTDIR)/usr/local/bin/vnstat" ]; \
-+ @if [ -x "$(DESTDIR)/opt/local/bin/vnstat" ]; \
- then echo "Removing old binary..."; \
-- rm -f $(DESTDIR)/usr/local/bin/vnstat; \
-+ rm -f $(DESTDIR)/opt/local/bin/vnstat; \
- fi
-
- # install default config if such doesn't exist
-- @if [ ! -f "$(DESTDIR)/etc/vnstat.conf" ]; \
-- then echo "Installing config to $(DESTDIR)/etc/vnstat.conf"; \
-- install -D -m 644 cfg/vnstat.conf $(DESTDIR)/etc/vnstat.conf; \
-+ @if [ ! -f "$(DESTDIR)/opt/local/etc/vnstat.conf" ]; \
-+ then echo "Installing config to $(DESTDIR)/opt/local/etc/vnstat.conf"; \
-+ install -D -m 644 cfg/vnstat.conf $(DESTDIR)/opt/local/etc/vnstat.conf; \
- fi
-
- # install everything else
-@@ -106,7 +106,7 @@
- rm -f $(MAN)/man1/vnstat*
- rm -f $(MAN)/man5/vnstat*
- rm -f $(DESTDIR)/etc/cron.d/vnstat
-- rm -f $(DESTDIR)/etc/vnstat.conf
-+ rm -f $(DESTDIR)/opt/local/etc/vnstat.conf
- rm -f $(DESTDIR)/etc/ppp/ip-up.d/vnstat
- rm -f $(DESTDIR)/etc/ppp/ip-down.d/vnstat
-
-@@ -136,16 +136,18 @@
- fi
-
- # install default config if such doesn't exist
-- @if [ ! -f $(DESTDIR)/etc/vnstat.conf ]; \
-- then echo "Installing config to $(DESTDIR)/etc/vnstat.conf"; \
-- install -D -m 644 cfg/vnstat.conf $(DESTDIR)/etc/vnstat.conf; \
-- sed -e 's/lib/db/g' $(DESTDIR)/etc/vnstat.conf >$(DESTDIR)/etc/vnstat.conf.bsd; \
-- mv -f $(DESTDIR)/etc/vnstat.conf.bsd $(DESTDIR)/etc/vnstat.conf; \
-+ @if [ ! -f $(DESTDIR)/opt/local/etc/vnstat.conf ]; \
-+ then echo "Installing config to $(DESTDIR)/opt/local/etc/vnstat.conf"; \
-+ install -d -m 644 cfg/vnstat.conf $(DESTDIR)/opt/local/etc/vnstat.conf; \
-+ sed -e 's/lib/db/g' $(DESTDIR)/opt/local/etc/vnstat.conf >$(DESTDIR)/opt/local/etc/vnstat.conf.bsd; \
-+ mv -f $(DESTDIR)/opt/local/etc/vnstat.conf.bsd $(DESTDIR)/opt/local/etc/vnstat.conf; \
- fi
-
- # update man page
-+ install -d -m 644 $(MAN_BSD)/man1
- install -m 644 man/vnstat.1 $(MAN_BSD)/man1
- install -m 644 man/vnstatd.1 $(MAN_BSD)/man1
-+ install -d -m 644 $(MAN_BSD)/man5
- install -m 644 man/vnstat.conf.5 $(MAN_BSD)/man5
- gzip -f9 $(MAN_BSD)/man1/vnstat.1
- gzip -f9 $(MAN_BSD)/man1/vnstatd.1
-@@ -183,5 +185,5 @@
- rm -f $(SBIN_BSD)/vnstatd
- rm -f $(MAN_BSD)/man1/vnstat*
- rm -f $(MAN_BSD)/man5/vnstat*
-- rm -f $(DESTDIR)/etc/vnstat.conf
-+ rm -f $(DESTDIR)/opt/local/etc/vnstat.conf
- @echo "A possible cron entry needs to be removed manually if such exists."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110428/677854c0/attachment-0001.html>
More information about the macports-changes
mailing list