ports/185642: [PATCH] emulators/dynamips-community: update to 0.2.10, take maintainership

Pavel I Volkov pavelivolkov at gmail.com
Fri Jan 10 15:30:02 UTC 2014 

>Number:         185642
>Category:       ports
>Synopsis:       [PATCH] emulators/dynamips-community: update to 0.2.10, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 10 15:30:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Pavel I Volkov
>Release:        FreeBSD 9.2-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD be.dns4soho.net 9.2-RELEASE-p2 FreeBSD 9.2-RELEASE-p2 #3: Sat Nov 30 10:44:24 MSK 2013
>Description:
- Update to 0.2.10
- Change maintainer email
- Add stage support
- Changed the compilation mode selection depending on the architecture
- Set "nojit" mode on FreeBSD 10

Port maintainer (pavelivolkov at googlemail.com) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:

--- dynamips-community-0.2.10.patch begins here ---
diff -ruN ../dynamips-community.orig/Makefile ./Makefile
--- ../dynamips-community.orig/Makefile	2013-10-17 13:02:07.000000000 +0400
+++ ./Makefile	2014-01-10 19:14:34.000000000 +0400
@@ -2,26 +2,27 @@
 # $FreeBSD: head/emulators/dynamips-community/Makefile 327721 2013-09-20 16:43:52Z bapt $
 
 PORTNAME=	dynamips
-PORTVERSION=	0.2.8
+PORTVERSION=	0.2.10
 CATEGORIES=	emulators
-MASTER_SITES=	SF/gns-3/Dynamips/${PORTVERSION}-RC3${PKGNAMESUFFIX}
+MASTER_SITES=	SF/gns-3/Dynamips/${PORTVERSION}
 PKGNAMESUFFIX=	-community
-DISTNAME=	${PORTNAME}-${PORTVERSION}-RC3${PKGNAMESUFFIX}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
-MAINTAINER=	pavelivolkov at googlemail.com
+MAINTAINER=	pavelivolkov at gmail.com
 COMMENT=	Cisco 1700/2600/3600/3700/7200 Simulator
 
-LIB_DEPENDS=	elf.0:${PORTSDIR}/devel/libelf \
-		uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
-
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	elf:${PORTSDIR}/devel/libelf \
+		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
+
 CONFLICTS=	dynamips-[0-9]* dynamips-devel-[0-9]*
 
+USE_ZIP=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=	UNSTABLE
+OPTIONS_DEFINE=	DOCS UNSTABLE
 UNSTABLE_DESC=	development code (x64 Mac)
 
 LDFLAGS+=	-luuid
@@ -31,15 +32,13 @@
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 		PTHREAD_LIBS=${PTHREAD_LIBS}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-PLIST_FILES=	bin/${PORTNAME} bin/nvram_export
+PLIST_FILES=	bin/${PORTNAME} bin/nvram_export \
+		man/man1/${PORTNAME}.1.gz man/man1/nvram_export.1.gz \
+		man/man7/hypervisor_mode.7.gz
+
 PORTDOCS=	*
-.if !defined(NO_INSTALL_MANPAGES)
-MAN1=		${PORTNAME}.1 nvram_export.1
-MAN7=		hypervisor_mode.7
-.endif
 
 .if ${PORT_OPTIONS:MUNSTABLE}
 DYNAMIPS_CODE=	"unstable"
@@ -47,32 +46,39 @@
 DYNAMIPS_CODE=	"stable"
 .endif
 
+DYNAMIPS_ARCH=	"nojit"
+
 .if ${ARCH} == "i386"
 DYNAMIPS_ARCH=	"x86"
 .elif ${ARCH} == "amd64"
 DYNAMIPS_ARCH=	"amd64"
-.elif ${ARCH} == "sparc64"
-BROKEN=		Does not compile
-.elif ${ARCH} == "powerpc"
+.elif ${ARCH} == "powerpc" && ${DYNAMIPS_CODE} == "unstable"
 DYNAMIPS_ARCH=	"ppc32"
-BROKEN=		Does not compile: uses i386 asm
-.else
+.endif
+
+.if ${OSVERSION} >= 1000000
 DYNAMIPS_ARCH=	"nojit"
 .endif
 
