Attachment #159242 for bug #194066




# $FreeBSD: head/emulators/dynamips-community/Makefile 382185 2015-03-24 22:17:41Z marino $

PORTNAME=	dynamips
PORTVERSION=	0.2.15
DISTVERSIONPREFIX=	v
CATEGORIES=	emulators
MASTER_SITES=	SF/gns-3/Dynamips/${PORTVERSION}
PKGNAMESUFFIX=	-community
DISTNAME=	${PORTNAME}-${PORTVERSION}-source

MAINTAINER=	pavelivolkov@gmail.com
COMMENT=	Cisco 1700/2600/3600/3700/7200 Simulator


CONFLICTS=	dynamips-[0-9]* dynamips-devel-[0-9]*

USES=		cmake
USE_GITHUB=	yes

MAKE_JOBS_UNSAFE=	yes
UNSTABLE_DESC=	development code (x64 Mac)

GH_ACCOUNT=	GNS3
GH_PROJECT=	dynamips

LDFLAGS+=	-luuid
MAKE_ENV=	DYNAMIPS_CODE=${DYNAMIPS_CODE} \
		DYNAMIPS_ARCH=${DYNAMIPS_ARCH}



PORTDOCS=	*

.if ${PORT_OPTIONS:MUNSTABLE}
DYNAMIPS_CODE=	unstable
.else
DYNAMIPS_CODE=	stable
.endif

.if ${ARCH} == powerpc && ${DYNAMIPS_CODE} == unstable
DYNAMIPS_ARCH=	ppc32
.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}

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/${DYNAMIPS_CODE}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
	${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

Lines 1-2 Link Here

(-)/usr/home/pi/myp/emulators/dynamips-community/distinfo (-2 / +2 lines)
1	SHA256 (dynamips-0.2.12-source.zip) = b8a60c2ff577ec3a5c2b892bce654a68cc072c79fbca2b708d36d42bd3e9eb12	1	SHA256 (GNS3-dynamips-v0.2.15_GH0.tar.gz) = 4f77a88470069dccab391ce786b633061511593efbd0a9b895e5711325eceb36
2	SIZE (dynamips-0.2.12-source.zip) = 995877	2	SIZE (GNS3-dynamips-v0.2.15_GH0.tar.gz) = 839493




--- 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

Lines 1-9 Link Here

(-)/usr/home/pi/myp/emulators/dynamips-community/files/patch-common_fs_nvram.c (-9 lines)
1	--- common/fs_nvram.c.orig 2014-03-03 12:41:30.000000000 +0400
2	+++ common/fs_nvram.c 2014-03-03 12:41:46.000000000 +0400
3	@@ -862,4 +862,4 @@
4	}
5
6	return(0);
7	-}
8	\ No newline at end of file
9	+}




--- 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:

Lines 1-11 Link Here

(-)/usr/home/pi/myp/emulators/dynamips-community/files/patch-unstable_Makefile (-11 lines)
1	--- unstable/Makefile.orig 2014-03-03 12:37:26.000000000 +0400
2	+++ unstable/Makefile 2014-03-03 12:37:56.000000000 +0400
3	@@ -249,7 +249,7 @@
4
5	nvram_export$(BIN_EXT): nvram_export.o fs_nvram.o
6	@echo "Linking $@"
7	- @$(CC) -Wall $(CFLAGS) $(INCLUDE) $(LDFLAGS) -o $@ nvram_export.o fs_nvram.o
8	+ @$(CC) -Wall $(CFLAGS) $(INCLUDE) $(LDFLAGS) -o $@ nvram_export.o fs_nvram.o $(LIBS)
9
10	.PHONY: clean
11	clean:

Lines 1-3 Link Here

(-)/usr/home/pi/myp/emulators/dynamips-community/pkg-descr (-1 / +1 lines)
1	Cisco 1700/2600/3600/3700/7200 simulator.	1	Cisco 1700/2600/3600/3700/7200 simulator.
2		2
3	WWW: http://www.gns3.net/dynamips/	3	WWW: https://github.com/GNS3/dynamips

Return to bug 194066

Lines 2-12 Link Here

(-)/usr/home/pi/myp/emulators/dynamips-community/Makefile (-22 / +12 lines)
2	# $FreeBSD: head/emulators/dynamips-community/Makefile 382185 2015-03-24 22:17:41Z marino $	2	# $FreeBSD: head/emulators/dynamips-community/Makefile 382185 2015-03-24 22:17:41Z marino $
3		3
4	PORTNAME= dynamips	4	PORTNAME= dynamips
5	PORTVERSION= 0.2.12	5	PORTVERSION= 0.2.15
		6	DISTVERSIONPREFIX= v
6	CATEGORIES= emulators	7	CATEGORIES= emulators
7	MASTER_SITES= SF/gns-3/Dynamips/${PORTVERSION}
8	PKGNAMESUFFIX= -community	8	PKGNAMESUFFIX= -community
9	DISTNAME= ${PORTNAME}-${PORTVERSION}-source
10		9
11	MAINTAINER= pavelivolkov@gmail.com	10	MAINTAINER= pavelivolkov@gmail.com
12	COMMENT= Cisco 1700/2600/3600/3700/7200 Simulator	11	COMMENT= Cisco 1700/2600/3600/3700/7200 Simulator
Lines 18-32 Link Here
18		17
19	CONFLICTS= dynamips-[0-9]* dynamips-devel-[0-9]*	18	CONFLICTS= dynamips-[0-9]* dynamips-devel-[0-9]*
20		19
21	USES= gmake zip	20	USES= cmake
22	MAKE_JOBS_UNSAFE= yes	21	USE_GITHUB= yes
23		22
24	OPTIONS_DEFINE= DOCS UNSTABLE	23	MAKE_JOBS_UNSAFE= yes
25	UNSTABLE_DESC= development code (x64 Mac)
26		24
27	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	25	GH_ACCOUNT= GNS3
		26	GH_PROJECT= dynamips
