aboutsummaryrefslogtreecommitdiffstats
path: root/net-mgmt
diff options
context:
space:
mode:
authorriggs <riggs@FreeBSD.org>2014-08-13 03:30:39 +0800
committerriggs <riggs@FreeBSD.org>2014-08-13 03:30:39 +0800
commitcae7a0bbc85d759a3c3e818f8a6f8ba8847a5a3e (patch)
tree627295c051214c575bdc0bdd47f8cf9827fc791a /net-mgmt
parent5f69211ef9e7e17c50e81f3c35e76c97d3d02a70 (diff)
downloadfreebsd-ports-gnome-cae7a0bbc85d759a3c3e818f8a6f8ba8847a5a3e.tar.gz
freebsd-ports-gnome-cae7a0bbc85d759a3c3e818f8a6f8ba8847a5a3e.tar.zst
freebsd-ports-gnome-cae7a0bbc85d759a3c3e818f8a6f8ba8847a5a3e.zip
- Fix build failure on 9.1
- Simplify Makefile in the process PR: 190649 Submitted by: Muhammad Moinur Rahman <5u623l20@gmail.com> (maintainer) Reviewed by: Muhammad Moinur Rahman <5u623l20@gmail.com> (maintainer) Approved by: mentors (implicit), maintainer MFH: 2014Q3
Diffstat (limited to 'net-mgmt')
-rw-r--r--net-mgmt/isic/Makefile8
-rw-r--r--net-mgmt/isic/files/patch-isic.h14
2 files changed, 14 insertions, 8 deletions
diff --git a/net-mgmt/isic/Makefile b/net-mgmt/isic/Makefile
index 6f25cb7a4c3a..fe6fbea3ced9 100644
--- a/net-mgmt/isic/Makefile
+++ b/net-mgmt/isic/Makefile
@@ -19,16 +19,10 @@ USES= tar:tgz
LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
-.include <bsd.port.pre.mk>
-
post-patch:
-.if ${OSVERSION} > 900000
- @${REINPLACE_CMD} -e 's|2147483647|2147483645|' \
- ${WRKSRC}/isic.h
-.endif
@${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|' \
${WRKSRC}/Makefile.in
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/isic/files/patch-isic.h b/net-mgmt/isic/files/patch-isic.h
index 356c6831a37f..45c6b4f3b406 100644
--- a/net-mgmt/isic/files/patch-isic.h
+++ b/net-mgmt/isic/files/patch-isic.h
@@ -1,5 +1,5 @@
--- isic.h.orig 2006-12-16 01:08:44.000000000 +0100
-+++ isic.h 2013-02-18 07:36:38.000000000 +0100
++++ isic.h 2014-08-11 16:25:34.551003726 +0200
@@ -5,11 +5,15 @@
#endif
@@ -16,3 +16,15 @@
#ifndef ETHER_FRAME_SIZE
#define ETHER_FRAME_SIZE 1500
+@@ -21,11 +25,6 @@
+ #define IP6_FRAGH 8
+ #define ICMP6_H 8
+
+-/* We want a random function that returns 0 to 0x7fff */
+-#if ( RAND_MAX != 2147483647 ) /* expect signed long */
+-#error Random IP generation broken: unexpected RAND_MAX.
+-#endif
+-
+ #define RAND8 ((u_int8_t)(rand() & 0xff))
+ #define RAND16 ((u_int16_t)(rand() & 0xffff))
+ #define RAND32 ((u_int32_t)((RAND16 << 16) + RAND16))