From faa1a95efcb8ea8a0823666d3561f54513080af0 Mon Sep 17 00:00:00 2001 From: John Marino Date: Sat, 25 Jan 2014 16:29:42 +0000 Subject: emulations/dynamips-community: Update to 0.2.10, support stage Additionally from marino@: * Use OPSYS with OVERSION * Properly set LIB_DEPENDS * Treat x86-64 like amd64 * Fixed line ending on pkg-descr PR: ports/185642 Submitted by: maintainer (Pavel Volkov) Fixed by: marino@ --- emulators/dynamips-community/Makefile | 75 ++++++++++++---------- emulators/dynamips-community/distinfo | 4 +- .../files/patch-common-gen_eth.c | 26 -------- .../dynamips-community/files/patch-nvram_export.1 | 11 ---- .../dynamips-community/files/patch-stable-Makefile | 20 ------ .../files/patch-unstable-Makefile | 20 ------ emulators/dynamips-community/pkg-descr | 2 +- 7 files changed, 43 insertions(+), 115 deletions(-) delete mode 100644 emulators/dynamips-community/files/patch-common-gen_eth.c delete mode 100644 emulators/dynamips-community/files/patch-nvram_export.1 delete mode 100644 emulators/dynamips-community/files/patch-stable-Makefile delete mode 100644 emulators/dynamips-community/files/patch-unstable-Makefile (limited to 'emulators') diff --git a/emulators/dynamips-community/Makefile b/emulators/dynamips-community/Makefile index 7e8ffb5b3570..e1f45b66cdee 100644 --- a/emulators/dynamips-community/Makefile +++ b/emulators/dynamips-community/Makefile @@ -2,44 +2,42 @@ # $FreeBSD$ 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@googlemail.com +MAINTAINER= pavelivolkov@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= libelf.so:${PORTSDIR}/devel/libelf \ + libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid + CONFLICTS= dynamips-[0-9]* dynamips-devel-[0-9]* -USE_GMAKE= yes +USES= gmake +USE_ZIP= yes MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= UNSTABLE +OPTIONS_DEFINE= DOCS UNSTABLE UNSTABLE_DESC= development code (x64 Mac) LDFLAGS+= -luuid -MAKE_ENV= \ - DYNAMIPS_CODE=${DYNAMIPS_CODE} \ +MAKE_ENV= DYNAMIPS_CODE=${DYNAMIPS_CODE} \ DYNAMIPS_ARCH=${DYNAMIPS_ARCH} \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} -NO_STAGE= yes .include -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 +45,39 @@ DYNAMIPS_CODE= "unstable" DYNAMIPS_CODE= "stable" .endif +DYNAMIPS_ARCH= "nojit" + .if ${ARCH} == "i386" DYNAMIPS_ARCH= "x86" -.elif ${ARCH} == "amd64" +.elif ${ARCH} == "amd64" || ${ARCH} == "x86_64" 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 ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 DYNAMIPS_ARCH= "nojit" .endif +#BROKEN_ia64= does not compile: invokes i386 assembler +#BROKEN_sparc64= ${BROKEN_ia64} +#BROKEN_powerpc= ${BROKEN_ia64} + +.include + 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 +.include diff --git a/emulators/dynamips-community/distinfo b/emulators/dynamips-community/distinfo index 1e67e2411012..74f023cb113e 100644 --- a/emulators/dynamips-community/distinfo +++ b/emulators/dynamips-community/distinfo @@ -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 --git a/emulators/dynamips-community/files/patch-common-gen_eth.c b/emulators/dynamips-community/files/patch-common-gen_eth.c deleted file mode 100644 index 3fc3c07cb95b..000000000000 --- a/emulators/dynamips-community/files/patch-common-gen_eth.c +++ /dev/null @@ -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 - #include - #include -+#include - #include - #include - #include -@@ -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 --git a/emulators/dynamips-community/files/patch-nvram_export.1 b/emulators/dynamips-community/files/patch-nvram_export.1 deleted file mode 100644 index 477b8b7e65d1..000000000000 --- a/emulators/dynamips-community/files/patch-nvram_export.1 +++ /dev/null @@ -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 --git a/emulators/dynamips-community/files/patch-stable-Makefile b/emulators/dynamips-community/files/patch-stable-Makefile deleted file mode 100644 index d754b5338c29..000000000000 --- a/emulators/dynamips-community/files/patch-stable-Makefile +++ /dev/null @@ -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 --git a/emulators/dynamips-community/files/patch-unstable-Makefile b/emulators/dynamips-community/files/patch-unstable-Makefile deleted file mode 100644 index 20c3ec579022..000000000000 --- a/emulators/dynamips-community/files/patch-unstable-Makefile +++ /dev/null @@ -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 --git a/emulators/dynamips-community/pkg-descr b/emulators/dynamips-community/pkg-descr index f9de38bfc193..e06c57531bc5 100644 --- a/emulators/dynamips-community/pkg-descr +++ b/emulators/dynamips-community/pkg-descr @@ -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/ -- cgit v1.2.3