Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Jan 2020 17:33:14 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r523582 - in head/net/norm: . files
Message-ID:  <202001191733.00JHXEIi024607@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Sun Jan 19 17:33:14 2020
New Revision: 523582
URL: https://svnweb.freebsd.org/changeset/ports/523582

Log:
  Allow building with a recent version of python

Added:
  head/net/norm/files/
  head/net/norm/files/patch-protolib_include_protoSpace.h   (contents, props changed)
Modified:
  head/net/norm/Makefile
  head/net/norm/distinfo

Modified: head/net/norm/Makefile
==============================================================================
--- head/net/norm/Makefile	Sun Jan 19 17:19:13 2020	(r523581)
+++ head/net/norm/Makefile	Sun Jan 19 17:33:14 2020	(r523582)
@@ -3,22 +3,25 @@
 PORTNAME=	norm
 PORTVERSION=	1.5r6
 CATEGORIES=	net
-MASTER_SITES=	http://downloads.pf.itd.nrl.navy.mil/norm/archive/
+MASTER_SITES=	http://downloads.pf.itd.nrl.navy.mil/norm/archive/:norm \
+		https://waf.io/:waf
 DISTNAME=	src-norm-${DISTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:norm \
+		waf-2.0.19:waf
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	hd@oc.dk
 COMMENT=	NACK-Oriented Reliable Multicast (NORM)
 
 WRKSRC=		${WRKDIR}/norm-${DISTVERSION}
 
-USES=		libtool python:2.7,build tar:tgz waf
+USES=		libtool tar:tgz waf
 USE_LDCONFIG=	yes
 PLIST_FILES=	include/normApi.h lib/libnorm.so lib/libnorm.so.1 \
 		lib/libnorm.so.1.0.0
 
-post-patch:
-	@${REINPLACE_CMD} -e '92s,r.*;,{&},' \
-		${WRKSRC}/protolib/include/protoSpace.h
+post-extract:
+	${CP} ${DISTDIR}/waf-2.0.19 ${WRKSRC}/waf
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/include/normApi.h ${STAGEDIR}${PREFIX}/include/

Modified: head/net/norm/distinfo
==============================================================================
--- head/net/norm/distinfo	Sun Jan 19 17:19:13 2020	(r523581)
+++ head/net/norm/distinfo	Sun Jan 19 17:33:14 2020	(r523582)
@@ -1,2 +1,5 @@
+TIMESTAMP = 1579424199
 SHA256 (src-norm-1.5r6.tgz) = 20ea2e8dd5d5e1ff1ff91dc7dab6db53a77d7b7183d8cf2425c215fd294f22a7
 SIZE (src-norm-1.5r6.tgz) = 2297898
+SHA256 (waf-2.0.19) = ba63c90a865a9bcf46926c4e6776f9a3f73d29f33d49b7f61f96bc37b7397cef
+SIZE (waf-2.0.19) = 104832

Added: head/net/norm/files/patch-protolib_include_protoSpace.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/norm/files/patch-protolib_include_protoSpace.h	Sun Jan 19 17:33:14 2020	(r523582)
@@ -0,0 +1,11 @@
+--- protolib/include/protoSpace.h.orig	2011-09-08 18:57:12 UTC
++++ protolib/include/protoSpace.h
+@@ -89,7 +89,7 @@ class ProtoSpace
+                 }
+ #else               
+                 ProtoTree::Endian GetEndian() const
+-                        return ProtoTree::ENDIAN_BIG;
++                        {return ProtoTree::ENDIAN_BIG;}
+                 void SetNode(Node* theNode)
+                     {memcpy(key+sizeof(double), &theNode, sizeof(Node*));}
+                 Node* GetNode() const



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001191733.00JHXEIi024607>