28		27
29	LDFLAGS+= -luuid
30	MAKE_ENV= DYNAMIPS_CODE=${DYNAMIPS_CODE} \	28	MAKE_ENV= DYNAMIPS_CODE=${DYNAMIPS_CODE} \
31	DYNAMIPS_ARCH=${DYNAMIPS_ARCH}	29	DYNAMIPS_ARCH=${DYNAMIPS_ARCH}
32		30
Lines 38-64 Link Here
38		36
39	PORTDOCS= *	37	PORTDOCS= *
40		38
41	.if ${PORT_OPTIONS:MUNSTABLE}
42	DYNAMIPS_CODE= unstable
43	.else
44	DYNAMIPS_CODE= stable	39	DYNAMIPS_CODE= stable
45	.endif
46
47	.if ${ARCH} == powerpc && ${DYNAMIPS_CODE} == unstable
48	DYNAMIPS_ARCH= ppc32
49	.endif
50		40
51	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000	41	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
52	DYNAMIPS_ARCH= nojit	42	DYNAMIPS_ARCH= nojit
53	.endif	43	.endif
54		44
55	#BROKEN_ia64= does not compile: invokes i386 assembler	45	BROKEN_ia64= does not compile: invokes i386 assembler
56	#BROKEN_sparc64= ${BROKEN_ia64}	46	BROKEN_sparc64= ${BROKEN_ia64}
57	#BROKEN_powerpc= ${BROKEN_ia64}	47	BROKEN_powerpc= ${BROKEN_ia64}
58		48
59	do-install:	49	do-install:
60	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.${DYNAMIPS_CODE} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	50	${INSTALL_PROGRAM} ${WRKSRC}/${DYNAMIPS_CODE}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
61	${INSTALL_PROGRAM} ${WRKSRC}/nvram_export.${DYNAMIPS_CODE} ${STAGEDIR}${PREFIX}/bin/nvram_export	51	${INSTALL_PROGRAM} ${WRKSRC}/${DYNAMIPS_CODE}/nvram_export ${STAGEDIR}${PREFIX}/bin
62	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1	52	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
63	${INSTALL_MAN} ${WRKSRC}/man/nvram_export.1 ${STAGEDIR}${MANPREFIX}/man/man1	53	${INSTALL_MAN} ${WRKSRC}/man/nvram_export.1 ${STAGEDIR}${MANPREFIX}/man/man1
64	${INSTALL_MAN} ${WRKSRC}/man/hypervisor_mode.7 ${STAGEDIR}${MANPREFIX}/man/man7	54	${INSTALL_MAN} ${WRKSRC}/man/hypervisor_mode.7 ${STAGEDIR}${MANPREFIX}/man/man7

Lines 1-24 Link Here

(-)/usr/home/pi/myp/emulators/dynamips-community/files/patch-Makefile (-24 lines)
1	--- Makefile.orig 2014-02-10 17:50:38.000000000 +0400
2	+++ Makefile 2014-03-03 12:12:12.000000000 +0400
3	@@ -4,14 +4,15 @@
4	# - Use "x86" for a build on x86 (32-bits)
5	# - Use "amd64" for a build on x86_64 (64-bits)
6	# - Use "nojit" for unsupported architectures.
7	-ifeq ($(shell arch),x86_64)
8	-export DYNAMIPS_ARCH?=amd64
9	+ifndef DYNAMIPS_ARCH
10	+ifneq ($(findstring $(shell uname -m),x86_64 amd64),)
11	+DYNAMIPS_ARCH=amd64
12	+else ifneq ($(findstring $(shell uname -m),i686 i386),)
13	+DYNAMIPS_ARCH=x86
14	else
15	-ifeq ($(shell arch),i686)
16	-export DYNAMIPS_ARCH?=x86
17	-else
18	-export DYNAMIPS_ARCH?=nojit
19	+DYNAMIPS_ARCH=nojit
20	endif
21	+export DYNAMIPS_ARCH
22	endif
23
24	# For MAC x64 you can compile the "unstable" version, which should work

Lines 1-20 Link Here

(-)/usr/home/pi/myp/emulators/dynamips-community/files/patch-stable_Makefile (-20 lines)
1	--- stable/Makefile.orig 2014-02-10 17:50:38.000000000 +0400
2	+++ stable/Makefile 2014-03-03 12:35:51.000000000 +0400
3	@@ -2,6 +2,8 @@
4	# Copyright (c) 2005-2006 Christophe Fillot.
5	# Copyright (c) 2013 Daniel Lintott.
6
7	+$(warning stable DYNAMIPS_ARCH="${DYNAMIPS_ARCH}")
8	+
9	# Get include files from the current directory and from the common directory
10	INCLUDE+=-I. -I../common
11
12	@@ -244,7 +246,7 @@
13
14	nvram_export$(BIN_EXT): nvram_export.o fs_nvram.o
15	@echo "Linking $@"
16	- @$(CC) -Wall $(CFLAGS) $(INCLUDE) $(LDFLAGS) -o $@ nvram_export.o fs_nvram.o
17	+ @$(CC) -Wall $(CFLAGS) $(INCLUDE) $(LDFLAGS) -o $@ nvram_export.o fs_nvram.o $(LIBS)
18
19	.PHONY: clean
20	clean: