Attachment #122755 for bug #166017

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




#

PORTNAME=	chipmunk
PORTVERSION=	5.65
PORTREVISION=	3
CATEGORIES=	cad
MASTER_SITES=	http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/
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.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} == "sparc64"
BROKEN=		Broken pkg-plist on alpha
.elif ${ARCH} == "sparc64"
BROKEN=		Fails to install
.endif





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




--- 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
@@ -66,7 +66,7 @@
 CHIPMUNKCC = gcc -O3
 
 

+CC ?= $(CHIPMUNKCC) 
 
 ##
 ## (4) Adding appropriate flags
@@ -108,7 +108,7 @@
 
 CHIPMUNKFLAGS = 
 




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

@@ -47,7 +49,7 @@
 ##
 
 CHIPMUNKCC = gcc -O3
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
 
 ##
 ## 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, change LIBX11 to reflect this:
@@ -92,7 +94,7 @@
 ## LIBX11= -lX11 -s
 ##
 
-LIBX11 = -lX11

 
 ##
 ## (3) Adding appropriate flags
@@ -133,7 +135,7 @@
 
 CHIPMUNKFLAGS = 
 

 
 ##
 ## (4) Library additions
@@ -141,7 +143,7 @@
 ##
 ## on some systems, -ldl must be added to the following line
 

 
 ##
 ##
@@ -154,7 +156,7 @@
 	$(CC) $(CFLAGS) -o mosis mosis.o  $(LDFLAGS)
 
 install: mosis
-	cp mosis ../bin/mosis




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

 
 ##
 ## (2) Adding appropriate flags
@@ -77,15 +77,17 @@
 ## -ansi
 ##
 

+CFLAGS += -DBSD -DF_OK
 
 netcmp:     main.o parser.o datastruct.o compare.o
-	$(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)  




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

 
 
 LIB = ../libp2c.a
@@ -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
@@ -105,7 +105,7 @@
 LIBSTUFF = texstuff.ps untilstuff.ps plot.font
 
 

 
 
 ##
@@ -178,7 +178,7 @@
 
 CHIPMUNKFLAGS = 
 
-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
 
@@ -201,7 +201,7 @@
 ## below; however the "-" allows this to be non-fatal and thus not essential
 ## to delete
 
 
-all: setup libp2c.a
+all: libp2c.a
 




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




--- 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
 
 
 ## 
@@ -71,7 +71,7 @@
 ## LIBX11= -lX11 -s
 ##
 
-LIBX11 = -lX11

 
 LIBP2C = ../psys/src/libp2c.a
 
@@ -83,7 +83,7 @@
 ##
 ## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS
 

 
 ##
 ## (2) IEEE library directory
@@ -128,7 +128,7 @@
 
 CHIPMUNKCC = gcc -O3
 

 
 ##
 ## (4) Adding appropriate flags
@@ -173,11 +173,11 @@
 
 CHIPMUNKFLAGS = 
 
-CFLAGS= $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
+CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
 

 
 OBJS =			\
 	viewfit.o	\
@@ -245,7 +245,7 @@
 	(chdir mt;	make; chdir ..; chdir tek2430; make; chdir ..; make mtlink)
 
 install: view

Return to bug 166017

Lines 6-36 Link Here

