# HG changeset patch # User Michael Schloh von Bennewitz # Date 1346172360 -7200 # Node ID 6db023bc55120c0e96dcf1984703569db2e8989b # Parent 300d43423c2e2b140c662e8431804acac52320f4 Correct building on very new FreeBSD releases and modernize packaging. diff -r 300d43423c2e -r 6db023bc5512 snmp/snmp.patch --- a/snmp/snmp.patch Wed Feb 08 20:07:00 2012 +0200 +++ b/snmp/snmp.patch Tue Aug 28 18:46:00 2012 +0200 @@ -176,3 +176,23 @@ { char *cp; int ret; +Index: include/net-snmp/system/freebsd8.h +--- include/net-snmp/system/freebsd8.h.orig 2011-09-28 06:53:47.000000000 +0200 ++++ include/net-snmp/system/freebsd8.h 2011-12-11 11:33:36.000000000 +0100 +@@ -1,3 +1,6 @@ ++/* freebsd8 is a superset of freebsd7 */ ++#include "freebsd7.h" ++#define freebsd7 freebsd7 + /* freebsd8 is a superset of freebsd4 */ + #include "freebsd7.h" + #define freebsd7 freebsd7 +Index: include/net-snmp/system/freebsd9.h +--- include/net-snmp/system/freebsd9.h.orig 2011-09-28 06:53:47.000000000 +0200 ++++ include/net-snmp/system/freebsd9.h 2011-12-11 11:33:36.000000000 +0100 +@@ -1,3 +1,6 @@ ++/* freebsd9 is a superset of freebsd8 */ ++#include "freebsd8.h" ++#define freebsd8 freebsd8 + /* freebsd9 is a superset of freebsd4 */ + #include "freebsd8.h" + #define freebsd9 freebsd9 diff -r 300d43423c2e -r 6db023bc5512 snmp/snmp.spec --- a/snmp/snmp.spec Wed Feb 08 20:07:00 2012 +0200 +++ b/snmp/snmp.spec Tue Aug 28 18:46:00 2012 +0200 @@ -32,7 +32,7 @@ Group: Network License: BSD Version: 5.7.1 -Release: 20120208 +Release: 20120800 # package options %option with_fsl yes @@ -54,10 +54,8 @@ Patch2: snmp_iface.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823, gcc -PreReq: OpenPKG, openpkg >= 20060823 +BuildPreReq: OpenPKG, openpkg >= 20100101, gcc +PreReq: OpenPKG, openpkg >= 20100101 BuildPreReq: openssl PreReq: openssl %if "%{with_fsl}" == "yes" @@ -68,8 +66,6 @@ BuildPreReq: perl PreReq: perl %endif -AutoReq: no -AutoReqProv: no %description This is a toolkit relating to the Simple Network Management Protocol @@ -177,8 +173,6 @@ %{l_make} %{l_mflags} %install - rm -rf $RPM_BUILD_ROOT - # install package %{l_shtool} subst -v \ -e "s;^\\(prefix.*=\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix};g" \ @@ -231,7 +225,6 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT %post # after upgrade, restart service