[49748] trunk/dports/net/monarch

markd at macports.org markd at macports.org
Thu Apr 16 23:43:56 PDT 2009


Revision: 49748
          http://trac.macports.org/changeset/49748
Author:   markd at macports.org
Date:     2009-04-16 23:43:55 -0700 (Thu, 16 Apr 2009)
Log Message:
-----------
Update to 2.5.0.

Modified Paths:
--------------
    trunk/dports/net/monarch/Portfile
    trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c

Modified: trunk/dports/net/monarch/Portfile
===================================================================
--- trunk/dports/net/monarch/Portfile	2009-04-17 06:37:09 UTC (rev 49747)
+++ trunk/dports/net/monarch/Portfile	2009-04-17 06:43:55 UTC (rev 49748)
@@ -2,18 +2,16 @@
 PortSystem      1.0
 
 name                    monarch
-version                 2.0.2
-version			1
+version                 2.5.0
 categories              net
-maintainers             markd at macports.org
+maintainers             markd
 description             A GUI configuration tool for Nagios written in perl
 long_description        ${description}
 homepage                http://sourceforge.net/projects/monarch
 platforms               darwin
 master_sites            sourceforge
-checksums               md5 85a84c2c4314ad2ea45e1ba2b7db13ca
-use_bzip2		yes
-patchfiles		patch-nmap_scan-nmap_scan.c
+checksums               md5 68658989ff485ac58a42035c3a927362
+patchfiles              patch-nmap_scan-nmap_scan.c
 depends_build		port:nagios
 depends_lib             port:mysql5 \
 			port:p5-libwww-perl \
@@ -26,6 +24,7 @@
 			port:p5-dbd-mysql \
 			port:p5-cgi-ajax \
 			port:p5-class-accessor
+patch.post_args		-F 3
 use_configure		no
 build {}
 
@@ -63,15 +62,15 @@
 # Enable Nmap Scanner
 	xinstall -m 755 -d ${destroot}${monarchdir}/bin
 
-	reinplace "s|/usr/local/groundwork/bin|${monarchdir}/bin|g" \
+	reinplace "s|/usr/local/groundwork|${monarchdir}|g" \
 		${destroot}${monarchdir}/nmap_scan_one.pl
 
-	reinplace "s|__PREFIX__|${prefix}|g" \
-		${worksrcpath}/nmap_scan/nmap_scan.c
-
 	xinstall -m 755 ${destroot}${monarchdir}/nmap_scan_one.pl \
                 ${destroot}${monarchdir}/bin
 
+	reinplace "s|__PREFIX__|${prefix}|g" \
+		${worksrcpath}/nmap_scan/nmap_scan.c
+
 	system "cd ${worksrcpath}/nmap_scan && gcc -g -O2 -Wall -o nmap_scan_one nmap_scan.c"
 
 # Install nmap_scan_one with mode 4750 and chown it to root (below) to allow normal user to run nmap with root privs

Modified: trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c
===================================================================
--- trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c	2009-04-17 06:37:09 UTC (rev 49747)
+++ trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c	2009-04-17 06:43:55 UTC (rev 49748)
@@ -1,13 +1,13 @@
---- nmap_scan/nmap_scan.c.org	2006-03-14 18:26:47.000000000 -0800
-+++ nmap_scan/nmap_scan.c	2006-07-15 23:58:37.000000000 -0700
+--- 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];
+ #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: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090416/272d9beb/attachment.html>


More information about the macports-changes mailing list