(-)cad/chipmunk/Makefile (-11 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= chipmunk	8	PORTNAME= chipmunk
9	PORTVERSION= 5.64	9	PORTVERSION= 5.65
10	PORTREVISION= 3
11	CATEGORIES= cad	10	CATEGORIES= cad
12	MASTER_SITES= http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/	11	MASTER_SITES= http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/
13	DISTFILES= psys-1.59.tar.gz log-5.64.tar.gz netcmp-1.13.tar.gz \	12	DISTFILES= psys-1.60.tar.gz log-5.65.tar.gz netcmp-1.14.tar.gz \
14	mosis-1.14.tar.gz wol-1.14.tar.gz wolcomp-1.14.tar.gz \	13	mosis-1.15.tar.gz wol-1.15.tar.gz wolcomp-1.15.tar.gz \
15	until-1.14.tar.gz util-1.11.tar.gz view-1.14.tar.gz \	14	until-1.15.tar.gz util-1.12.tar.gz view-1.15.tar.gz \
16	Makefile	15	Makefile
17	DIST_SUBDIR= chipmunk	16	DIST_SUBDIR= chipmunk
18	EXTRACT_ONLY= psys-1.59.tar.gz log-5.64.tar.gz netcmp-1.13.tar.gz \	17	EXTRACT_ONLY= psys-1.60.tar.gz log-5.65.tar.gz netcmp-1.14.tar.gz \
19	mosis-1.14.tar.gz wol-1.14.tar.gz wolcomp-1.14.tar.gz \	18	mosis-1.15.tar.gz wol-1.15.tar.gz wolcomp-1.15.tar.gz \
20	until-1.14.tar.gz util-1.11.tar.gz view-1.14.tar.gz	19	until-1.15.tar.gz util-1.12.tar.gz view-1.15.tar.gz
21		20
22	MAINTAINER= ports@FreeBSD.org	21	MAINTAINER= ports@FreeBSD.org
23	COMMENT= An electronic CAD system	22	COMMENT= An electronic CAD system
24		23
		24	LICENSE= GPLv2
		25
25	NO_WRKSUBDIR= yes	26	NO_WRKSUBDIR= yes
		27
26	USE_XORG= x11	28	USE_XORG= x11
27	USE_GMAKE= yes	29	USE_GMAKE= yes
		30	MAKE_JOBS_SAFE= yes
28		31
29	.include <bsd.port.pre.mk>	32	.include <bsd.port.pre.mk>
30		33
31	.if ${ARCH} == "alpha"	34	.if ${ARCH} == "sparc64"
32	BROKEN= Broken pkg-plist on alpha
33	.elif ${ARCH} == "sparc64"
34	BROKEN= Fails to install	35	BROKEN= Fails to install
35	.endif	36	.endif
36		37

Lines 1-20 Link Here

(-)cad/chipmunk/distinfo (-18 / +18 lines)
1	SHA256 (chipmunk/psys-1.59.tar.gz) = a3cb661833fec226847e5a423b13b2ce827482b684d59af84f754ab459fe29f8	1	SHA256 (chipmunk/psys-1.60.tar.gz) = d910601b14645bb2118e99cda0e80f577067d073cf0053a2857ab0b8d78d823f
2	SIZE (chipmunk/psys-1.59.tar.gz) = 203006	2	SIZE (chipmunk/psys-1.60.tar.gz) = 203732
3	SHA256 (chipmunk/log-5.64.tar.gz) = 527d938c6b79ecce915a6ae4c0f051b01a6f8f9afff5b50f04fb32dbe95db8c8	3	SHA256 (chipmunk/log-5.65.tar.gz) = 01d432d211f3d2542bc2d645373a28255cfa2d4a69ad7f8b78cea0be97f59c7b
4	SIZE (chipmunk/log-5.64.tar.gz) = 1632345	4	SIZE (chipmunk/log-5.65.tar.gz) = 1629755
5	SHA256 (chipmunk/netcmp-1.13.tar.gz) = a85b8fb424f4f7b17d396d0ef86590d3d42e40fe130fc3e4a521cc50ff3841c8	5	SHA256 (chipmunk/netcmp-1.14.tar.gz) = d71b74cce8ec5ce90ed34778a9b3c33cbb887cd0862feddeddfb7458a8972a6a
6	SIZE (chipmunk/netcmp-1.13.tar.gz) = 137728	6	SIZE (chipmunk/netcmp-1.14.tar.gz) = 137525
7	SHA256 (chipmunk/mosis-1.14.tar.gz) = 2ae4cf8f00a09c0b83f34a767a83c10d4541a24941e341498b51bac5d7179d33	7	SHA256 (chipmunk/mosis-1.15.tar.gz) = 56abe3b8fe22cf1ef70047f2ea345e96110b9b4cd0786cf1414c33b3b23dabd6
8	SIZE (chipmunk/mosis-1.14.tar.gz) = 40775	8	SIZE (chipmunk/mosis-1.15.tar.gz) = 41016
9	SHA256 (chipmunk/wol-1.14.tar.gz) = f0bb0cac49c1050ba07ea69ef922bf3d16e2841622de45276ec8dc3ff3063aea	9	SHA256 (chipmunk/wol-1.15.tar.gz) = ae9bb0884904564279fffabd72a062100eafbcfe5db0e326ed4605109874a2ea
10	SIZE (chipmunk/wol-1.14.tar.gz) = 324674	10	SIZE (chipmunk/wol-1.15.tar.gz) = 324640
11	SHA256 (chipmunk/wolcomp-1.14.tar.gz) = 63b9ea8d180d2883122c98b8d3b7c5a3800625cc5a505f18070ec62b71f20579	11	SHA256 (chipmunk/wolcomp-1.15.tar.gz) = d5cf71985f6d872165b212ab2bad65dc9f46e5294f8a6099781b3dd55850ea9c
12	SIZE (chipmunk/wolcomp-1.14.tar.gz) = 22224	12	SIZE (chipmunk/wolcomp-1.15.tar.gz) = 22083
13	SHA256 (chipmunk/until-1.14.tar.gz) = 9c8a9121b8377b4b141c18df0bfe3272611a4d1f177f0bc00b8815b5305434db	13	SHA256 (chipmunk/until-1.15.tar.gz) = 9135da9b8819a9705d317d0b59bc9aee68df698fc660e186f95233322d551a8b
14	SIZE (chipmunk/until-1.14.tar.gz) = 141467	14	SIZE (chipmunk/until-1.15.tar.gz) = 141703
15	SHA256 (chipmunk/util-1.11.tar.gz) = 9c1bed4d7b400c68990bd5ad31ccedc810dd0b52d53e1703987a81201f2c51ce	15	SHA256 (chipmunk/util-1.12.tar.gz) = 6a817b95830c262d931c631c430a5ab502f2e514e024ef19a866390e0e776bed
16	SIZE (chipmunk/util-1.11.tar.gz) = 74075	16	SIZE (chipmunk/util-1.12.tar.gz) = 71168
17	SHA256 (chipmunk/view-1.14.tar.gz) = 675bf492dc4cad185200dd0f2cec851af579a774d501ff248e28cffd8af342c3	17	SHA256 (chipmunk/view-1.15.tar.gz) = bd7e8cb00c35911f9aa78529fd2d1b7b3061263e656ebedf7cb039a412378b97
18	SIZE (chipmunk/view-1.14.tar.gz) = 359473	18	SIZE (chipmunk/view-1.15.tar.gz) = 359627
19	SHA256 (chipmunk/Makefile) = b47c1de0584ce6d05b279735195f7db16a18644dbc784d03a132a0df1026cf1c	19	SHA256 (chipmunk/Makefile) = b47c1de0584ce6d05b279735195f7db16a18644dbc784d03a132a0df1026cf1c
20	SIZE (chipmunk/Makefile) = 1942	20	SIZE (chipmunk/Makefile) = 1942

Lines 1-15 Link Here

(-)cad/chipmunk/files/patch-ae (-8 / +8 lines)
1	--- log/src/ana/Makefile.orig Sat May 18 12:02:28 2002	1	--- log/src/ana/Makefile.orig 2011-10-21 07:26:01.000000000 +0900
2	+++ log/src/ana/Makefile Sat May 18 12:46:53 2002	2	+++ log/src/ana/Makefile 2011-11-26 22:33:01.000000000 +0900
3	@@ -25,7 +25,7 @@	3	@@ -45,7 +45,7 @@
		4	## For most versions of UNIX, one of the above directories
		5	## will be the correct one to use on the line below:
4		6
5
6	LOCINC = ../../../psys/include
7	-XINCLUDEDIR = .	7	-XINCLUDEDIR = .
8	+XINCLUDEDIR = ${LOCALBASE}/include	8	+XINCLUDEDIR = ${LOCALBASE}/include
9		9
10	##	10	##
11	## (1) Choosing your compiler	11	## (1) Choosing your compiler
12	@@ -46,7 +46,7 @@	12	@@ -66,7 +66,7 @@
13	CHIPMUNKCC = gcc -O3	13	CHIPMUNKCC = gcc -O3
14		14
15		15
Lines 17-24 Link Here
17	+CC ?= $(CHIPMUNKCC)	17	+CC ?= $(CHIPMUNKCC)
18		18
19	##	19	##
20	## (2) Adding appropriate flags	20	## (4) Adding appropriate flags
21	@@ -84,7 +84,7 @@	21	@@ -108,7 +108,7 @@
22		22
23	CHIPMUNKFLAGS =	23	CHIPMUNKFLAGS =
24		24

Lines 1-5 Link Here

(-)cad/chipmunk/files/patch-af (-17 / +17 lines)
1	--- mosis/Makefile.orig Tue Nov 4 22:19:13 2003	1	--- mosis/Makefile.orig 2011-09-08 03:38:27.000000000 +0900
2	+++ mosis/Makefile Tue Dec 9 17:44:45 2003	2	+++ mosis/Makefile 2012-02-22 16:51:46.000000000 +0900
3	@@ -23,6 +23,8 @@	3	@@ -23,6 +23,8 @@
4	#	4	#
5	#	5	#
Lines 12-34 Link Here
12	@@ -47,7 +49,7 @@	12	@@ -47,7 +49,7 @@
13	##	13	##
14		14
15		15	CHIPMUNKCC = gcc -O3
16	-CC = gcc	16	-CC = $(CHIPMUNKCC)
17	+CC ?= gcc	17	+CC ?= $(CHIPMUNKCC)
18		18
19	##	19	##
20	## (2) If X isn't in the include path (the case for many MachTen and Linux	20	## If X isn't in the include path, change XINCLUDEDIR:
21	@@ -62,7 +64,7 @@	21	@@ -67,7 +69,7 @@
22	## or some other directory, depending on your installation. Use the	22	## For most versions of UNIX, one of the above directories
23	## first one for OS X.	23	## will be the correct one to use on the line below:
24		24
25	-XINCLUDEDIR = .	25	-XINCLUDEDIR = .
26	+XINCLUDEDIR = ${LOCALBASE}/include	26	+XINCLUDEDIR = ${LOCALBASE}/include
27		27
28	##	28	##
29	## If X isn't in the library path (the case for many MachTen and Linux	29	## If X isn't in the library path, change LIBX11 to reflect this:
30	@@ -77,7 +79,7 @@	30	@@ -92,7 +94,7 @@
31	## depending on your installation. Use the second one for OS X.	31	## LIBX11= -lX11 -s
32	##	32	##
33		33
34	-LIBX11 = -lX11	34	-LIBX11 = -lX11
Lines 36-42 Link Here
36		36
37	##	37	##
38	## (3) Adding appropriate flags	38	## (3) Adding appropriate flags
39	@@ -115,7 +117,7 @@	39	@@ -133,7 +135,7 @@
40		40
41	CHIPMUNKFLAGS =	41	CHIPMUNKFLAGS =
42		42
Lines 45-51 Link Here
45		45
46	##	46	##
47	## (4) Library additions	47	## (4) Library additions
48	@@ -123,7 +125,7 @@	48	@@ -141,7 +143,7 @@
49	##	49	##
50	## on some systems, -ldl must be added to the following line	50	## on some systems, -ldl must be added to the following line
51		51
Lines 54-61 Link Here
54		54
55	##	55	##
56	##	56	##
57	@@ -136,7 +138,7 @@	57	@@ -154,7 +156,7 @@
58	$(CC) -o mosis mosis.o $(LDFLAGS)	58	$(CC) $(CFLAGS) -o mosis mosis.o $(LDFLAGS)
59		59
60	install: mosis	60	install: mosis
61	- cp mosis ../bin/mosis	61	- cp mosis ../bin/mosis

Lines 1-5 Link Here

(-)cad/chipmunk/files/patch-ag (-5 / +5 lines)
1	--- netcmp/Makefile.orig Sat Aug 18 07:49:31 2001	1	--- netcmp/Makefile.orig 2011-10-21 07:35:56.000000000 +0900
2	+++ netcmp/Makefile Sat May 18 14:46:26 2002	2	+++ netcmp/Makefile 2012-02-22 16:42:56.000000000 +0900
3	@@ -22,7 +22,7 @@	3	@@ -22,7 +22,7 @@
4	#	4	#
5	# netcmp makefile	5	# netcmp makefile
Lines 18-24 Link Here
18		18
19	##	19	##
20	## (2) Adding appropriate flags	20	## (2) Adding appropriate flags
21	@@ -90,15 +90,17 @@	21	@@ -77,15 +77,17 @@
22	## -ansi	22	## -ansi
23	##	23	##
24		24
Lines 30-37 Link Here
30	+CFLAGS += -DBSD -DF_OK	30	+CFLAGS += -DBSD -DF_OK
31		31
32	netcmp: main.o parser.o datastruct.o compare.o	32	netcmp: main.o parser.o datastruct.o compare.o
33	- $(CC) parser.o datastruct.o compare.o main.o -o netcmp	33	- $(CC) $(CFLAGS) parser.o datastruct.o compare.o main.o -o netcmp
34	+ $(CC) parser.o datastruct.o compare.o main.o $(OTHERLIBS) -o netcmp	34	+ $(CC) $(CFLAGS) parser.o datastruct.o compare.o main.o $(OTHERLIBS) -o netcmp
35		35
36	install: netcmp	36	install: netcmp
37	- cp netcmp $(BINDIR)	37	- cp netcmp $(BINDIR)

Lines 1-5 Link Here

(-)cad/chipmunk/files/patch-ah (-11 / +11 lines)
1	--- psys/src/Makefile.orig Sat Mar 2 06:39:14 2002	1	--- psys/src/Makefile.orig 2011-10-21 07:23:19.000000000 +0900
2	+++ psys/src/Makefile Sat May 18 13:25:17 2002	2	+++ psys/src/Makefile 2011-11-26 22:40:45.000000000 +0900
3	@@ -30,8 +30,8 @@	3	@@ -30,8 +30,8 @@
4	## to be made for different systems. Its a good idea to look over each	4	## to be made for different systems. Its a good idea to look over each
5	## block and make necessary changes before doing a "make install"	5	## block and make necessary changes before doing a "make install"
Lines 11-26 Link Here
11		11
12		12
13	LIB = ../libp2c.a	13	LIB = ../libp2c.a
14	@@ -51,7 +51,7 @@	14	@@ -56,7 +56,7 @@
15	## or some other directory, depending on your installation.	15	## For most versions of UNIX, one of the above directories
16	##	16	## will be the correct one to use on the line below:
17		17
18	-XINCLUDEDIR = .	18	-XINCLUDEDIR = .
19	+XINCLUDEDIR = ${LOCALBASE}/include	19	+XINCLUDEDIR = ${LOCALBASE}/include
20		20
21	##	21	##
22	## (1) Choosing your compiler	22	## (1) Choosing your compiler
23	@@ -101,7 +101,7 @@	23	@@ -105,7 +105,7 @@
24	LIBSTUFF = texstuff.ps untilstuff.ps plot.font	24	LIBSTUFF = texstuff.ps untilstuff.ps plot.font
25		25
26		26
Lines 29-47 Link Here
29		29
30		30
31	##	31	##
32	@@ -149,7 +149,7 @@	32	@@ -178,7 +178,7 @@
33		33
34	CHIPMUNKFLAGS =	34	CHIPMUNKFLAGS =
35		35
36	-CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"`$(CD) $(LIBDIR); pwd`\"	36	-CFLAGS = $(CHIPMUNKFLAGS) $(FONTS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"`$(CD) $(LIBDIR); pwd`\"
37	+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"$(LIBDIR)\"	37	+CFLAGS += -DBSD -DF_OK $(FONTS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"$(LIBDIR)\"
38		38
39	P2CFLAGS = -DLOCAL_INIT=_local_p2c_init	39	P2CFLAGS = -DLOCAL_INIT=_local_p2c_init
40		40
41	@@ -165,7 +165,7 @@	41	@@ -201,7 +201,7 @@
42	## below; however the "-" allows this to be non-fatal and thus not essential
43	## to delete	42	## to delete
44		43
		44
45	-all: setup libp2c.a	45	-all: setup libp2c.a
46	+all: libp2c.a	46	+all: libp2c.a
47		47

Lines 1-25 Link Here

(-)cad/chipmunk/files/patch-ak (-13 / +12 lines)
1	--- util/Makefile.orig Wed Mar 12 02:47:21 1997	1	--- util/Makefile.orig 2011-10-21 07:40:05.000000000 +0900
2	+++ util/Makefile Tue Sep 21 21:21:39 1999	2	+++ util/Makefile 2011-11-26 22:45:05.000000000 +0900
3	@@ -10,15 +10,20 @@	3	@@ -6,14 +6,19 @@
4	boxify\	4
5	sctomat	5	PACKAGES = cleancif conscripts boxify spc-tools lgf-tools sctomat
6		6
7	+all:	7	+all:
8	+ for i in $(PACKAGES) ;\	8	+ for i in $(PACKAGES) ;\
9	+ do (cd $$i ; echo "Making clean in $$i..."; \	9	+ do (cd $$i ; echo "Making all in $$i..."; \
10	+ $(MAKE) all); done	10	+ $(MAKE) all); done
11	+	11	+
12	clean:
13	for i in $(PACKAGES) ;\
14	do (cd $$i ; echo "Making clean in $$i..."; \
15	- make clean); done
16	+ $(MAKE) clean); done
17
18	install:	12	install:
19	for i in $(PACKAGES) ;\	13	for i in $(PACKAGES) ;\
20	do (cd $$i ; echo "Making install in $$i..."; \	14	do (cd $$i ; echo "Making install in $$i..."; \
21	- make install); done	15	- make install); done
22	+ $(MAKE) install); done	16	+ $(MAKE) install); done
		17	clean:
		18	for i in $(PACKAGES) ;\
		19	do (cd $$i ; echo "Making clean in $$i..."; \
		20	- make clean); done
		21	+ $(MAKE) clean); done
