Date: Tue, 11 Mar 2014 15:38:19 +0400 (MSK) From: Pavel I Volkov <pavelivolkov@gmail.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/187447: [MAINTAINER] emulators/dynamips-community: update to 0.2.11 Message-ID: <201403111138.s2BBcJSe007047@be.dns4soho.net> Resent-Message-ID: <201403111430.s2BEU0bC091419@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187447
>Category: ports
>Synopsis: [MAINTAINER] emulators/dynamips-community: update to 0.2.11
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 11 14:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Pavel I Volkov
>Release: FreeBSD 9.2-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD be.dns4soho.net 9.2-RELEASE-p3 FreeBSD 9.2-RELEASE-p3 #4 r260656: Wed Jan 15 11:21:37 MSK
>Description:
- Update to 0.2.11
Generated with FreeBSD Port Tools 1.00.2014.03.03 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:
--- dynamips-community-0.2.11.patch begins here ---
diff -ruN ../dynamips-community.orig/Makefile ./Makefile
--- ../dynamips-community.orig/Makefile 2014-02-27 15:57:10.000000000 +0400
+++ ./Makefile 2014-03-08 05:12:31.000000000 +0400
@@ -1,8 +1,8 @@
# Created by: Pavel I Volkov <pavelivolkov@googlemail.com>
-# $FreeBSD: head/emulators/dynamips-community/Makefile 341048 2014-01-25 16:29:42Z marino $
+# $FreeBSD: head/emulators/dynamips-community/Makefile 347406 2014-03-07 16:55:01Z bapt $
PORTNAME= dynamips
-PORTVERSION= 0.2.10
+PORTVERSION= 0.2.11
CATEGORIES= emulators
MASTER_SITES= SF/gns-3/Dynamips/${PORTVERSION}
PKGNAMESUFFIX= -community
@@ -18,8 +18,7 @@
CONFLICTS= dynamips-[0-9]* dynamips-devel-[0-9]*
-USES= gmake
-USE_ZIP= yes
+USES= gmake zip
MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= DOCS UNSTABLE
@@ -40,23 +39,17 @@
PORTDOCS= *
.if ${PORT_OPTIONS:MUNSTABLE}
-DYNAMIPS_CODE= "unstable"
+DYNAMIPS_CODE= unstable
.else
-DYNAMIPS_CODE= "stable"
+DYNAMIPS_CODE= stable
.endif
-DYNAMIPS_ARCH= "nojit"
-
-.if ${ARCH} == "i386"
-DYNAMIPS_ARCH= "x86"
-.elif ${ARCH} == "amd64" || ${ARCH} == "x86_64"
-DYNAMIPS_ARCH= "amd64"
-.elif ${ARCH} == "powerpc" && ${DYNAMIPS_CODE} == "unstable"
-DYNAMIPS_ARCH= "ppc32"
+.if ${ARCH} == powerpc && ${DYNAMIPS_CODE} == unstable
+DYNAMIPS_ARCH= ppc32
.endif
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
-DYNAMIPS_ARCH= "nojit"
+DYNAMIPS_ARCH= nojit
.endif
#BROKEN_ia64= does not compile: invokes i386 assembler
@@ -67,7 +60,7 @@
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.${DYNAMIPS_CODE} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
- ${INSTALL_PROGRAM} ${WRKSRC}/${DYNAMIPS_CODE}/nvram_export ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/nvram_export.${DYNAMIPS_CODE} ${STAGEDIR}${PREFIX}/bin/nvram_export
${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
@@ -78,6 +71,8 @@
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.hypervisor ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/RELEASE-NOTES ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/MAINTAINERS ${STAGEDIR}${DOCSDIR}
.endif
.include <bsd.port.mk>
diff -ruN ../dynamips-community.orig/distinfo ./distinfo
--- ../dynamips-community.orig/distinfo 2014-02-27 15:57:10.000000000 +0400
+++ ./distinfo 2014-02-27 16:00:47.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (dynamips-0.2.10-source.zip) = d62f739547134aeb0ee5a6b28a52772ae79a93cb6426b712cbddc72cb0b7ba44
-SIZE (dynamips-0.2.10-source.zip) = 966018
+SHA256 (dynamips-0.2.11-source.zip) = 4278baecf1f6718433722e6f38179a69ec9b2ef02381b31c5d3ef5b8f8f3e94a
+SIZE (dynamips-0.2.11-source.zip) = 967525
diff -ruN ../dynamips-community.orig/files/patch-Makefile ./files/patch-Makefile
--- ../dynamips-community.orig/files/patch-Makefile 1970-01-01 03:00:00.000000000 +0300
+++ ./files/patch-Makefile 2014-03-03 12:14:21.000000000 +0400
@@ -0,0 +1,24 @@
+--- Makefile.orig 2014-02-10 17:50:38.000000000 +0400
++++ Makefile 2014-03-03 12:12:12.000000000 +0400
+@@ -4,14 +4,15 @@
+ # - Use "x86" for a build on x86 (32-bits)
+ # - Use "amd64" for a build on x86_64 (64-bits)
+ # - Use "nojit" for unsupported architectures.
+-ifeq ($(shell arch),x86_64)
+-export DYNAMIPS_ARCH?=amd64
++ifndef DYNAMIPS_ARCH
++ifneq ($(findstring $(shell uname -m),x86_64 amd64),)
++DYNAMIPS_ARCH=amd64
++else ifneq ($(findstring $(shell uname -m),i686 i386),)
++DYNAMIPS_ARCH=x86
+ else
+-ifeq ($(shell arch),i686)
+-export DYNAMIPS_ARCH?=x86
+-else
+-export DYNAMIPS_ARCH?=nojit
++DYNAMIPS_ARCH=nojit
+ endif
++export DYNAMIPS_ARCH
+ endif
+
+ # For MAC x64 you can compile the "unstable" version, which should work
diff -ruN ../dynamips-community.orig/files/patch-common_fs_nvram.c ./files/patch-common_fs_nvram.c
--- ../dynamips-community.orig/files/patch-common_fs_nvram.c 1970-01-01 03:00:00.000000000 +0300
+++ ./files/patch-common_fs_nvram.c 2014-03-03 12:43:53.000000000 +0400
@@ -0,0 +1,9 @@
+--- common/fs_nvram.c.orig 2014-03-03 12:41:30.000000000 +0400
++++ common/fs_nvram.c 2014-03-03 12:41:46.000000000 +0400
+@@ -862,4 +862,4 @@
+ }
+
+ return(0);
+-}
+\ No newline at end of file
++}
diff -ruN ../dynamips-community.orig/files/patch-stable_Makefile ./files/patch-stable_Makefile
--- ../dynamips-community.orig/files/patch-stable_Makefile 1970-01-01 03:00:00.000000000 +0300
+++ ./files/patch-stable_Makefile 2014-03-03 12:36:01.000000000 +0400
@@ -0,0 +1,20 @@
+--- stable/Makefile.orig 2014-02-10 17:50:38.000000000 +0400
++++ stable/Makefile 2014-03-03 12:35:51.000000000 +0400
+@@ -2,6 +2,8 @@
+ # Copyright (c) 2005-2006 Christophe Fillot.
+ # Copyright (c) 2013 Daniel Lintott.
+
++$(warning stable DYNAMIPS_ARCH="${DYNAMIPS_ARCH}")
++
+ # Get include files from the current directory and from the common directory
+ INCLUDE+=-I. -I../common
+
+@@ -244,7 +246,7 @@
+
+ nvram_export$(BIN_EXT): nvram_export.o fs_nvram.o
+ @echo "Linking $@"
+- @$(CC) -Wall $(CFLAGS) $(INCLUDE) $(LDFLAGS) -o $@ nvram_export.o fs_nvram.o
++ @$(CC) -Wall $(CFLAGS) $(INCLUDE) $(LDFLAGS) -o $@ nvram_export.o fs_nvram.o $(LIBS)
+
+ .PHONY: clean
+ clean:
diff -ruN ../dynamips-community.orig/files/patch-unstable_Makefile ./files/patch-unstable_Makefile
--- ../dynamips-community.orig/files/patch-unstable_Makefile 1970-01-01 03:00:00.000000000 +0300
+++ ./files/patch-unstable_Makefile 2014-03-03 12:38:23.000000000 +0400
@@ -0,0 +1,11 @@
+--- unstable/Makefile.orig 2014-03-03 12:37:26.000000000 +0400
++++ unstable/Makefile 2014-03-03 12:37:56.000000000 +0400
+@@ -249,7 +249,7 @@
+
+ nvram_export$(BIN_EXT): nvram_export.o fs_nvram.o
+ @echo "Linking $@"
+- @$(CC) -Wall $(CFLAGS) $(INCLUDE) $(LDFLAGS) -o $@ nvram_export.o fs_nvram.o
++ @$(CC) -Wall $(CFLAGS) $(INCLUDE) $(LDFLAGS) -o $@ nvram_export.o fs_nvram.o $(LIBS)
+
+ .PHONY: clean
+ clean:
--- dynamips-community-0.2.11.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403111138.s2BBcJSe007047>