Attachment 122755 Details for Bug 166017 – file.diff

[patch] file.diff

file.diff (text/plain), 12.81 KB, created by tkato432 on 2012-03-13 18:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-03-13 18:10:02 UTC

Size: 12.81 KB

patch

obsolete

>diff -urN /usr/ports/cad/chipmunk/Makefile cad/chipmunk/Makefile
>--- /usr/ports/cad/chipmunk/Makefile	2012-01-09 18:17:41.000000000 +0900
>+++ cad/chipmunk/Makefile	2012-03-03 04:10:09.000000000 +0900
>@@ -6,31 +6,32 @@
> #
> 
> PORTNAME=	chipmunk
>-PORTVERSION=	5.64
>-PORTREVISION=	3
>+PORTVERSION=	5.65
> CATEGORIES=	cad
> MASTER_SITES=	http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/
>-DISTFILES=	psys-1.59.tar.gz log-5.64.tar.gz netcmp-1.13.tar.gz \
>-		mosis-1.14.tar.gz wol-1.14.tar.gz wolcomp-1.14.tar.gz \
>-		until-1.14.tar.gz util-1.11.tar.gz view-1.14.tar.gz \
>+DISTFILES=	psys-1.60.tar.gz log-5.65.tar.gz netcmp-1.14.tar.gz \
>+		mosis-1.15.tar.gz wol-1.15.tar.gz wolcomp-1.15.tar.gz \
>+		until-1.15.tar.gz util-1.12.tar.gz view-1.15.tar.gz \
> 		Makefile
> DIST_SUBDIR=	chipmunk
>-EXTRACT_ONLY=	psys-1.59.tar.gz log-5.64.tar.gz netcmp-1.13.tar.gz \
>-		mosis-1.14.tar.gz wol-1.14.tar.gz wolcomp-1.14.tar.gz \
>-		until-1.14.tar.gz util-1.11.tar.gz view-1.14.tar.gz
>+EXTRACT_ONLY=	psys-1.60.tar.gz log-5.65.tar.gz netcmp-1.14.tar.gz \
>+		mosis-1.15.tar.gz wol-1.15.tar.gz wolcomp-1.15.tar.gz \
>+		until-1.15.tar.gz util-1.12.tar.gz view-1.15.tar.gz
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	An electronic CAD system
> 
>+LICENSE=	GPLv2
>+
> NO_WRKSUBDIR=	yes
>+
> USE_XORG=	x11
> USE_GMAKE=	yes
>+MAKE_JOBS_SAFE=	yes
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${ARCH} == "alpha"
>-BROKEN=		Broken pkg-plist on alpha
>-.elif ${ARCH} == "sparc64"
>+.if ${ARCH} == "sparc64"
> BROKEN=		Fails to install
> .endif
> 
>diff -urN /usr/ports/cad/chipmunk/distinfo cad/chipmunk/distinfo
>--- /usr/ports/cad/chipmunk/distinfo	2011-03-21 01:56:11.000000000 +0900
>+++ cad/chipmunk/distinfo	2011-11-26 22:30:38.000000000 +0900
>@@ -1,20 +1,20 @@
>-SHA256 (chipmunk/psys-1.59.tar.gz) = a3cb661833fec226847e5a423b13b2ce827482b684d59af84f754ab459fe29f8
>-SIZE (chipmunk/psys-1.59.tar.gz) = 203006
>-SHA256 (chipmunk/log-5.64.tar.gz) = 527d938c6b79ecce915a6ae4c0f051b01a6f8f9afff5b50f04fb32dbe95db8c8
>-SIZE (chipmunk/log-5.64.tar.gz) = 1632345
>-SHA256 (chipmunk/netcmp-1.13.tar.gz) = a85b8fb424f4f7b17d396d0ef86590d3d42e40fe130fc3e4a521cc50ff3841c8
>-SIZE (chipmunk/netcmp-1.13.tar.gz) = 137728
>-SHA256 (chipmunk/mosis-1.14.tar.gz) = 2ae4cf8f00a09c0b83f34a767a83c10d4541a24941e341498b51bac5d7179d33
>-SIZE (chipmunk/mosis-1.14.tar.gz) = 40775
>-SHA256 (chipmunk/wol-1.14.tar.gz) = f0bb0cac49c1050ba07ea69ef922bf3d16e2841622de45276ec8dc3ff3063aea
>-SIZE (chipmunk/wol-1.14.tar.gz) = 324674
>-SHA256 (chipmunk/wolcomp-1.14.tar.gz) = 63b9ea8d180d2883122c98b8d3b7c5a3800625cc5a505f18070ec62b71f20579
>-SIZE (chipmunk/wolcomp-1.14.tar.gz) = 22224
>-SHA256 (chipmunk/until-1.14.tar.gz) = 9c8a9121b8377b4b141c18df0bfe3272611a4d1f177f0bc00b8815b5305434db
>-SIZE (chipmunk/until-1.14.tar.gz) = 141467
>-SHA256 (chipmunk/util-1.11.tar.gz) = 9c1bed4d7b400c68990bd5ad31ccedc810dd0b52d53e1703987a81201f2c51ce
>-SIZE (chipmunk/util-1.11.tar.gz) = 74075
>-SHA256 (chipmunk/view-1.14.tar.gz) = 675bf492dc4cad185200dd0f2cec851af579a774d501ff248e28cffd8af342c3
>-SIZE (chipmunk/view-1.14.tar.gz) = 359473
>+SHA256 (chipmunk/psys-1.60.tar.gz) = d910601b14645bb2118e99cda0e80f577067d073cf0053a2857ab0b8d78d823f
>+SIZE (chipmunk/psys-1.60.tar.gz) = 203732
>+SHA256 (chipmunk/log-5.65.tar.gz) = 01d432d211f3d2542bc2d645373a28255cfa2d4a69ad7f8b78cea0be97f59c7b
>+SIZE (chipmunk/log-5.65.tar.gz) = 1629755
>+SHA256 (chipmunk/netcmp-1.14.tar.gz) = d71b74cce8ec5ce90ed34778a9b3c33cbb887cd0862feddeddfb7458a8972a6a
>+SIZE (chipmunk/netcmp-1.14.tar.gz) = 137525
>+SHA256 (chipmunk/mosis-1.15.tar.gz) = 56abe3b8fe22cf1ef70047f2ea345e96110b9b4cd0786cf1414c33b3b23dabd6
>+SIZE (chipmunk/mosis-1.15.tar.gz) = 41016
>+SHA256 (chipmunk/wol-1.15.tar.gz) = ae9bb0884904564279fffabd72a062100eafbcfe5db0e326ed4605109874a2ea
>+SIZE (chipmunk/wol-1.15.tar.gz) = 324640
>+SHA256 (chipmunk/wolcomp-1.15.tar.gz) = d5cf71985f6d872165b212ab2bad65dc9f46e5294f8a6099781b3dd55850ea9c
>+SIZE (chipmunk/wolcomp-1.15.tar.gz) = 22083
>+SHA256 (chipmunk/until-1.15.tar.gz) = 9135da9b8819a9705d317d0b59bc9aee68df698fc660e186f95233322d551a8b
>+SIZE (chipmunk/until-1.15.tar.gz) = 141703
>+SHA256 (chipmunk/util-1.12.tar.gz) = 6a817b95830c262d931c631c430a5ab502f2e514e024ef19a866390e0e776bed
>+SIZE (chipmunk/util-1.12.tar.gz) = 71168
>+SHA256 (chipmunk/view-1.15.tar.gz) = bd7e8cb00c35911f9aa78529fd2d1b7b3061263e656ebedf7cb039a412378b97
>+SIZE (chipmunk/view-1.15.tar.gz) = 359627
> SHA256 (chipmunk/Makefile) = b47c1de0584ce6d05b279735195f7db16a18644dbc784d03a132a0df1026cf1c
> SIZE (chipmunk/Makefile) = 1942
>diff -urN /usr/ports/cad/chipmunk/files/patch-ae cad/chipmunk/files/patch-ae
>--- /usr/ports/cad/chipmunk/files/patch-ae	2008-04-20 10:10:53.000000000 +0900
>+++ cad/chipmunk/files/patch-ae	2011-11-26 22:33:22.000000000 +0900
>@@ -1,15 +1,15 @@
>---- log/src/ana/Makefile.orig	Sat May 18 12:02:28 2002
>-+++ log/src/ana/Makefile	Sat May 18 12:46:53 2002
>-@@ -25,7 +25,7 @@
>+--- log/src/ana/Makefile.orig	2011-10-21 07:26:01.000000000 +0900
>++++ log/src/ana/Makefile	2011-11-26 22:33:01.000000000 +0900
>+@@ -45,7 +45,7 @@
>+ ## For most versions of UNIX, one of the above directories
>+ ## will be the correct one to use on the line below:
>  
>- 
>- LOCINC = ../../../psys/include
> -XINCLUDEDIR = .
> +XINCLUDEDIR = ${LOCALBASE}/include
>  
>  ##
>  ##  (1) Choosing your compiler
>-@@ -46,7 +46,7 @@
>+@@ -66,7 +66,7 @@
>  CHIPMUNKCC = gcc -O3
>  
>  
>@@ -17,8 +17,8 @@
> +CC ?= $(CHIPMUNKCC) 
>  
>  ##
>- ## (2) Adding appropriate flags
>-@@ -84,7 +84,7 @@
>+ ## (4) Adding appropriate flags
>+@@ -108,7 +108,7 @@
>  
>  CHIPMUNKFLAGS = 
>  
>diff -urN /usr/ports/cad/chipmunk/files/patch-af cad/chipmunk/files/patch-af
>--- /usr/ports/cad/chipmunk/files/patch-af	2008-04-20 10:10:53.000000000 +0900
>+++ cad/chipmunk/files/patch-af	2012-02-22 16:52:05.000000000 +0900
>@@ -1,5 +1,5 @@
>---- mosis/Makefile.orig	Tue Nov  4 22:19:13 2003
>-+++ mosis/Makefile	Tue Dec  9 17:44:45 2003
>+--- mosis/Makefile.orig	2011-09-08 03:38:27.000000000 +0900
>++++ mosis/Makefile	2012-02-22 16:51:46.000000000 +0900
> @@ -23,6 +23,8 @@
>  #
>  #
>@@ -12,23 +12,23 @@
> @@ -47,7 +49,7 @@
>  ##
>  
>- 
>--CC = gcc
>-+CC ?= gcc
>+ CHIPMUNKCC = gcc -O3
>+-CC = $(CHIPMUNKCC)
>++CC ?= $(CHIPMUNKCC)
>  
>  ##
>- ## (2) If X isn't in the include path (the case for many MachTen and Linux 
>-@@ -62,7 +64,7 @@
>- ## or some other directory, depending on your installation. Use the
>- ## first one for OS X.
>+ ## If X isn't in the include path, change XINCLUDEDIR:
>+@@ -67,7 +69,7 @@
>+ ## For most versions of UNIX, one of the above directories
>+ ## will be the correct one to use on the line below:
>  
> -XINCLUDEDIR = .
> +XINCLUDEDIR = ${LOCALBASE}/include
>  
>- ##
>- ## If X isn't in the library path (the case for many MachTen and Linux 
>-@@ -77,7 +79,7 @@
>- ## depending on your installation. Use the second one for OS X.
>+ ## 
>+ ## If X isn't in the library path, change LIBX11 to reflect this:
>+@@ -92,7 +94,7 @@
>+ ## LIBX11= -lX11 -s
>  ##
>  
> -LIBX11 = -lX11
>@@ -36,7 +36,7 @@
>  
>  ##
>  ## (3) Adding appropriate flags
>-@@ -115,7 +117,7 @@
>+@@ -133,7 +135,7 @@
>  
>  CHIPMUNKFLAGS = 
>  
>@@ -45,7 +45,7 @@
>  
>  ##
>  ## (4) Library additions
>-@@ -123,7 +125,7 @@
>+@@ -141,7 +143,7 @@
>  ##
>  ## on some systems, -ldl must be added to the following line
>  
>@@ -54,8 +54,8 @@
>  
>  ##
>  ##
>-@@ -136,7 +138,7 @@
>- 	$(CC) -o mosis mosis.o  $(LDFLAGS)
>+@@ -154,7 +156,7 @@
>+ 	$(CC) $(CFLAGS) -o mosis mosis.o  $(LDFLAGS)
>  
>  install: mosis
> -	cp mosis ../bin/mosis
>diff -urN /usr/ports/cad/chipmunk/files/patch-ag cad/chipmunk/files/patch-ag
>--- /usr/ports/cad/chipmunk/files/patch-ag	2002-05-21 12:30:49.000000000 +0900
>+++ cad/chipmunk/files/patch-ag	2012-02-22 16:43:21.000000000 +0900
>@@ -1,5 +1,5 @@
>---- netcmp/Makefile.orig	Sat Aug 18 07:49:31 2001
>-+++ netcmp/Makefile	Sat May 18 14:46:26 2002
>+--- netcmp/Makefile.orig	2011-10-21 07:35:56.000000000 +0900
>++++ netcmp/Makefile	2012-02-22 16:42:56.000000000 +0900
> @@ -22,7 +22,7 @@
>  #
>  # netcmp makefile
>@@ -18,7 +18,7 @@
>  
>  ##
>  ## (2) Adding appropriate flags
>-@@ -90,15 +90,17 @@
>+@@ -77,15 +77,17 @@
>  ## -ansi
>  ##
>  
>@@ -30,8 +30,8 @@
> +CFLAGS += -DBSD -DF_OK
>  
>  netcmp:     main.o parser.o datastruct.o compare.o
>--	$(CC)  parser.o datastruct.o compare.o main.o -o netcmp
>-+	$(CC)  parser.o datastruct.o compare.o main.o $(OTHERLIBS) -o netcmp
>+-	$(CC) $(CFLAGS) parser.o datastruct.o compare.o main.o -o netcmp
>++	$(CC) $(CFLAGS) parser.o datastruct.o compare.o main.o $(OTHERLIBS) -o netcmp
>  
>  install:    netcmp
> -	cp netcmp $(BINDIR)  
>diff -urN /usr/ports/cad/chipmunk/files/patch-ah cad/chipmunk/files/patch-ah
>--- /usr/ports/cad/chipmunk/files/patch-ah	2008-04-20 10:10:53.000000000 +0900
>+++ cad/chipmunk/files/patch-ah	2011-11-26 22:41:04.000000000 +0900
>@@ -1,5 +1,5 @@
>---- psys/src/Makefile.orig	Sat Mar  2 06:39:14 2002
>-+++ psys/src/Makefile	Sat May 18 13:25:17 2002
>+--- psys/src/Makefile.orig	2011-10-21 07:23:19.000000000 +0900
>++++ psys/src/Makefile	2011-11-26 22:40:45.000000000 +0900
> @@ -30,8 +30,8 @@
>  ## to be made for different systems. Its a good idea to look over each
>  ## block and make necessary changes before doing a "make install"
>@@ -11,16 +11,16 @@
>  
>  
>  LIB = ../libp2c.a
>-@@ -51,7 +51,7 @@
>- ## or some other directory, depending on your installation.
>- ##
>+@@ -56,7 +56,7 @@
>+ ## For most versions of UNIX, one of the above directories
>+ ## will be the correct one to use on the line below:
>  
> -XINCLUDEDIR = . 
> +XINCLUDEDIR = ${LOCALBASE}/include
>  
>  ##
>  ##  (1) Choosing your compiler
>-@@ -101,7 +101,7 @@
>+@@ -105,7 +105,7 @@
>  LIBSTUFF = texstuff.ps untilstuff.ps plot.font
>  
>  
>@@ -29,19 +29,19 @@
>  
>  
>  ##
>-@@ -149,7 +149,7 @@
>+@@ -178,7 +178,7 @@
>  
>  CHIPMUNKFLAGS = 
>  
>--CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"`$(CD) $(LIBDIR); pwd`\"
>-+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"$(LIBDIR)\"
>+-CFLAGS = $(CHIPMUNKFLAGS) $(FONTS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"`$(CD) $(LIBDIR); pwd`\"
>++CFLAGS += -DBSD -DF_OK $(FONTS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"$(LIBDIR)\"
>  
>  P2CFLAGS = -DLOCAL_INIT=_local_p2c_init
>  
>-@@ -165,7 +165,7 @@
>- ## below; however the "-" allows this to be non-fatal and thus not essential
>+@@ -201,7 +201,7 @@
>  ## to delete
>  
>+ 
> -all: setup libp2c.a
> +all: libp2c.a
>  
>diff -urN /usr/ports/cad/chipmunk/files/patch-ak cad/chipmunk/files/patch-ak
>--- /usr/ports/cad/chipmunk/files/patch-ak	1999-09-24 14:11:57.000000000 +0900
>+++ cad/chipmunk/files/patch-ak	2011-11-26 22:45:34.000000000 +0900
>@@ -1,25 +1,24 @@
>---- util/Makefile.orig	Wed Mar 12 02:47:21 1997
>-+++ util/Makefile	Tue Sep 21 21:21:39 1999
>-@@ -10,15 +10,20 @@
>-  		boxify\
>-  		sctomat 
>+--- util/Makefile.orig	2011-10-21 07:40:05.000000000 +0900
>++++ util/Makefile	2011-11-26 22:45:05.000000000 +0900
>+@@ -6,14 +6,19 @@
>+ 
>+ PACKAGES = cleancif conscripts boxify spc-tools lgf-tools sctomat 
>  
> +all:
> +	for i in $(PACKAGES) ;\
>-+ 	    do (cd $$i ; echo "Making clean in $$i..."; \
>-+ 		$(MAKE) all); done
>++	    do (cd $$i ; echo "Making all in $$i..."; \
>++		$(MAKE) all); done
> +
>- clean:
>- 	for i in $(PACKAGES) ;\
>-  	    do (cd $$i ; echo "Making clean in $$i..."; \
>-- 		make  clean); done
>-+ 		$(MAKE) clean); done
>-  
>  install:
>  	for i in $(PACKAGES) ;\
>  	    do (cd $$i ; echo "Making install in $$i..."; \
> -		make install); done
> +		$(MAKE) install); done
>+ clean:
>+ 	for i in $(PACKAGES) ;\
>+ 	    do (cd $$i ; echo "Making clean in $$i..."; \
>+-		make clean); done
>++		$(MAKE) clean); done
>  
>  dist:
>  	rm -rf util
>diff -urN /usr/ports/cad/chipmunk/files/patch-au cad/chipmunk/files/patch-au
>--- /usr/ports/cad/chipmunk/files/patch-au	2008-04-20 10:10:53.000000000 +0900
>+++ cad/chipmunk/files/patch-au	2012-03-03 04:04:58.000000000 +0900
>@@ -1,16 +1,16 @@
>---- view/Makefile.orig	Sat May 18 12:02:28 2002
>-+++ view/Makefile	Sat May 18 12:59:50 2002
>-@@ -40,7 +40,7 @@
>- ## or some other directory, depending on your installation.
>- ##
>+--- view/Makefile.orig	2011-10-21 07:29:27.000000000 +0900
>++++ view/Makefile	2011-11-26 22:47:47.000000000 +0900
>+@@ -45,7 +45,7 @@
>+ ## For most versions of UNIX, one of the above directories
>+ ## will be the correct one to use on the line below:
>  
> -XINCLUDEDIR = .
> +XINCLUDEDIR = ${LOCALBASE}/include
>  
>- ##
>- ## If X isn't in the library path (the case for many MachTen and Linux 
>-@@ -55,7 +55,7 @@
>- ## depending on your installation. 
>+ 
>+ ## 
>+@@ -71,7 +71,7 @@
>+ ## LIBX11= -lX11 -s
>  ##
>  
> -LIBX11 = -lX11
>@@ -18,7 +18,7 @@
>  
>  LIBP2C = ../psys/src/libp2c.a
>  
>-@@ -67,7 +67,7 @@
>+@@ -83,7 +83,7 @@
>  ##
>  ## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS
>  
>@@ -27,7 +27,7 @@
>  
>  ##
>  ## (2) IEEE library directory
>-@@ -114,7 +114,7 @@
>+@@ -128,7 +128,7 @@
>  
>  CHIPMUNKCC = gcc -O3
>  
>@@ -36,10 +36,10 @@
>  
>  ##
>  ## (4) Adding appropriate flags
>-@@ -172,11 +172,11 @@
>+@@ -173,11 +173,11 @@
>  
>  CHIPMUNKFLAGS = 
>-   
>+ 
> -CFLAGS= $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
> +CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
>  
>@@ -50,7 +50,7 @@
>  
>  OBJS =			\
>  	viewfit.o	\
>-@@ -244,7 +244,7 @@
>+@@ -245,7 +245,7 @@
>  	(chdir mt;	make; chdir ..; chdir tek2430; make; chdir ..; make mtlink)
>  
>  install: view

Actions: View | Diff

Attachments on bug 166017: 122755