23		22
24	dist:	23	dist:
25	rm -rf util	24	rm -rf util

Lines 1-16 Link Here

(-)cad/chipmunk/files/patch-au (-14 / +14 lines)
1	--- view/Makefile.orig Sat May 18 12:02:28 2002	1	--- view/Makefile.orig 2011-10-21 07:29:27.000000000 +0900
2	+++ view/Makefile Sat May 18 12:59:50 2002	2	+++ view/Makefile 2011-11-26 22:47:47.000000000 +0900
3	@@ -40,7 +40,7 @@	3	@@ -45,7 +45,7 @@
4	## or some other directory, depending on your installation.	4	## For most versions of UNIX, one of the above directories
5	##	5	## will be the correct one to use on the line below:
6		6
7	-XINCLUDEDIR = .	7	-XINCLUDEDIR = .
8	+XINCLUDEDIR = ${LOCALBASE}/include	8	+XINCLUDEDIR = ${LOCALBASE}/include
9		9
10	##	10
11	## If X isn't in the library path (the case for many MachTen and Linux	11	##
12	@@ -55,7 +55,7 @@	12	@@ -71,7 +71,7 @@
13	## depending on your installation.	13	## LIBX11= -lX11 -s
14	##	14	##
15		15
16	-LIBX11 = -lX11	16	-LIBX11 = -lX11
Lines 18-24 Link Here
18		18
19	LIBP2C = ../psys/src/libp2c.a	19	LIBP2C = ../psys/src/libp2c.a
20		20
21	@@ -67,7 +67,7 @@	21	@@ -83,7 +83,7 @@
22	##	22	##
23	## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS	23	## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS
24		24
Lines 27-33 Link Here
27		27
28	##	28	##
29	## (2) IEEE library directory	29	## (2) IEEE library directory
30	@@ -114,7 +114,7 @@	30	@@ -128,7 +128,7 @@
31		31
32	CHIPMUNKCC = gcc -O3	32	CHIPMUNKCC = gcc -O3
33		33
Lines 36-45 Link Here
36		36
37	##	37	##
38	## (4) Adding appropriate flags	38	## (4) Adding appropriate flags
39	@@ -172,11 +172,11 @@	39	@@ -173,11 +173,11 @@
40		40
41	CHIPMUNKFLAGS =	41	CHIPMUNKFLAGS =
42		42
43	-CFLAGS= $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0	43	-CFLAGS= $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
44	+CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0	44	+CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
45		45
Lines 50-56 Link Here
50		50
51	OBJS = \	51	OBJS = \
52	viewfit.o \	52	viewfit.o \
53	@@ -244,7 +244,7 @@	53	@@ -245,7 +245,7 @@
54	(chdir mt; make; chdir ..; chdir tek2430; make; chdir ..; make mtlink)	54	(chdir mt; make; chdir ..; chdir tek2430; make; chdir ..; make mtlink)
55		55
56	install: view	56	install: view