View | Details | Raw Unified | Return to bug 190875
Collapse All | Expand All

(-)./Makefile (-2 / +5 lines)
Lines 2-10 Link Here
2 
# $FreeBSD: head/emulators/dynamips-community/Makefile 348114 2014-03-13 18:36:36Z pawel $
 2 
# $FreeBSD: head/emulators/dynamips-community/Makefile 348114 2014-03-13 18:36:36Z pawel $
3 

          3
          

        

        

          4
          
PORTNAME=	dynamips

          4
          
PORTNAME=	dynamips

        

          
            

              5
              
PORTVERSION=	0.2.11


              5
              
PORTVERSION=	0.2.12

            

        

          6
          
CATEGORIES=	emulators

          6
          
CATEGORIES=	emulators

        

          
            

              7
              
MASTER_SITES=	SF/gns-3/Dynamips/${PORTVERSION}


              7
              
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}

            

            

              
              

              8
              
MASTER_SITE_SUBDIR=	gns-3/Dynamips/${PORTVERSION}

            

        

          8
          
PKGNAMESUFFIX=	-community

          9
          
PKGNAMESUFFIX=	-community

        

        

          9
          
DISTNAME=	${PORTNAME}-${PORTVERSION}-source

          10
          
DISTNAME=	${PORTNAME}-${PORTVERSION}-source

        

        

          10
          

          11
          

        

  

    
      
            Lines 24-29
          
      
      
        Link Here
      
    
  

        

          24
          
OPTIONS_DEFINE=	DOCS UNSTABLE

          25
          
OPTIONS_DEFINE=	DOCS UNSTABLE

        

        

          25
          
UNSTABLE_DESC=	development code (x64 Mac)

          26
          
UNSTABLE_DESC=	development code (x64 Mac)

        

        

          26
          

          27
          

        

            

              
              
              28
              
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

            

            

              29
              

            

        

          27
          
LDFLAGS+=	-luuid

          30
          
LDFLAGS+=	-luuid

        

        

          28
          
MAKE_ENV=	DYNAMIPS_CODE=${DYNAMIPS_CODE} \

          31
          
MAKE_ENV=	DYNAMIPS_CODE=${DYNAMIPS_CODE} \

        

        

          29
          
		DYNAMIPS_ARCH=${DYNAMIPS_ARCH} \

          32
          
		DYNAMIPS_ARCH=${DYNAMIPS_ARCH} \

        



(-)./distinfo
      (-2 / +2 lines)




  

    
      
            Lines 1-2
          
      
      
        Link Here
      
    
  

          
            

              1
              
SHA256 (dynamips-0.2.11-source.zip) = 4278baecf1f6718433722e6f38179a69ec9b2ef02381b31c5d3ef5b8f8f3e94a


              1
              
SHA256 (dynamips-0.2.12-source.zip) = b8a60c2ff577ec3a5c2b892bce654a68cc072c79fbca2b708d36d42bd3e9eb12

            

            

              2
              
SIZE (dynamips-0.2.11-source.zip) = 967525


              2
              
SIZE (dynamips-0.2.12-source.zip) = 995877

            



(-)./files/patch-Makefile
      (+22 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- Makefile.orig	2014-06-10 12:49:13.000000000 +0400

            

            

              2
              
+++ Makefile	2014-06-10 14:46:24.000000000 +0400

            

            

              3
              
@@ -4,13 +4,13 @@

            

            

              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
              
+ifeq ($(DYNAMIPS_ARCH),)

            

            

              10
              
+ifneq ($(findstring $(shell uname -m),x86_64 amd64),)

            

            

              11
              
+export DYNAMIPS_ARCH=amd64

            

            

              12
              
+else ifneq ($(findstring $(shell uname -m),i686 i386),)

            

            

              13
              
+export DYNAMIPS_ARCH=x86

            

            

              14
              
 else

            

            

              15
              
-ifeq ($(shell arch),i686)

            

            

              16
              
-export DYNAMIPS_ARCH?=x86

            

            

              17
              
-else

            

            

              18
              
-export DYNAMIPS_ARCH?=nojit

            

            

              19
              
+export DYNAMIPS_ARCH=nojit

            

            

              20
              
 endif

            

            

              21
              
 endif

            

            

              22
              
 

            



(-)./files/patch-common-fs_nvram.c
      (+9 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- common/fs_nvram.c.orig	2014-06-10 14:53:14.000000000 +0400

            

            

              2
              
+++ common/fs_nvram.c	2014-06-10 14:53:10.000000000 +0400

            

            

              3
              
@@ -862,4 +862,4 @@

            

            

              4
              
    }

            

            

              5
              
 

            

            

              6
              
    return(0);

            

            

              7
              
-}

            

            

              8
              
\ No newline at end of file

            

            

              9
              
+}

            



(-)./files/patch-stable-Makefile
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- stable/Makefile.orig	2014-06-10 16:09:42.000000000 +0400

            

            

              2
              
+++ stable/Makefile	2014-06-10 16:22:06.000000000 +0400

            

            

              3
              
@@ -244,7 +244,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) $(LIBS) -o $@ nvram_export.o fs_nvram.o

            

            

              9
              
 

            

            

              10
              
 .PHONY: clean

            

            

              11
              
 clean:

            



(-)./files/patch-unstable-Makefile
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- unstable/Makefile.orig	2014-06-10 16:24:10.000000000 +0400

            

            

              2
              
+++ unstable/Makefile	2014-06-10 16:24:15.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) $(LIBS) -o $@ nvram_export.o fs_nvram.o

            

            

              9
              
 

            

            

              10
              
 .PHONY: clean

            

            

              11
              
 clean:

            






  

  Return to bug 190875