[129017] trunk/dports/net/monarch
devans at macports.org
devans at macports.org
Wed Dec 3 05:19:01 PST 2014
Revision: 129017
https://trac.macports.org/changeset/129017
Author: devans at macports.org
Date: 2014-12-03 05:19:01 -0800 (Wed, 03 Dec 2014)
Log Message:
-----------
monarch: switch from perl5.12 to perl5.16, remove ineffective +server variant, various destroot fixups, dependencies, use notes rather than post-activate ui_msg, minor white space for lint (#44405).
Modified Paths:
--------------
trunk/dports/net/monarch/Portfile
Added Paths:
-----------
trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c.diff
Removed Paths:
-------------
trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c
Modified: trunk/dports/net/monarch/Portfile
===================================================================
--- trunk/dports/net/monarch/Portfile 2014-12-03 12:50:08 UTC (rev 129016)
+++ trunk/dports/net/monarch/Portfile 2014-12-03 13:19:01 UTC (rev 129017)
@@ -1,10 +1,11 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
+
PortSystem 1.0
-
+
name monarch
version 2.5.0
-revision 1
+revision 2
license GPL-2
categories net
maintainers nomaintainer
@@ -13,49 +14,45 @@
homepage http://sourceforge.net/projects/monarch
platforms darwin
master_sites sourceforge
+
checksums md5 68658989ff485ac58a42035c3a927362
-patchfiles patch-nmap_scan-nmap_scan.c
-depends_build port:nagios
+
depends_lib path:bin/mysql_config5:mysql5 \
- port:p5.12-libwww-perl \
- port:p5.12-xml-namespacesupport \
- port:p5.12-xml-sax \
- port:p5.12-xml-libxml \
- port:p5.12-nmap-scanner \
- port:p5.12-dbi \
- port:p5.12-dbd-mysql \
- port:p5.12-cgi-ajax \
- port:p5.12-class-accessor
-patch.post_args -F 3
+ port:nagios \
+ port:p5.16-libwww-perl \
+ port:p5.16-xml-namespacesupport \
+ port:p5.16-xml-sax \
+ port:p5.16-xml-libxml \
+ port:p5.16-nmap-scanner \
+ port:p5.16-dbi \
+ port:p5.16-dbd-mysql \
+ port:p5.16-cgi-ajax \
+ port:p5.16-class-accessor
+
+patchfiles patch-nmap_scan-nmap_scan.c.diff
+
use_configure no
build {}
-variant server {
-# This variant doesn't do anything in this port, it only exists to trigger the server
-# variant in the mysql5 port.
-}
+set monarchdir ${prefix}/share/groundwork/monarch
-variant_set server
-
-set monarchdir ${prefix}/groundwork/monarch
-
destroot {
xinstall -m 755 -d ${destroot}${monarchdir}
- system "cp -R ${worksrcpath}/* ${destroot}${monarchdir}"
+ eval copy [glob ${worksrcpath}/*] ${destroot}${monarchdir}
}
post-destroot {
- eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
+ eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.16|g" \
[glob ${destroot}${monarchdir}/*.pl]
- eval reinplace "s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl5.12|g" \
- [glob ${destroot}${monarchdir}/*.cgi]
+ eval reinplace "s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl5.16|g" \
+ [glob ${destroot}${monarchdir}/*.cgi] \
+ [glob ${destroot}${monarchdir}/*.p*]
- eval reinplace "s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl5.12|g" \
- [glob ${destroot}${monarchdir}/*.p*]
-
eval reinplace "s|/usr/local/groundwork/monarch|${monarchdir}|g" \
- [glob ${destroot}${monarchdir}/*.*]
+ [glob ${destroot}${monarchdir}/*.cgi] \
+ [glob ${destroot}${monarchdir}/*.pl] \
+ ${destroot}${monarchdir}/monarch.sql
# Fix mysqldump location
reinplace "s|/usr/bin/mysqldump|${prefix}/bin/mysqldump5|g" \
@@ -80,8 +77,8 @@
${destroot}${monarchdir}/bin
# Delete precompiled Linux version of nmap_scan_one and leftover nmap_scan_one.pl
- file delete ${destroot}${monarchdir}/nmap_scan_one
- file delete ${destroot}${monarchdir}/nmap_scan_one.pl
+ delete ${destroot}${monarchdir}/nmap_scan_one
+ delete ${destroot}${monarchdir}/nmap_scan_one.pl
# End enable Nmap-Scanner
@@ -91,9 +88,10 @@
system "chown root ${destroot}${monarchdir}/bin/nmap_scan_one"
}
-post-activate {
-ui_msg "\n **** To complete the Monarch installation ****
+notes "
+
+**** To complete the Monarch installation ****
Read the README at ${prefix}/share/groundwork/monarch/ for full information.
@@ -194,7 +192,5 @@
NOTE: No login is required for the monarch_ez.cgi interface, so you will need to use Apache
username(s)/password(s) just like you use for the Nagios monitor interface to maintain
secure access.
-\n"
-}
-
+"
livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)\\.tar"
Deleted: trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c
===================================================================
--- trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c 2014-12-03 12:50:08 UTC (rev 129016)
+++ trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c 2014-12-03 13:19:01 UTC (rev 129017)
@@ -1,13 +0,0 @@
---- nmap_scan/nmap_scan.c.org 2008-06-17 15:41:59.000000000 -0700
-+++ nmap_scan/nmap_scan.c 2009-04-16 23:34:38.000000000 -0700
-@@ -1,8 +1,8 @@
- #include <signal.h>
- #include <sys/param.h>
- #include <pwd.h>
--static char *nmap_pl = "/usr/local/groundwork/monarch/bin/nmap_scan_one.pl";
--static char *trusted_env[]={"PATH=/usr/local/groundwork/bin:/usr/bin:/usr/sbin:/sbin:/bin",0};
-+static char *nmap_pl = "__PREFIX__/groundwork/monarch/bin/nmap_scan_one.pl";
-+static char *trusted_env[]={"PATH=__PREFIX__/groundwork/monarch/bin:__PREFIX__/bin:__PREFIX__/sbin:/usr/bin:/usr/sbin:/sbin:/bin",0};
- int main(int argc, char *argv[])
- {
- char *ip_address = argv[1];
Copied: trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c.diff (from rev 129015, trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c)
===================================================================
--- trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c.diff (rev 0)
+++ trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c.diff 2014-12-03 13:19:01 UTC (rev 129017)
@@ -0,0 +1,13 @@
+--- nmap_scan/nmap_scan.c.org 2008-06-17 15:41:59.000000000 -0700
++++ nmap_scan/nmap_scan.c 2009-04-16 23:34:38.000000000 -0700
+@@ -1,8 +1,8 @@
+ #include <signal.h>
+ #include <sys/param.h>
+ #include <pwd.h>
+-static char *nmap_pl = "/usr/local/groundwork/monarch/bin/nmap_scan_one.pl";
+-static char *trusted_env[]={"PATH=/usr/local/groundwork/bin:/usr/bin:/usr/sbin:/sbin:/bin",0};
++static char *nmap_pl = "__PREFIX__/groundwork/monarch/bin/nmap_scan_one.pl";
++static char *trusted_env[]={"PATH=__PREFIX__/groundwork/monarch/bin:__PREFIX__/bin:__PREFIX__/sbin:/usr/bin:/usr/sbin:/sbin:/bin",0};
+ int main(int argc, char *argv[])
+ {
+ char *ip_address = argv[1];
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141203/07e1a882/attachment-0001.html>
More information about the macports-changes
mailing list