+#BROKEN_ia64=	does not compile: invokes i386 assembler
+#BROKEN_sparc64=	${BROKEN_ia64}
+#BROKEN_powerpc=	${BROKEN_ia64}
+
+.include <bsd.port.options.mk>
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.${DYNAMIPS_CODE} ${PREFIX}/bin/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/${DYNAMIPS_CODE}/nvram_export ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.${DYNAMIPS_CODE} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/${DYNAMIPS_CODE}/nvram_export ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/nvram_export.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/hypervisor_mode.7 ${STAGEDIR}${MANPREFIX}/man/man7
+
+post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.community ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.hypervisor ${DOCSDIR}
-.endif
-.if !defined(NO_INSTALL_MANPAGES)
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/nvram_export.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/hypervisor_mode.7 ${PREFIX}/man/man7
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.hypervisor ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/RELEASE-NOTES ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN ../dynamips-community.orig/distinfo ./distinfo
--- ../dynamips-community.orig/distinfo	2013-10-17 13:02:07.000000000 +0400
+++ ./distinfo	2013-09-17 11:53:40.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (dynamips-0.2.8-RC3-community.tar.gz) = e808a50b6b9d24a90604885f90699f46b26a49e6ce9cf542aa288f135b2508ac
-SIZE (dynamips-0.2.8-RC3-community.tar.gz) = 818199
+SHA256 (dynamips-0.2.10-source.zip) = d62f739547134aeb0ee5a6b28a52772ae79a93cb6426b712cbddc72cb0b7ba44
+SIZE (dynamips-0.2.10-source.zip) = 966018
diff -ruN ../dynamips-community.orig/files/patch-common-gen_eth.c ./files/patch-common-gen_eth.c
--- ../dynamips-community.orig/files/patch-common-gen_eth.c	2013-10-17 13:02:07.000000000 +0400
+++ ./files/patch-common-gen_eth.c	1970-01-01 03:00:00.000000000 +0300
@@ -1,26 +0,0 @@
---- common/gen_eth.c.orig	2011-04-17 11:32:08.000000000 +0400
-+++ common/gen_eth.c	2011-04-17 11:36:47.000000000 +0400
-@@ -22,6 +22,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/wait.h>
-+#include <sys/ioctl.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <pthread.h>
-@@ -45,8 +46,13 @@
-    if (!(p = pcap_open_live(device,2048,TRUE,10,pcap_errbuf)))
-       goto pcap_error;
- 
--   /* Accept only incoming packets */
--   pcap_setdirection(p,PCAP_D_IN);
-+   pcap_setdirection(p,PCAP_D_INOUT);
-+#ifdef BIOCFEEDBACK
-+   {
-+     int on = 1;
-+     ioctl(pcap_fileno(p), BIOCFEEDBACK, &on);
-+   }
-+#endif
- #else
-    p = pcap_open(device,2048,
-                  PCAP_OPENFLAG_PROMISCUOUS | 
diff -ruN ../dynamips-community.orig/files/patch-nvram_export.1 ./files/patch-nvram_export.1
--- ../dynamips-community.orig/files/patch-nvram_export.1	2013-10-17 13:02:07.000000000 +0400
+++ ./files/patch-nvram_export.1	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- nvram_export.1.orig	Thu May  3 12:46:51 2007
-+++ nvram_export.1	Thu May  3 12:47:10 2007
-@@ -13,7 +13,7 @@
- Please send bug reports to http://www.ipflow.utc.fr/bts/
- .SH SEE ALSO
- .br
--\fBdynmips\fP(1), \fBhypervisor_mode\fP(7)
-+\fBdynamips\fP(1), \fBhypervisor_mode\fP(7)
- .br
- .UR
- http://www.ipflow.utc.fr/index.php/
diff -ruN ../dynamips-community.orig/files/patch-stable-Makefile ./files/patch-stable-Makefile
--- ../dynamips-community.orig/files/patch-stable-Makefile	2013-10-17 13:02:07.000000000 +0400
+++ ./files/patch-stable-Makefile	1970-01-01 03:00:00.000000000 +0300
@@ -1,20 +0,0 @@
---- stable/Makefile.orig	2011-04-17 11:08:00.000000000 +0400
-+++ stable/Makefile	2011-04-17 11:11:30.000000000 +0400
-@@ -61,7 +61,7 @@
- 	-DHAS_POSIX_MEMALIGN=$(HAS_POSIX_MEMALIGN)
- 
- #PCAP_LIB=/usr/local/lib/libpcap.a
--PCAP_LIB=-lpcap
-+PCAP_LIB?=-lpcap
- 
- ifeq ($(shell uname), FreeBSD)
-    PTHREAD_LIBS?=-pthread
-@@ -69,7 +69,7 @@
-    OSNAME=FreeBSD
-    CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libelf \
- 	$(PTHREAD_CFLAGS) -D_FILE_OFFSET_BITS=64
--   LIBS=-L$(LOCALBASE)/lib -L. -ldl -lelf $(PTHREAD_LIBS) $(LDFLAGS)
-+   LIBS=-L$(LOCALBASE)/lib -L. -lelf $(PTHREAD_LIBS) $(LDFLAGS)
- else
- ifeq ($(shell uname), Linux)
-    PTHREAD_LIBS?=-lpthread
diff -ruN ../dynamips-community.orig/files/patch-unstable-Makefile ./files/patch-unstable-Makefile
--- ../dynamips-community.orig/files/patch-unstable-Makefile	2013-10-17 13:02:07.000000000 +0400
+++ ./files/patch-unstable-Makefile	1970-01-01 03:00:00.000000000 +0300
@@ -1,20 +0,0 @@
---- unstable/Makefile.orig	2011-04-17 11:26:40.000000000 +0400
-+++ unstable/Makefile	2011-04-17 11:27:29.000000000 +0400
-@@ -61,7 +61,7 @@
- 	-DUSE_UNSTABLE
- 
- #PCAP_LIB=/usr/local/lib/libpcap.a
--PCAP_LIB=-lpcap
-+PCAP_LIB?=-lpcap
- 
- ifeq ($(shell uname), FreeBSD)
-    PTHREAD_LIBS?=-pthread
-@@ -69,7 +69,7 @@
-    OSNAME=FreeBSD
-    CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libelf \
- 	$(PTHREAD_CFLAGS) -D_FILE_OFFSET_BITS=64
--   LIBS=-L$(LOCALBASE)/lib -L. -ldl -lelf $(PTHREAD_LIBS) $(LDFLAGS)
-+   LIBS=-L$(LOCALBASE)/lib -L. -lelf $(PTHREAD_LIBS) $(LDFLAGS)
- else
- ifeq ($(shell uname), Linux)
-    PTHREAD_LIBS?=-lpthread
diff -ruN ../dynamips-community.orig/pkg-descr ./pkg-descr
--- ../dynamips-community.orig/pkg-descr	2013-10-17 13:02:07.000000000 +0400
+++ ./pkg-descr	2014-01-10 12:07:44.000000000 +0400
@@ -1,3 +1,3 @@
 Cisco 1700/2600/3600/3700/7200 simulator.
 
-WWW:	http://www.gns3.net/content/dynamips-028-rc3-community-version-released
+WWW: http://www.gns3.net/dynamips/
--- dynamips-community-0.2.10.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list