[129760] trunk/dports/net/net-snmp

ryandesign at macports.org ryandesign at macports.org
Fri Dec 19 16:41:13 PST 2014


Revision: 129760
          https://trac.macports.org/changeset/129760
Author:   ryandesign at macports.org
Date:     2014-12-19 16:41:13 -0800 (Fri, 19 Dec 2014)
Log Message:
-----------
net-snmp:
* update to 5.7.3 (#46225)
* use perl 5.16 explicitly
* change no_ssl variant to ssl variant
* remove server variant; always build agent and install launchd plist (#26197)
* don't install.asroot; I don't remember why I added that in r73191
* allow parallel build, which now works (#35691)
* add kerberos5 dependency to ksm variant, which now works (#21241)

Revision Links:
--------------
    https://trac.macports.org/changeset/73191

Modified Paths:
--------------
    trunk/dports/net/net-snmp/Portfile
    trunk/dports/net/net-snmp/files/patch-configure.diff

Added Paths:
-----------
    trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin14.h.diff

Removed Paths:
-------------
    trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin13.h.diff

Modified: trunk/dports/net/net-snmp/Portfile
===================================================================
--- trunk/dports/net/net-snmp/Portfile	2014-12-19 23:59:34 UTC (rev 129759)
+++ trunk/dports/net/net-snmp/Portfile	2014-12-20 00:41:13 UTC (rev 129760)
@@ -4,8 +4,7 @@
 PortSystem              1.0
 
 name                    net-snmp
-version                 5.7.2
-revision                4
+version                 5.7.3
 categories              net
 license                 BSD
 platforms               darwin
@@ -23,37 +22,31 @@
                         handle SNMP traps, a version of the unix 'netstat' \
                         command using SNMP, a Tk/perl MIB browser.
 
-checksums               rmd160  392d643e9f2f42ee4fa688b4702329ad005ee12e \
-                        sha256  09ed31b4cc1f3c0411ef9a16eff79ef3b30d89c32ca46d5a01a41826c4ceb816
+checksums               rmd160  c5cf54d5723ee417e07f1f9fa3936aef505104a2 \
+                        sha256  12ef89613c7707dc96d13335f153c1921efc9d61d3708ef09f3fc4a7014fb4f0
 
+set perl_version        5.16
+
+depends_lib             port:bzip2 \
+                        port:perl${perl_version} \
+                        port:zlib
+
 post-extract {
-    # darwin13.h does not exist in 5.7.2
+    # darwin14.h does not exist in 5.7.3
     # https://sourceforge.net/p/net-snmp/bugs/2504/
-    copy ${worksrcpath}/include/net-snmp/system/darwin12.h ${worksrcpath}/include/net-snmp/system/darwin13.h
+    copy ${worksrcpath}/include/net-snmp/system/darwin13.h ${worksrcpath}/include/net-snmp/system/darwin14.h
 }
 
 patchfiles              patch-configure.diff
-patchfiles-append       patch-include-net-snmp-system-darwin13.h.diff
-patchfiles-append       patch-5.7.2.1.diff
+patchfiles-append       patch-include-net-snmp-system-darwin14.h.diff
 
-depends_lib             port:openssl \
-                        port:zlib \
-                        port:bzip2 \
-                        path:bin/perl:perl5
+configure.env-append    PERLPROG=${prefix}/bin/perl${perl_version}
 
-# make[1]: *** No rule to make target `add_mibdir.3', needed by `maninstall'.  Stop.
-use_parallel_build      no
-
-configure.env-append    PERLPROG=${prefix}/bin/perl
-
 configure.args          --with-defaults \
-                        --disable-agent \
                         --with-sys-contact=nobody at no.where \
                         --with-persistent-directory=${prefix}/var/net-snmp \
-                        --mandir=${prefix}/share/man \
-                        --infodir=${prefix}/share/info \
                         --with-logfile=${prefix}/var/log \
-                        --with-openssl=${prefix} \
+                        --without-openssl \
                         --with-zlib=${prefix} \
                         --with-bzip2=${prefix} \
                         --with-install-prefix=${destroot} \
@@ -62,22 +55,20 @@
                         --enable-ipv6 \
                         --with-out-mib-modules=mibII/ipv6
 
-variant no_ssl description {Without libssl support} {
-    depends_lib-delete port:openssl
-    configure.args-delete --with-openssl=${prefix}
-    configure.args-append --without-openssl
+# Remove no_ssl variant after December 2015
+variant no_ssl conflicts ssl description {Legacy compatibility variant} {}
+variant ssl conflicts no_ssl description {Enable ssl support} {
+    depends_lib-append  port:openssl
+    configure.args-replace --without-openssl --with-openssl=${prefix}
 }
-
-variant server description {Build snmpd} {
-    configure.args-delete --disable-agent
-    
-    startupitem.create  yes
-    startupitem.name    NetSNMP
-    startupitem.start   "echo \"NOT starting (net-)snmpd, no real startup item yet\""
-    startupitem.stop    "echo \"NOT stopping (net-)snmpd, no real startup item yet\""
+if {[variant_isset no_ssl]} {
+    default_variants -ssl
+} else {
+    default_variants +ssl
 }
 
-variant ksm description {support for kerberos based SNMP security} {
+variant ksm description {Enable support for kerberos-based SNMP security} {
+    depends_lib-append  port:kerberos5
     configure.args-append --with-security-modules="usm ksm"
 }
 
@@ -99,7 +90,8 @@
     }
 }
 
-install.asroot          yes
+startupitem.create      yes
+startupitem.executable  ${prefix}/sbin/snmpd -f
 
 livecheck.type          regex
 livecheck.url           ${homepage}download.html

Modified: trunk/dports/net/net-snmp/files/patch-configure.diff
===================================================================
--- trunk/dports/net/net-snmp/files/patch-configure.diff	2014-12-19 23:59:34 UTC (rev 129759)
+++ trunk/dports/net/net-snmp/files/patch-configure.diff	2014-12-20 00:41:13 UTC (rev 129760)
@@ -1,6 +1,6 @@
---- configure.orig	2012-10-09 17:35:37.000000000 -0500
-+++ configure	2012-10-20 18:10:02.000000000 -0500
-@@ -23410,7 +23410,7 @@
+--- configure.orig	2014-12-08 14:23:37.000000000 -0600
++++ configure	2014-12-19 18:25:57.000000000 -0600
+@@ -23928,7 +23928,7 @@
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Perl cc" >&5
  $as_echo_n "checking for Perl cc... " >&6; }
  

Deleted: trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin13.h.diff
===================================================================
--- trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin13.h.diff	2014-12-19 23:59:34 UTC (rev 129759)
+++ trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin13.h.diff	2014-12-20 00:41:13 UTC (rev 129760)
@@ -1,15 +0,0 @@
---- include/net-snmp/system/darwin12.h	2012-10-09 17:28:58.000000000 -0500
-+++ include/net-snmp/system/darwin13.h	2013-10-24 00:58:04.000000000 -0500
-@@ -44,9 +44,9 @@
- /*
-  * This section defines Mac OS X 10.5 (and later) specific additions.
-  */
--#define darwin 12
--#ifndef darwin12
--#   define darwin12 darwin
-+#define darwin 13
-+#ifndef darwin13
-+#   define darwin13 darwin
- #endif
- 
- /*

Copied: trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin14.h.diff (from rev 129748, trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin13.h.diff)
===================================================================
--- trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin14.h.diff	                        (rev 0)
+++ trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin14.h.diff	2014-12-20 00:41:13 UTC (rev 129760)
@@ -0,0 +1,15 @@
+--- include/net-snmp/system/darwin13.h	2013-10-09 17:28:58.000000000 -0500
++++ include/net-snmp/system/darwin14.h	2014-10-24 00:58:04.000000000 -0500
+@@ -44,9 +44,9 @@
+ /*
+  * This section defines Mac OS X 10.5 (and later) specific additions.
+  */
+-#define darwin 13
+-#ifndef darwin13
+-#   define darwin13 darwin
++#define darwin 14
++#ifndef darwin14
++#   define darwin14 darwin
+ #endif
+ 
+ /*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141219/7f2bead6/attachment.html>


More information about the macports-changes mailing list