svn commit: r364738 - in head/net-mgmt/isic: . files

[Thomas Zander]

Author: riggs
Date: Tue Aug 12 19:30:39 2014
New Revision: 364738
URL: http://svnweb.freebsd.org/changeset/ports/364738
QAT: https://qat.redports.org/buildarchive/r364738/

Log:
  - Fix build failure on 9.1
  - Simplify Makefile in the process
  
  PR:		190649
  Submitted by:	Muhammad Moinur Rahman <5u623l20 at gmail.com> (maintainer)
  Reviewed by:	Muhammad Moinur Rahman <5u623l20 at gmail.com> (maintainer)
  Approved by:	mentors (implicit), maintainer
  MFH:		2014Q3

Modified:
  head/net-mgmt/isic/Makefile
  head/net-mgmt/isic/files/patch-isic.h

Modified: head/net-mgmt/isic/Makefile
==============================================================================
--- head/net-mgmt/isic/Makefile	Tue Aug 12 19:26:58 2014	(r364737)
+++ head/net-mgmt/isic/Makefile	Tue Aug 12 19:30:39 2014	(r364738)
@@ -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>

Modified: head/net-mgmt/isic/files/patch-isic.h
==============================================================================
--- head/net-mgmt/isic/files/patch-isic.h	Tue Aug 12 19:26:58 2014	(r364737)
+++ head/net-mgmt/isic/files/patch-isic.h	Tue Aug 12 19:30:39 2014	(r364738)
@@ -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))