From owner-svn-ports-branches@FreeBSD.ORG Tue Aug 12 20:56:24 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5ADB271D for ; Tue, 12 Aug 2014 20:56:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2FF3F2172 for ; Tue, 12 Aug 2014 20:56:24 +0000 (UTC) Received: from riggs (uid 1334) (envelope-from riggs@FreeBSD.org) id 6d9f by svn.freebsd.org (DragonFly Mail Agent v0.9+); Tue, 12 Aug 2014 20:56:23 +0000 From: Thomas Zander Date: Tue, 12 Aug 2014 20:56:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364745 - in branches/2014Q3/net-mgmt/isic: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53ea7f78.6d9f.1a45c776@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Aug 2014 20:56:24 -0000 Author: riggs Date: Tue Aug 12 20:56:23 2014 New Revision: 364745 URL: http://svnweb.freebsd.org/changeset/ports/364745 QAT: https://qat.redports.org/buildarchive/r364745/ Log: MFH: r364738 - 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: portmgr (erwin), mentors (implicit), maintainer Modified: branches/2014Q3/net-mgmt/isic/Makefile branches/2014Q3/net-mgmt/isic/files/patch-isic.h Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/net-mgmt/isic/Makefile ============================================================================== --- branches/2014Q3/net-mgmt/isic/Makefile Tue Aug 12 20:55:08 2014 (r364744) +++ branches/2014Q3/net-mgmt/isic/Makefile Tue Aug 12 20:56:23 2014 (r364745) @@ -19,16 +19,10 @@ USES= tar:tgz LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config -.include - 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 +.include Modified: branches/2014Q3/net-mgmt/isic/files/patch-isic.h ============================================================================== --- branches/2014Q3/net-mgmt/isic/files/patch-isic.h Tue Aug 12 20:55:08 2014 (r364744) +++ branches/2014Q3/net-mgmt/isic/files/patch-isic.h Tue Aug 12 20:56:23 2014 (r364745) @@ -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))