===> Generating patch ===> Viewing diff with /usr/local/bin/cdiff diff -ruN ../dynamips-community.orig/Makefile ./Makefile --- ../dynamips-community.orig/Makefile 2014-05-20 14:58:56.000000000 +0400 +++ ./Makefile 2014-06-10 17:09:09.000000000 +0400 @@ -2,9 +2,10 @@ # $FreeBSD: head/emulators/dynamips-community/Makefile 348114 2014-03-13 18:36:36Z pawel $ PORTNAME= dynamips -PORTVERSION= 0.2.11 +PORTVERSION= 0.2.12 CATEGORIES= emulators -MASTER_SITES= SF/gns-3/Dynamips/${PORTVERSION} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= gns-3/Dynamips/${PORTVERSION} PKGNAMESUFFIX= -community DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -24,6 +25,8 @@ OPTIONS_DEFINE= DOCS UNSTABLE UNSTABLE_DESC= development code (x64 Mac) +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + LDFLAGS+= -luuid MAKE_ENV= DYNAMIPS_CODE=${DYNAMIPS_CODE} \ DYNAMIPS_ARCH=${DYNAMIPS_ARCH} \ diff -ruN ../dynamips-community.orig/distinfo ./distinfo --- ../dynamips-community.orig/distinfo 2014-05-20 14:58:56.000000000 +0400 +++ ./distinfo 2014-06-10 12:48:27.000000000 +0400 @@ -1,2 +1,2 @@ -SHA256 (dynamips-0.2.11-source.zip) = 4278baecf1f6718433722e6f38179a69ec9b2ef02381b31c5d3ef5b8f8f3e94a -SIZE (dynamips-0.2.11-source.zip) = 967525 +SHA256 (dynamips-0.2.12-source.zip) = b8a60c2ff577ec3a5c2b892bce654a68cc072c79fbca2b708d36d42bd3e9eb12 +SIZE (dynamips-0.2.12-source.zip) = 995877 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-06-10 14:47:50.000000000 +0400 @@ -0,0 +1,22 @@ +--- Makefile.orig 2014-06-10 12:49:13.000000000 +0400 ++++ Makefile 2014-06-10 14:46:24.000000000 +0400 +@@ -4,13 +4,13 @@ + # - 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 ++ifeq ($(DYNAMIPS_ARCH),) ++ifneq ($(findstring $(shell uname -m),x86_64 amd64),) ++export DYNAMIPS_ARCH=amd64 ++else ifneq ($(findstring $(shell uname -m),i686 i386),) ++export DYNAMIPS_ARCH=x86 + else +-ifeq ($(shell arch),i686) +-export DYNAMIPS_ARCH?=x86 +-else +-export DYNAMIPS_ARCH?=nojit ++export DYNAMIPS_ARCH=nojit + endif + endif + 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-06-10 14:54:16.000000000 +0400 @@ -0,0 +1,9 @@ +--- common/fs_nvram.c.orig 2014-06-10 14:53:14.000000000 +0400 ++++ common/fs_nvram.c 2014-06-10 14:53:10.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-06-10 16:23:08.000000000 +0400 @@ -0,0 +1,11 @@ +--- stable/Makefile.orig 2014-06-10 16:09:42.000000000 +0400 ++++ stable/Makefile 2014-06-10 16:22:06.000000000 +0400 +@@ -244,7 +244,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) $(LIBS) -o $@ nvram_export.o fs_nvram.o + + .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-06-10 16:25:02.000000000 +0400 @@ -0,0 +1,11 @@ +--- unstable/Makefile.orig 2014-06-10 16:24:10.000000000 +0400 ++++ unstable/Makefile 2014-06-10 16:24:15.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) $(LIBS) -o $@ nvram_export.o fs_nvram.o + + .PHONY: clean + clean: ====> Cleaning up ===> Done