Attachment #21916 for bug #38227

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




#

PORTNAME=	chipmunk
PORTVERSION=	5.59
CATEGORIES=	cad
MASTER_SITES=	http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/
DISTFILES=	psys-1.56.tar.gz log-5.59.tar.gz netcmp-1.12.tar.gz \
		mosis-1.12.tar.gz wol-1.12.tar.gz wolcomp-1.12.tar.gz \
		until-1.12.tar.gz util1.1.tar.gz view-1.12.tar.gz \
		Makefile
EXTRACT_ONLY=	psys-1.56.tar.gz log-5.59.tar.gz netcmp-1.12.tar.gz \
		mosis-1.12.tar.gz wol-1.12.tar.gz wolcomp-1.12.tar.gz \
		until-1.12.tar.gz util1.1.tar.gz view-1.12.tar.gz
DIST_SUBDIR=	chipmunk

MAINTAINER=	ports@FreeBSD.org

NO_WRKSUBDIR=	yes
		mosisbeta.tar.gz wolbeta.tar.gz wolcompbeta.tar.gz \
		untilbeta.tar.gz util1.1.tar.gz viewbeta.tar.gz

USE_XLIB=	yes
DIST_SUBDIR=	chipmunk
USE_GMAKE=	yes
NO_WRKSUBDIR=	yes

post-extract:
	@${CP} -f ${DISTDIR}/${DIST_SUBDIR}/Makefile ${WRKSRC}/Makefile

post-patch:
	@find ${WRKSRC} -name Makefile -exec \
	  ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" \{} \;
	@find ${WRKSRC} -name Makefile -exec \
	  ${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" \{} \;

.include <bsd.port.mk>

Lines 1-10 Link Here

(-)cad/chipmunk/distinfo (-8 / +8 lines)
1	MD5 (chipmunk/psys-1.51.tar.gz) = 98bbe116211568d7022c5bc14fc22cf6	1	MD5 (chipmunk/psys-1.56.tar.gz) = 43f7f0496bab0e4535397ad6d1be268e
2	MD5 (chipmunk/log-5.51.tar.gz) = d64ddfd87cfe183dc2612a08c7921dc0	2	MD5 (chipmunk/log-5.59.tar.gz) = 681dcc067d4d2c43fb11eb5d863f0556
3	MD5 (chipmunk/netcmpbeta.tar.gz) = 4ae81f28aaf576b8872da9a8fde6c538	3	MD5 (chipmunk/netcmp-1.12.tar.gz) = ccc78ce4bf471705bacac8804dfa59cc
4	MD5 (chipmunk/mosisbeta.tar.gz) = 315e211b901a0f3b8367f51649f8f801	4	MD5 (chipmunk/mosis-1.12.tar.gz) = 7558999d1cb11ddb510cef268ef298b7
5	MD5 (chipmunk/wolbeta.tar.gz) = e4771f728b24d1181663a0b0ea55e4fd	5	MD5 (chipmunk/wol-1.12.tar.gz) = 071167553fab12f52934c75a6f7beefc
6	MD5 (chipmunk/wolcompbeta.tar.gz) = 06c7b6c94950246f403058580dbb6a08	6	MD5 (chipmunk/wolcomp-1.12.tar.gz) = 4dda3bd03995ad6d351deb13714f5f9f
7	MD5 (chipmunk/untilbeta.tar.gz) = 6620ffd30693a819f09d814d1379a593	7	MD5 (chipmunk/until-1.12.tar.gz) = b52d0656134f76e297d9a47f872caa84
8	MD5 (chipmunk/util1.1.tar.gz) = f95de90c953e1be6b07dbdd4b034a9c4	8	MD5 (chipmunk/util1.1.tar.gz) = f95de90c953e1be6b07dbdd4b034a9c4
9	MD5 (chipmunk/viewbeta.tar.gz) = e2f8feef9e1353bd2bc9a79671f8cbb9	9	MD5 (chipmunk/view-1.12.tar.gz) = 133883b385069a99eccc1c916a43943b
10	MD5 (chipmunk/Makefile) = ffec44e157c227bb2b904d338b35dfaf	10	MD5 (chipmunk/Makefile) = ffec44e157c227bb2b904d338b35dfaf




--- log/src/Makefile.orig	Tue May 14 03:08:21 2002
+++ log/src/Makefile	Sat May 18 15:49:22 2002
@@ -45,8 +45,8 @@
 
 CD = cd
 
-LOGLIBDIR = `$(CD) ../../log/lib; pwd`
-LIBDIR = `$(CD) ../../lib; pwd`
+LOGLIBDIR = ${PREFIX}/share/chipmunk
+LIBDIR = ${PREFIX}/share/chipmunk
 
 LOCINC = ../../psys/include
 
@@ -63,9 +63,9 @@
 ## or some other directory, depending on your installation.
 ##
 
-XINCLUDEDIR = .
+XINCLUDEDIR = ${X11BASE}/include
+XLIBDIR = %%X11BASE%%/lib
 
-BINDIR = ../../bin
+BINDIR = ${PREFIX}/bin
 LIBP2C = ../../psys/src/libp2c.a
 
 ##
@@ -81,7 +81,7 @@
 ## depending on your installation. 
 ##
 
-LIBX11 = -lX11
+LIBX11 = -lX11 -L${X11BASE}/lib
 
 ##
 ## (2) Library additions
@@ -91,7 +91,7 @@
 ##
 ## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS
 

 
 
 ##
@@ -110,7 +110,7 @@
   
 CHIPMUNKCC = gcc -O3
 
-CC = $(CHIPMUNKCC) 
+CC ?= $(CHIPMUNKCC) 
 
 ##
 ## (4) Adding appropriate flags
@@ -147,7 +147,7 @@
 ##   -m68040              : for 68040 and 68060
 ## 
 
 CHIPMUNKFLAGS = 
 
-CFLAGS =  $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0
+CFLAGS +=  -DBSD -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0
 
 DIGOBJ = logsim.o logdig.o logsimasm.o logsimed.o diggates.o \
          loghier.o logsimh.o swap.o
@@ -178,22 +178,24 @@
 ##  older operating systems -- if problems arise, use a hard link.
 ##
 
+all:  makeana main
+
 install: all
-	cp log $(BINDIR)/diglog
+	${BSD_INSTALL_PROGRAM} log $(BINDIR)/diglog
 	-rm -f $(BINDIR)/analog
 	-(cd $(BINDIR); ln -s diglog analog)
-	cp loged $(BINDIR)/loged
-	cp fixfet7 $(BINDIR)/fixfet7
+	${BSD_INSTALL_PROGRAM} loged $(BINDIR)/loged
+	${BSD_INSTALL_SCRIPT} fixfet7 $(BINDIR)/fixfet7
+	cp -R ../lib/* $(LOGLIBDIR)
+	chmod -R a=r+X $(LOGLIBDIR)
 
 clean:
 	-rm -f *.o ana/*.o log loged
 
-all:  makeana main
-
 main: log loged
 
 makeana:

 
 
 LOGOBJ = log.o $(TOOLOBJ) logstuff.o logdef.o
 
-log: $(LOGOBJ) tooldir.o $(LIBP2C) makeana
+log: $(LOGOBJ) tooldir.o $(LIBP2C)
 	$(CC) $(CFLAGS) tooldir.o $(LOGOBJ) $(LIBP2C) $(LIBX11)  \
 	$(OTHERLIBS) -o log
 




--- 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 @@
 
 
 LOCINC = ../../../psys/include
-XINCLUDEDIR = .
+XINCLUDEDIR = ${X11BASE}/include
 
 ##
 ##  (1) Choosing your compiler
@@ -46,7 +46,7 @@
 CHIPMUNKCC = gcc -O3
 
 
-CC = $(CHIPMUNKCC) 

 
 ##
 ## (2) Adding appropriate flags
@@ -84,7 +84,7 @@
 ## 
   
 
 CHIPMUNKFLAGS = 
 
-CFLAGS =  $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR)
+CFLAGS +=  -I$(LOCINC) -I$(XINCLUDEDIR)
 
 ANAOBJ = globals.o nsolver.o main.o inter.o $(GATESOBJ)




--- mosis/Makefile.orig	Tue Aug  7 09:25:31 2001
+++ mosis/Makefile	Sat May 18 15:59:51 2002
@@ -23,6 +23,8 @@
 #
 #
 
+BINDIR = ${PREFIX}/bin
+
 ##
 ##  (1) Choosing your compiler
 ##  ---------------------------
@@ -48,10 +50,10 @@
 ##
 
 
-CC = gcc
+CC ?= gcc
 
-LIBX11 = -lX11
-XINCLUDEDIR = .
+LIBX11 = -lX11 -L${X11BASE}/lib
+XINCLUDEDIR = ${X11BASE}/include
 
 ##
 ## (2) Adding appropriate flags
@@ -88,7 +90,7 @@
 
 CHIPMUNKFLAGS = 
 
-CFLAGS = $(CHIPMUNKFLAGS) -O -I../psys/include -I$(XINCLUDEDIR)
+CFLAGS += -DBSD -DF_OK -I../psys/include -I$(XINCLUDEDIR)
 
 ##
 ## (3) Library additions
@@ -96,7 +98,7 @@
 ##
 ## on some systems, -ldl must be added to the following line
 

 
 ##
 ##
@@ -109,7 +111,7 @@
 
 
-LDFLAGS = ../psys/src/libp2c.a  $(OTHERLIBS) $(LIBX11)
+LDFLAGS += ../psys/src/libp2c.a  $(OTHERLIBS) $(LIBX11) -L$(XLIBDIR)
 
 mosis: mosis.o 
 	$(CC) -o mosis mosis.o  $(LDFLAGS)
 
 install: mosis
-	cp mosis ../bin/mosis
+	${BSD_INSTALL_PROGRAM} mosis $(BINDIR)
 
 clean:
 	rm -f *.o mosis




--- netcmp/Makefile.orig	Sat Aug 18 07:49:31 2001
+++ netcmp/Makefile	Sat May 18 14:46:26 2002
@@ -22,7 +22,7 @@
 #
 # netcmp makefile
 
-BINDIR=	../bin
+BINDIR=	${PREFIX}/bin
 
 ##
 ##  (1) Choosing your compiler
@@ -48,7 +48,7 @@
 ## For SGI, cc is recommended
 
 CHIPMUNKCC = gcc -O3
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
 
 ##
 ## (2) Adding appropriate flags
@@ -90,15 +90,17 @@
 ## -ansi
 ##
 
+OTHERLIBS = -lcompat
+
 CHIPMUNKFLAGS = 
 
-CFLAGS = $(CHIPMUNKFLAGS)
+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
 
 install:    netcmp
-	cp netcmp $(BINDIR)  
+	${BSD_INSTALL_PROGRAM} netcmp $(BINDIR)  
 
 clean:
 	-rm -f *.o netcmp




--- psys/src/Makefile.orig	Sat Mar  2 06:39:14 2002
+++ psys/src/Makefile	Sat May 18 13:25:17 2002
@@ -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"
 
-LIBDIR = ../../lib
-BINDIR = ../../bin
+LIBDIR = ${PREFIX}/share/chipmunk
+BINDIR = ${PREFIX}/bin
 
 
 LIB = ../libp2c.a
@@ -51,7 +51,7 @@
 ## or some other directory, depending on your installation.
 ##
 
-XINCLUDEDIR = . 
+XINCLUDEDIR = ${X11BASE}/include
+XLIBDIR = %%X11BASE%%/lib
 
 ##
 ##  (1) Choosing your compiler
@@ -101,7 +101,7 @@
 LIBSTUFF = texstuff.ps untilstuff.ps plot.font
 
 

 
 
 ##
@@ -149,7 +149,7 @@
 
 CHIPMUNKFLAGS = 
 
-CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"`$(CD) $(LIBDIR); pwd`\"
+CFLAGS += -DBSD -DF_OK -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
 ## to delete
 




--- until/V1.2/Makefile.orig	Sat May 18 12:02:28 2002
+++ until/V1.2/Makefile	Sat May 18 12:57:40 2002
@@ -41,7 +41,7 @@
 ##
 
 
-XINCLUDEDIR = .
+XINCLUDEDIR = ${X11BASE}/include
+XLIBDIR = %%X11BASE%%/lib
 
 ##
 ## If X isn't in the library path (the case for many MachTen and Linux 
@@ -57,7 +57,7 @@
 ##
 
 
-LIBX11 = -lX11
+LIBX11 = -lX11 -L${X11BASE}/lib
 
 
 LIBP2C = ../../psys/src/libp2c.a
@@ -68,7 +68,7 @@
 ##
 ## on some systems, -ldl must be added to the following line
 

 
 ##
 ##  (2) Choosing your compiler
@@ -98,10 +98,10 @@
   
 
 CHIPMUNKCC = gcc

 
-BINDIR = ../../bin
-LIBDIR = `pwd`/../../lib
+BINDIR = ${PREFIX}/bin
+LIBDIR = ${PREFIX}/share/chipmunk
 
 SYSRC =  $(LIBDIR)/system.untilrc
 SYSPS =  $(LIBDIR)/pensps.map
@@ -165,7 +165,7 @@
 ##
 
 CHIPMUNKFLAGS =   
 
-CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) \
+CFLAGS += -DBSD -I$(LOCINC) -I$(XINCLUDEDIR) \
 -DF_OK=0 -DUNTILRC=\"$(SYSRC)\" -DUNTILPSMAP=\"$(SYSPS)\" \
 -DUNTILHEADER=\"$(SYSHD)\"
 
@@ -199,11 +199,11 @@
+LDFLAGS += $(LIBP2C)  $(LIBX11) $(OTHERLIBS) -L$(XLIBDIR)
 
 OBJS = bb_stuff.o cnf_stuff.o  crt_stuff.o data_types.o datawalk.o \
 dispmod.o ffman.o gr_stuff.o main.o mat_stuff.o menu.o menu_stuff.o \
@@ -195,11 +196,15 @@
 ## Until as its moved to bin; non ksh-users may wish to change it back.
 
 install: until
-	cp until $(BINDIR)/Until
-	cp pensps.map $(LIBDIR)/pensps.map
-	cp system.untilrc $(LIBDIR)/system.untilrc
-	cp until.pro  $(LIBDIR)/until.pro
-	cp until.ps  $(LIBDIR)/until.ps
+	${BSD_INSTALL_PROGRAM} until $(BINDIR)/Until
+	${BSD_INSTALL_DATA} pensps.map $(LIBDIR)/pensps.map
+	${BSD_INSTALL_DATA} system.untilrc $(LIBDIR)/system.untilrc
+	${BSD_INSTALL_DATA} until.pro  $(LIBDIR)/until.pro
+	${BSD_INSTALL_DATA} until.ps  $(LIBDIR)/until.ps
 
 
 bb_stuff.o : bb_stuff.c bb_stuff.h 




--- util/boxify/Makefile.orig	Wed Mar 12 02:47:23 1997
+++ util/boxify/Makefile	Sat May 18 13:12:54 2002
@@ -21,7 +21,7 @@
 #
 # boxify makefile
 
-BINDIR=	../../bin
+BINDIR=	${PREFIX}/bin
 
 ##
 ##  (1) Choosing your compiler

 
 install: boxify
-	cp boxify $(BINDIR)  
+	${BSD_INSTALL_PROGRAM} -c -s boxify $(BINDIR)  
 
 clean:
-	(cd trapes; make clean)

Lines 5-11 Link Here

(-)cad/chipmunk/files/patch-am (-1 / +1 lines)
5	# cleancif makefile	5	# cleancif makefile
6		6
7	-BINDIR= ../../bin	7	-BINDIR= ../../bin
8	+BINDIR= %%PREFIX%%/bin	8	+BINDIR= ${PREFIX}/bin
9		9
10	##	10	##
11	## (1) Choosing your compiler	11	## (1) Choosing your compiler

Lines 5-11 Link Here

(-)cad/chipmunk/files/patch-an (-1 / +1 lines)
5	# cleancif makefile	5	# cleancif makefile
6		6
7	-BINDIR= ../../bin	7	-BINDIR= ../../bin
8	+BINDIR= %%PREFIX%%/bin	8	+BINDIR= ${PREFIX}/bin
9		9
10	##	10	##
11	## (1) Choosing your compiler	11	## (1) Choosing your compiler




--- util/conscripts/Makefile.orig	Wed Mar 12 02:47:25 1997
+++ util/conscripts/Makefile	Sat May 18 13:13:47 2002
@@ -18,11 +18,11 @@
 #
 # mconvert makefile
 
-BINDIR=	../../bin
+BINDIR=	${PREFIX}/bin
 
 install:    
-	cp mconvert $(BINDIR)  
-	cp unmconvert $(BINDIR)  
+	${BSD_INSTALL_SCRIPT} mconvert $(BINDIR)  
+	${BSD_INSTALL_SCRIPT} unmconvert $(BINDIR)  
 
 clean:
 	-rm -f *.o 




--- util/sctomat/Makefile.orig	Wed Mar 12 02:47:26 1997
+++ util/sctomat/Makefile	Sat May 18 13:14:35 2002
@@ -5,7 +5,7 @@
 #
 # sctomat makefile
 
-BINDIR=	../../bin
+BINDIR=	${PREFIX}/bin
 
 ##
 ##  (1) Choosing your compiler

 
 install:  scope_to_mat  
-	cp scope_to_mat $(BINDIR)  
+	${BSD_INSTALL_PROGRAM} scope_to_mat $(BINDIR)  
 
 clean:
 	-rm -f *.o scope_to_mat




--- util/spc-tools/sf/Makefile.orig	Wed Mar 12 02:47:29 1997
+++ util/spc-tools/sf/Makefile	Sat May 18 13:15:35 2002
@@ -18,7 +18,7 @@
 #
 # sf makefile
 
-BINDIR=	../../../bin
+BINDIR=	${PREFIX}/bin
 
 ##
 ##  (1) Choosing your compiler

 ##
 
-CFLAGS = 
+CFLAGS += -DBSD -DF_OK=0
 
 sf:     sf.o hash.o spice.o
 	$(CC) sf.o hash.o spice.o  -o sf
 
 install:    sf
-	cp sf $(BINDIR)  
+	${BSD_INSTALL_PROGRAM} sf $(BINDIR)  
 
 clean:
 	-rm -f *.o sf




--- util/spc-tools/ss/Makefile.orig	Wed Mar 12 02:47:27 1997
+++ util/spc-tools/ss/Makefile	Sat May 18 13:16:25 2002
@@ -18,7 +18,7 @@
 #
 # ss makefile
 
-BINDIR=	../../../bin
+BINDIR=	${PREFIX}/bin
 
 ##
 ##  (1) Choosing your compiler

 install:    ss
-	cp ss $(BINDIR)  
-	cp test/ucbsim $(BINDIR)
+	${BSD_INSTALL_PROGRAM} ss $(BINDIR)  
+	${BSD_INSTALL_SCRIPT} test/ucbsim $(BINDIR)
 
 clean:
 	-rm -f *.o ss




--- 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.
 ##
 
-XINCLUDEDIR = .
+XINCLUDEDIR = ${X11BASE}/include
+XLIBDIR = %%X11BASE%%/lib
 
 ##
 ## If X isn't in the library path (the case for many MachTen and Linux 
@@ -55,7 +55,7 @@
 ## depending on your installation. 
 ##
 
-LIBX11 = -lX11
+LIBX11 = -lX11 -L${X11BASE}/lib
 
 LIBP2C = ../psys/src/libp2c.a
 
@@ -67,7 +67,7 @@
 ##
 ## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS
 

 
 ##
 ## (2) IEEE library directory
@@ -114,7 +114,7 @@
 
 CHIPMUNKCC = gcc -O3
 
-CC = $(CHIPMUNKCC) 
+CC ?= $(CHIPMUNKCC) 
 
 ##
 ## (4) Adding appropriate flags
@@ -172,11 +172,11 @@
 
 CHIPMUNKFLAGS = 
   
-CFLAGS= $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
+CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
 
 LDFLAGS= $(LIBP2C) $(LIBX11) $(OTHERLIBS) 
+LDFLAGS += $(LIBP2C) $(LIBX11) $(OTHERLIBS) -L$(XLIBDIR)
 MYLDFLAGS= $(LIBP2C)  $(IEEEDIR) $(LIBX11)  $(OTHERLIBS)
-BINDIR= ../bin
+BINDIR = ${PREFIX}/bin
 
 OBJS =			\
 	viewfit.o	\
@@ -244,7 +244,7 @@
 	(chdir mt;	make; chdir ..; chdir tek2430; make; chdir ..; make mtlink)
 
 install: view
-	cp view $(BINDIR)/vc
+	${BSD_INSTALL_PROGRAM} view $(BINDIR)/vc
 
 myinstall: myview
 	cp view ../bin/myview




--- wol/Makefile.orig	Sat May 18 12:02:28 2002
+++ wol/Makefile	Sat May 18 13:01:59 2002
@@ -39,7 +39,7 @@
 ## or some other directory, depending on your installation.
 ##
 
-XINCLUDEDIR = .
+XINCLUDEDIR = ${X11BASE}/include
+XLIBDIR = %%X11BASE%%/lib
 
 ##
 ## If X isn't in the library path (the case for many MachTen and Linux 
@@ -54,7 +54,7 @@
 ## depending on your installation. 
 ##
 
-LIBX11 = -lX11
+LIBX11 = -lX11 -L${X11BASE}/lib
 
 
 
@@ -66,7 +66,7 @@
 ##
 ## on some systems, -ldl must be added to the following line
 

 
 
 ##
@@ -97,11 +97,11 @@
 ##
 
 CHIPMUNKCC = gcc -O3
-CC = $(CHIPMUNKCC) 
+CC ?= $(CHIPMUNKCC) 
 
-LIBDIR = `pwd`/
+LIBDIR = ${PREFIX}/share/chipmunk
 WOLPL = $(LIBDIR)
-BINDIR = ../bin
+BINDIR = ${PREFIX}/bin
 
 
 ##
@@ -157,7 +157,7 @@
 
 CHIPMUNKFLAGS =
 
-CFLAGS= $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DWOLLIBDIR=\"$(WOLPL)\"
+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -DWOLLIBDIR=\"$(WOLPL)\"
 
 LDFLAGS= $(LIBP2C)  $(LIBX11) $(OTHERLIBS)
+LDFLAGS += $(LIBP2C)  $(LIBX11) $(OTHERLIBS) -L$(XLIBDIR)
 
@@ -200,7 +200,7 @@
          cell_stuff.o	\
@@ -198,7 +199,7 @@
   
 
 install: wol 
-	cp wol $(BINDIR)
+	${BSD_INSTALL_PROGRAM} wol $(BINDIR)
 
 clean:
 	-rm -f *.o wol




--- wolcomp/Makefile.orig	Sat May 18 12:02:28 2002
+++ wolcomp/Makefile	Sat May 18 13:03:14 2002
@@ -52,10 +52,10 @@
   
 
 CHIPMUNKCC = gcc -O3
-CC = $(CHIPMUNKCC) 
+CC ?= $(CHIPMUNKCC) 
 
 LOCINC = ../psys/include
-XINCLUDEDIR = .
+XINCLUDEDIR = ${X11BASE}/include
+XLIBDIR = %%X11BASE%%/lib
 
 ##
 ## (2) Adding appropriate flags
@@ -109,7 +109,7 @@
   
 
 CHIPMUNKFLAGS = 
-CFLAGS =  $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR)
+CFLAGS +=  -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR)
 
 install : $(OBJS)
 	-rm -f wolcomp.a

Lines 15-21 Link Here

(-)cad/chipmunk/pkg-plist (-1 / +1 lines)
15	share/chipmunk/actel.gate	15	share/chipmunk/actel.gate
16	share/chipmunk/actellog.cnf	16	share/chipmunk/actellog.cnf
17	share/chipmunk/ana.gate	17	share/chipmunk/ana.gate
18	share/chipmunk/ana.gsafe
19	share/chipmunk/analog-man.ps	18	share/chipmunk/analog-man.ps
20	share/chipmunk/analog-tr.ps	19	share/chipmunk/analog-tr.ps
21	share/chipmunk/analog.cnf	20	share/chipmunk/analog.cnf
Lines 38-43 Link Here
38	share/chipmunk/log.cnf	37	share/chipmunk/log.cnf
39	share/chipmunk/log.doc	38	share/chipmunk/log.doc
40	share/chipmunk/log.gate	39	share/chipmunk/log.gate
		40	share/chipmunk/log.text
41	share/chipmunk/lognews.text	41	share/chipmunk/lognews.text
42	share/chipmunk/logntk.cnf	42	share/chipmunk/logntk.cnf
43	share/chipmunk/logspc.cnf	43	share/chipmunk/logspc.cnf

Return to bug 38227

Lines 6-37 Link Here

(-)cad/chipmunk/Makefile (-17 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= chipmunk	8	PORTNAME= chipmunk
9	PORTVERSION= 5.51	9	PORTVERSION= 5.59
10	CATEGORIES= cad	10	CATEGORIES= cad
11	MASTER_SITES= http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/	11	MASTER_SITES= http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/
12	DISTFILES= psys-1.51.tar.gz log-5.51.tar.gz netcmpbeta.tar.gz \	12	DISTFILES= psys-1.56.tar.gz log-5.59.tar.gz netcmp-1.12.tar.gz \
13	mosisbeta.tar.gz wolbeta.tar.gz wolcompbeta.tar.gz \	13	mosis-1.12.tar.gz wol-1.12.tar.gz wolcomp-1.12.tar.gz \
14	untilbeta.tar.gz util1.1.tar.gz viewbeta.tar.gz \	14	until-1.12.tar.gz util1.1.tar.gz view-1.12.tar.gz \
15	Makefile	15	Makefile
		16	EXTRACT_ONLY= psys-1.56.tar.gz log-5.59.tar.gz netcmp-1.12.tar.gz \
		17	mosis-1.12.tar.gz wol-1.12.tar.gz wolcomp-1.12.tar.gz \
		18	until-1.12.tar.gz util1.1.tar.gz view-1.12.tar.gz
		19	DIST_SUBDIR= chipmunk
16		20
17	MAINTAINER= ports@FreeBSD.org	21	MAINTAINER= ports@FreeBSD.org
18		22
19	EXTRACT_ONLY= psys-1.51.tar.gz log-5.51.tar.gz netcmpbeta.tar.gz \	23	NO_WRKSUBDIR= yes
20	mosisbeta.tar.gz wolbeta.tar.gz wolcompbeta.tar.gz \
21	untilbeta.tar.gz util1.1.tar.gz viewbeta.tar.gz
22
23	USE_XLIB= yes	24	USE_XLIB= yes
24	DIST_SUBDIR= chipmunk
25	USE_GMAKE= yes	25	USE_GMAKE= yes
26	NO_WRKSUBDIR= yes
27		26
28	post-extract:	27	post-extract:
29	@${CP} ${DISTDIR}/${DIST_SUBDIR}/Makefile ${WRKSRC}/Makefile	28	@${CP} -f ${DISTDIR}/${DIST_SUBDIR}/Makefile ${WRKSRC}/Makefile
30
31	post-patch:
32	@find ${WRKSRC} -name Makefile -exec \
33	${PERL} -pi -e "s\|%%PREFIX%%\|${PREFIX}\|g" \{} \;
34	@find ${WRKSRC} -name Makefile -exec \
35	${PERL} -pi -e "s\|%%X11BASE%%\|${X11BASE}\|g" \{} \;
36		29
37	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-30 Link Here

(-)cad/chipmunk/files/patch-ad (-28 / +35 lines)
1	--- log/src/Makefile.orig Tue Jul 20 16:10:36 1999	1	--- log/src/Makefile.orig Tue May 14 03:08:21 2002
2	+++ log/src/Makefile Tue Feb 20 14:18:59 2001	2	+++ log/src/Makefile Sat May 18 15:49:22 2002
3	@@ -45,8 +45,8 @@	3	@@ -45,8 +45,8 @@
4		4
5	CD = cd	5	CD = cd
6		6
7	-LOGLIBDIR = `$(CD) ../../log/lib; pwd`	7	-LOGLIBDIR = `$(CD) ../../log/lib; pwd`
8	-LIBDIR = `$(CD) ../../lib; pwd`	8	-LIBDIR = `$(CD) ../../lib; pwd`
9	+LOGLIBDIR = %%PREFIX%%/share/chipmunk	9	+LOGLIBDIR = ${PREFIX}/share/chipmunk
10	+LIBDIR = %%PREFIX%%/share/chipmunk	10	+LIBDIR = ${PREFIX}/share/chipmunk
11		11
12	LOCINC = ../../psys/include	12	LOCINC = ../../psys/include
13		13
14	@@ -63,9 +63,10 @@	14	@@ -63,9 +63,9 @@
15	## or some other directory, depending on your installation.	15	## or some other directory, depending on your installation.
16	##	16	##
17		17
18	-XINCLUDEDIR = .	18	-XINCLUDEDIR = .
19	+XINCLUDEDIR = %%X11BASE%%/include	19	+XINCLUDEDIR = ${X11BASE}/include
20	+XLIBDIR = %%X11BASE%%/lib
21		20
22	-BINDIR = ../../bin	21	-BINDIR = ../../bin
23	+BINDIR = %%PREFIX%%/bin	22	+BINDIR = ${PREFIX}/bin
24	LIBP2C = ../../psys/src/libp2c.a	23	LIBP2C = ../../psys/src/libp2c.a
25		24
26	##	25	##
27	@@ -91,7 +92,7 @@	26	@@ -81,7 +81,7 @@
		27	## depending on your installation.
		28	##
		29
		30	-LIBX11 = -lX11
		31	+LIBX11 = -lX11 -L${X11BASE}/lib
		32
		33	##
		34	## (2) Library additions
		35	@@ -91,7 +91,7 @@
28	##	36	##
29	## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS	37	## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS
30		38
Lines 33-74 Link Here
33		41
34		42
35	##	43	##
36	@@ -110,7 +111,7 @@	44	@@ -110,7 +110,7 @@
37		45
38	CHIPMUNKCC = gcc -O2	46	CHIPMUNKCC = gcc -O3
39		47
40	-CC = $(CHIPMUNKCC)	48	-CC = $(CHIPMUNKCC)
41	+CC ?= $(CHIPMUNKCC)	49	+CC ?= $(CHIPMUNKCC)
42		50
43	##	51	##
44	## (4) Adding appropriate flags	52	## (4) Adding appropriate flags
45	@@ -145,7 +146,7 @@	53	@@ -147,7 +147,7 @@
46	## -m68040 : for 68040 and 68060
47	##
48		54
49	-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0	55	CHIPMUNKFLAGS =
50	+CFLAGS += -DBSD -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0 -L$(XLIBDIR)	56
		57	-CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0
		58	+CFLAGS += -DBSD -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0
51		59
52	DIGOBJ = logsim.o logdig.o logsimasm.o logsimed.o diggates.o \	60	DIGOBJ = logsim.o logdig.o logsimasm.o logsimed.o diggates.o \
53	loghier.o logsimh.o swap.o	61	loghier.o logsimh.o swap.o
54	@@ -178,11 +179,13 @@	62	@@ -178,22 +178,24 @@
		63	## older operating systems -- if problems arise, use a hard link.
55	##	64	##
56		65
		66	+all: makeana main
		67	+
57	install: all	68	install: all
58	- cp log $(BINDIR)/diglog	69	- cp log $(BINDIR)/diglog
59	+ install -c -s log $(BINDIR)/diglog	70	+ ${BSD_INSTALL_PROGRAM} log $(BINDIR)/diglog
60	-rm -f $(BINDIR)/analog	71	-rm -f $(BINDIR)/analog
61	-ln $(BINDIR)/diglog $(BINDIR)/analog	72	-(cd $(BINDIR); ln -s diglog analog)
62	- cp loged $(BINDIR)/loged	73	- cp loged $(BINDIR)/loged
63	- cp fixfet7 $(BINDIR)/fixfet7	74	- cp fixfet7 $(BINDIR)/fixfet7
64	+ install -c -s loged $(BINDIR)	75	+ ${BSD_INSTALL_PROGRAM} loged $(BINDIR)/loged
65	+ install -c fixfet7 $(BINDIR)	76	+ ${BSD_INSTALL_SCRIPT} fixfet7 $(BINDIR)/fixfet7
66	+ cp -R ../lib/* $(LOGLIBDIR)	77	+ cp -R ../lib/* $(LOGLIBDIR)
67	+ chmod -R a=r+X $(LOGLIBDIR)	78	+ chmod -R a=r+X $(LOGLIBDIR)
68		79
69	clean:	80	clean:
70	-rm -f .o ana/.o log loged	81	-rm -f .o ana/.o log loged
71	@@ -192,12 +195,12 @@	82
		83	-all: makeana main
		84	-
72	main: log loged	85	main: log loged
73		86
74	makeana:	87	makeana:
Lines 77-85 Link Here
77		90
78		91
79	LOGOBJ = log.o $(TOOLOBJ) logstuff.o logdef.o	92	LOGOBJ = log.o $(TOOLOBJ) logstuff.o logdef.o
80
81	-log: $(LOGOBJ) tooldir.o $(LIBP2C) makeana
82	+log: $(LOGOBJ) tooldir.o $(LIBP2C)
83	$(CC) $(CFLAGS) tooldir.o $(LOGOBJ) $(LIBP2C) $(LIBX11) \
84	$(OTHERLIBS) -o log
85

Lines 1-16 Link Here

(-)cad/chipmunk/files/patch-ae (-8 / +8 lines)
1	--- log/src/ana/Makefile.orig Wed Jul 21 04:10:58 1999	1	--- log/src/ana/Makefile.orig Sat May 18 12:02:28 2002
2	+++ log/src/ana/Makefile Mon Sep 20 06:46:41 1999	2	+++ log/src/ana/Makefile Sat May 18 12:46:53 2002
3	@@ -25,7 +25,7 @@	3	@@ -25,7 +25,7 @@
4		4
5		5
6	LOCINC = ../../../psys/include	6	LOCINC = ../../../psys/include
7	-XINCLUDEDIR = .	7	-XINCLUDEDIR = .
8	+XINCLUDEDIR = %%X11BASE%%/include	8	+XINCLUDEDIR = ${X11BASE}/include
9		9
10	##	10	##
11	## (1) Choosing your compiler	11	## (1) Choosing your compiler
12	@@ -46,7 +46,7 @@	12	@@ -46,7 +46,7 @@
13	CHIPMUNKCC = gcc -O2	13	CHIPMUNKCC = gcc -O3
14		14
15		15
16	-CC = $(CHIPMUNKCC)	16	-CC = $(CHIPMUNKCC)
Lines 18-28 Link Here
18		18
19	##	19	##
20	## (2) Adding appropriate flags	20	## (2) Adding appropriate flags
21	@@ -80,7 +80,7 @@	21	@@ -84,7 +84,7 @@
22	##
23
24		22
25	-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR)	23	CHIPMUNKFLAGS =
		24
		25	-CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR)
26	+CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR)	26	+CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR)
27		27
28	ANAOBJ = globals.o nsolver.o main.o inter.o $(GATESOBJ)	28	ANAOBJ = globals.o nsolver.o main.o inter.o $(GATESOBJ)

Lines 1-38 Link Here

(-)cad/chipmunk/files/patch-af (-20 / +14 lines)
1	--- mosis/Makefile.orig Wed Aug 3 03:31:44 1994	1	--- mosis/Makefile.orig Tue Aug 7 09:25:31 2001
2	+++ mosis/Makefile Tue Sep 21 06:22:09 1999	2	+++ mosis/Makefile Sat May 18 15:59:51 2002
3	@@ -23,6 +23,8 @@	3	@@ -23,6 +23,8 @@
4	#	4	#
5	#	5	#
6		6
7	+BINDIR = %%PREFIX%%/bin	7	+BINDIR = ${PREFIX}/bin
8	+	8	+
9	##	9	##
10	## (1) Choosing your compiler	10	## (1) Choosing your compiler
11	## ---------------------------	11	## ---------------------------
12	@@ -48,10 +50,11 @@	12	@@ -48,10 +50,10 @@
13	##	13	##
14		14
15		15
16	-CC = gcc	16	-CC = gcc
17	+CC ?= gcc	17	+CC ?= gcc
18		18
19	LIBX11 = -lX11	19	-LIBX11 = -lX11
20	-XINCLUDEDIR = .	20	-XINCLUDEDIR = .
21	+XINCLUDEDIR = %%X11BASE%%/include	21	+LIBX11 = -lX11 -L${X11BASE}/lib
22	+XLIBDIR = %%X11BASE%%/lib	22	+XINCLUDEDIR = ${X11BASE}/include
23		23
24	##	24	##
25	## (2) Adding appropriate flags	25	## (2) Adding appropriate flags
26	@@ -91,7 +94,7 @@	26	@@ -88,7 +90,7 @@
27	## CFLAGS = -ansi	27
28	##	28	CHIPMUNKFLAGS =
29		29
30	-CFLAGS = -O -I../psys/include -I$(XINCLUDEDIR)	30	-CFLAGS = $(CHIPMUNKFLAGS) -O -I../psys/include -I$(XINCLUDEDIR)
31	+CFLAGS += -DBSD -DF_OK -I../psys/include -I$(XINCLUDEDIR)	31	+CFLAGS += -DBSD -DF_OK -I../psys/include -I$(XINCLUDEDIR)
32		32
33	##	33	##
34	## (3) Library additions	34	## (3) Library additions
35	@@ -99,20 +102,20 @@	35	@@ -96,7 +98,7 @@
36	##	36	##
37	## on some systems, -ldl must be added to the following line	37	## on some systems, -ldl must be added to the following line
38		38
Lines 41-58 Link Here
41		41
42	##	42	##
43	##	43	##
44	##	44	@@ -109,7 +111,7 @@
45
46
47	-LDFLAGS = ../psys/src/libp2c.a $(OTHERLIBS) $(LIBX11)
48	+LDFLAGS += ../psys/src/libp2c.a $(OTHERLIBS) $(LIBX11) -L$(XLIBDIR)
49
50	mosis: mosis.o
51	$(CC) -o mosis mosis.o $(LDFLAGS)	45	$(CC) -o mosis mosis.o $(LDFLAGS)
52		46
53	install: mosis	47	install: mosis
54	- cp mosis ../bin/mosis	48	- cp mosis ../bin/mosis
55	+ install -c -s mosis $(BINDIR)	49	+ ${BSD_INSTALL_PROGRAM} mosis $(BINDIR)
56		50
57	clean:	51	clean:
58	rm -f *.o mosis	52	rm -f *.o mosis

Lines 1-37 Link Here

(-)cad/chipmunk/files/patch-ag (-8 / +12 lines)
1	--- netcmp/Makefile.orig Wed Mar 12 02:41:59 1997	1	--- netcmp/Makefile.orig Sat Aug 18 07:49:31 2001
2	+++ netcmp/Makefile Mon Sep 20 06:53:59 1999	2	+++ netcmp/Makefile Sat May 18 14:46:26 2002
3	@@ -22,7 +22,7 @@	3	@@ -22,7 +22,7 @@
4	#	4	#
5	# netcmp makefile	5	# netcmp makefile
6		6
7	-BINDIR= ../bin	7	-BINDIR= ../bin
8	+BINDIR= %%PREFIX%%/bin	8	+BINDIR= ${PREFIX}/bin
9		9
10	##	10	##
11	## (1) Choosing your compiler	11	## (1) Choosing your compiler
12	@@ -48,7 +48,7 @@	12	@@ -48,7 +48,7 @@
13	## For SGI, cc is recommended	13	## For SGI, cc is recommended
14		14
15	CHIPMUNKCC = gcc	15	CHIPMUNKCC = gcc -O3
16	-CC = $(CHIPMUNKCC)	16	-CC = $(CHIPMUNKCC)
17	+CC ?= $(CHIPMUNKCC)	17	+CC ?= $(CHIPMUNKCC)
18		18
19	##	19	##
20	## (2) Adding appropriate flags	20	## (2) Adding appropriate flags
21	@@ -90,13 +90,13 @@	21	@@ -90,15 +90,17 @@
22	## -ansi	22	## -ansi
23	##	23	##
24		24
25	-CFLAGS =	25	+OTHERLIBS = -lcompat
		26	+
		27	CHIPMUNKFLAGS =
		28
		29	-CFLAGS = $(CHIPMUNKFLAGS)
26	+CFLAGS += -DBSD -DF_OK	30	+CFLAGS += -DBSD -DF_OK
27		31
28	netcmp: main.o parser.o datastruct.o compare.o	32	netcmp: main.o parser.o datastruct.o compare.o
29	- $(CC) parser.o datastruct.o compare.o main.o -o netcmp	33	- $(CC) parser.o datastruct.o compare.o main.o -o netcmp
30	+ $(CC) parser.o datastruct.o compare.o main.o -lcompat -o netcmp	34	+ $(CC) parser.o datastruct.o compare.o main.o $(OTHERLIBS) -o netcmp
31		35
32	install: netcmp	36	install: netcmp
33	- cp netcmp $(BINDIR)	37	- cp netcmp $(BINDIR)
34	+ install -c -s netcmp $(BINDIR)	38	+ ${BSD_INSTALL_PROGRAM} netcmp $(BINDIR)
35		39
36	clean:	40	clean:
37	-rm -f *.o netcmp	41	-rm -f *.o netcmp

Lines 1-27 Link Here

(-)cad/chipmunk/files/patch-ah (-14 / +13 lines)
1	--- psys/src/Makefile.orig Wed Jul 21 04:06:28 1999	1	--- psys/src/Makefile.orig Sat Mar 2 06:39:14 2002
2	+++ psys/src/Makefile Mon Sep 20 06:38:54 1999	2	+++ psys/src/Makefile Sat May 18 13:25:17 2002
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"
6		6
7	-LIBDIR = ../../lib	7	-LIBDIR = ../../lib
8	-BINDIR = ../../bin	8	-BINDIR = ../../bin
9	+LIBDIR = %%PREFIX%%/share/chipmunk	9	+LIBDIR = ${PREFIX}/share/chipmunk
10	+BINDIR = %%PREFIX%%/bin	10	+BINDIR = ${PREFIX}/bin
11		11
12		12
13	LIB = ../libp2c.a	13	LIB = ../libp2c.a
14	@@ -51,7 +51,8 @@	14	@@ -51,7 +51,7 @@
15	## or some other directory, depending on your installation.	15	## or some other directory, depending on your installation.
16	##	16	##
17		17
18	-XINCLUDEDIR = .	18	-XINCLUDEDIR = .
19	+XINCLUDEDIR = %%X11BASE%%/include	19	+XINCLUDEDIR = ${X11BASE}/include
20	+XLIBDIR = %%X11BASE%%/lib
21		20
22	##	21	##
23	## (1) Choosing your compiler	22	## (1) Choosing your compiler
24	@@ -101,7 +102,7 @@	23	@@ -101,7 +101,7 @@
25	LIBSTUFF = texstuff.ps untilstuff.ps plot.font	24	LIBSTUFF = texstuff.ps untilstuff.ps plot.font
26		25
27		26
Lines 30-45 Link Here
30		29
31		30
32	##	31	##
33	@@ -147,7 +148,7 @@	32	@@ -149,7 +149,7 @@
34	## -m68040 : for 68040 and 68060	33
35	##	34	CHIPMUNKFLAGS =
36		35
37	-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"`$(CD) $(LIBDIR); pwd`\"	36	-CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"`$(CD) $(LIBDIR); pwd`\"
38	+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"$(LIBDIR)\" -L$(XLIBDIR)	37	+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"$(LIBDIR)\"
39		38
40	P2CFLAGS = -DLOCAL_INIT=_local_p2c_init	39	P2CFLAGS = -DLOCAL_INIT=_local_p2c_init
41		40
42	@@ -163,7 +164,7 @@	41	@@ -165,7 +165,7 @@
43	## below; however the "-" allows this to be non-fatal and thus not essential	42	## below; however the "-" allows this to be non-fatal and thus not essential
44	## to delete	43	## to delete
45		44

Lines 1-16 Link Here

(-)cad/chipmunk/files/patch-aj (-28 / +31 lines)
1	--- until/V1.2/Makefile.orig Tue Sep 22 19:04:26 1998	1	--- until/V1.2/Makefile.orig Sat May 18 12:02:28 2002
2	+++ until/V1.2/Makefile Tue Feb 20 14:20:29 2001	2	+++ until/V1.2/Makefile Sat May 18 12:57:40 2002
3	@@ -41,7 +41,8 @@	3	@@ -41,7 +41,7 @@
4	##	4	##
5		5
6		6
7	-XINCLUDEDIR = .	7	-XINCLUDEDIR = .
8	+XINCLUDEDIR = %%X11BASE%%/include	8	+XINCLUDEDIR = ${X11BASE}/include
9	+XLIBDIR = %%X11BASE%%/lib
10		9
11	##	10	##
12	## If X isn't in the library path (the case for many MachTen and Linux	11	## If X isn't in the library path (the case for many MachTen and Linux
13	@@ -68,7 +69,7 @@	12	@@ -57,7 +57,7 @@
		13	##
		14
		15
		16	-LIBX11 = -lX11
		17	+LIBX11 = -lX11 -L${X11BASE}/lib
		18
		19
		20	LIBP2C = ../../psys/src/libp2c.a
		21	@@ -68,7 +68,7 @@
14	##	22	##
15	## on some systems, -ldl must be added to the following line	23	## on some systems, -ldl must be added to the following line
16		24
Lines 19-25 Link Here
19		27
20	##	28	##
21	## (2) Choosing your compiler	29	## (2) Choosing your compiler
22	@@ -98,10 +99,10 @@	30	@@ -98,10 +98,10 @@
23		31
24		32
25	CHIPMUNKCC = gcc	33	CHIPMUNKCC = gcc
Lines 28-66 Link Here
28		36
29	-BINDIR = ../../bin	37	-BINDIR = ../../bin
30	-LIBDIR = `pwd`/../../lib	38	-LIBDIR = `pwd`/../../lib
31	+BINDIR = %%PREFIX%%/bin	39	+BINDIR = ${PREFIX}/bin
32	+LIBDIR = %%PREFIX%%/share/chipmunk	40	+LIBDIR = ${PREFIX}/share/chipmunk
33		41
34	SYSRC = $(LIBDIR)/system.untilrc	42	SYSRC = $(LIBDIR)/system.untilrc
35	SYSPS = $(LIBDIR)/pensps.map	43	SYSPS = $(LIBDIR)/pensps.map
36	@@ -161,11 +162,11 @@	44	@@ -165,7 +165,7 @@
37	##
38		45
39		46	CHIPMUNKFLAGS =
40	-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR) \	47
		48	-CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) \
41	+CFLAGS += -DBSD -I$(LOCINC) -I$(XINCLUDEDIR) \	49	+CFLAGS += -DBSD -I$(LOCINC) -I$(XINCLUDEDIR) \
42	-DF_OK=0 -DUNTILRC=\"$(SYSRC)\" -DUNTILPSMAP=\"$(SYSPS)\" \	50	-DF_OK=0 -DUNTILRC=\"$(SYSRC)\" -DUNTILPSMAP=\"$(SYSPS)\" \
43	-DUNTILHEADER=\"$(SYSHD)\"	51	-DUNTILHEADER=\"$(SYSHD)\"
44		52
45	-LDFLAGS = $(LIBP2C) $(LIBX11) $(OTHERLIBS)	53	@@ -199,11 +199,11 @@
46	+LDFLAGS += $(LIBP2C) $(LIBX11) $(OTHERLIBS) -L$(XLIBDIR)
47
48	OBJS = bb_stuff.o cnf_stuff.o crt_stuff.o data_types.o datawalk.o \
49	dispmod.o ffman.o gr_stuff.o main.o mat_stuff.o menu.o menu_stuff.o \
50	@@ -195,11 +196,15 @@
51	## Until as its moved to bin; non ksh-users may wish to change it back.	54	## Until as its moved to bin; non ksh-users may wish to change it back.
52		55
53	install: until	56	install: until
54	- cp until $(BINDIR)/Until	57	- cp until $(BINDIR)/Until
55	+ install -c -s until $(BINDIR)/Until	58	- cp pensps.map $(LIBDIR)/pensps.map
56	cp pensps.map $(LIBDIR)/pensps.map	59	- cp system.untilrc $(LIBDIR)/system.untilrc
57	+ chmod 0444 $(LIBDIR)/pensps.map	60	- cp until.pro $(LIBDIR)/until.pro
58	cp system.untilrc $(LIBDIR)/system.untilrc	61	- cp until.ps $(LIBDIR)/until.ps
59	+ chmod 0444 $(LIBDIR)/system.untilrc	62	+ ${BSD_INSTALL_PROGRAM} until $(BINDIR)/Until
60	cp until.pro $(LIBDIR)/until.pro	63	+ ${BSD_INSTALL_DATA} pensps.map $(LIBDIR)/pensps.map
61	+ chmod 0444 $(LIBDIR)/until.pro	64	+ ${BSD_INSTALL_DATA} system.untilrc $(LIBDIR)/system.untilrc
62	cp until.ps $(LIBDIR)/until.ps	65	+ ${BSD_INSTALL_DATA} until.pro $(LIBDIR)/until.pro
63	+ chmod 0444 $(LIBDIR)/until.ps	66	+ ${BSD_INSTALL_DATA} until.ps $(LIBDIR)/until.ps
64		67
65		68
66	bb_stuff.o : bb_stuff.c bb_stuff.h	69	bb_stuff.o : bb_stuff.c bb_stuff.h

Lines 1-11 Link Here

(-)cad/chipmunk/files/patch-al (-3 / +3 lines)
1	--- util/boxify/Makefile.orig Wed Mar 12 02:47:23 1997	1	--- util/boxify/Makefile.orig Wed Mar 12 02:47:23 1997
2	+++ util/boxify/Makefile Tue Sep 21 21:29:44 1999	2	+++ util/boxify/Makefile Sat May 18 13:12:54 2002
3	@@ -21,7 +21,7 @@	3	@@ -21,7 +21,7 @@
4	#	4	#
5	# boxify makefile	5	# boxify makefile
6		6
7	-BINDIR= ../../bin	7	-BINDIR= ../../bin
8	+BINDIR= %%PREFIX%%/bin	8	+BINDIR= ${PREFIX}/bin
9		9
10	##	10	##
11	## (1) Choosing your compiler	11	## (1) Choosing your compiler
Lines 40-46 Link Here
40		40
41	install: boxify	41	install: boxify
42	- cp boxify $(BINDIR)	42	- cp boxify $(BINDIR)
43	+ install -c -s boxify $(BINDIR)	43	+ ${BSD_INSTALL_PROGRAM} -c -s boxify $(BINDIR)
44		44
45	clean:	45	clean:
46	- (cd trapes; make clean)	46	- (cd trapes; make clean)

Lines 1-17 Link Here

(-)cad/chipmunk/files/patch-ao (-4 / +4 lines)
1	--- util/conscripts/Makefile.orig Wed Mar 12 02:47:25 1997	1	--- util/conscripts/Makefile.orig Wed Mar 12 02:47:25 1997
2	+++ util/conscripts/Makefile Tue Sep 21 03:36:32 1999	2	+++ util/conscripts/Makefile Sat May 18 13:13:47 2002
3	@@ -18,11 +18,11 @@	3	@@ -18,11 +18,11 @@
4	#	4	#
5	# mconvert makefile	5	# mconvert makefile
6		6
7	-BINDIR= ../../bin	7	-BINDIR= ../../bin
8	+BINDIR= %%PREFIX%%/bin	8	+BINDIR= ${PREFIX}/bin
9		9
10	install:	10	install:
11	- cp mconvert $(BINDIR)	11	- cp mconvert $(BINDIR)
12	- cp unmconvert $(BINDIR)	12	- cp unmconvert $(BINDIR)
13	+ install -c mconvert $(BINDIR)	13	+ ${BSD_INSTALL_SCRIPT} mconvert $(BINDIR)
14	+ install -c unmconvert $(BINDIR)	14	+ ${BSD_INSTALL_SCRIPT} unmconvert $(BINDIR)
15		15
16	clean:	16	clean:
17	-rm -f *.o	17	-rm -f *.o

Lines 1-11 Link Here

(-)cad/chipmunk/files/patch-ap (-3 / +3 lines)
1	--- util/sctomat/Makefile.orig Wed Mar 12 02:47:26 1997	1	--- util/sctomat/Makefile.orig Wed Mar 12 02:47:26 1997
2	+++ util/sctomat/Makefile Tue Sep 21 03:37:35 1999	2	+++ util/sctomat/Makefile Sat May 18 13:14:35 2002
3	@@ -5,7 +5,7 @@	3	@@ -5,7 +5,7 @@
4	#	4	#
5	# sctomat makefile	5	# sctomat makefile
6		6
7	-BINDIR= ../../bin	7	-BINDIR= ../../bin
8	+BINDIR= %%PREFIX%%/bin	8	+BINDIR= ${PREFIX}/bin
9		9
10	##	10	##
11	## (1) Choosing your compiler	11	## (1) Choosing your compiler
Lines 31-37 Link Here
31		31
32	install: scope_to_mat	32	install: scope_to_mat
33	- cp scope_to_mat $(BINDIR)	33	- cp scope_to_mat $(BINDIR)
34	+ install -c -s scope_to_mat $(BINDIR)	34	+ ${BSD_INSTALL_PROGRAM} scope_to_mat $(BINDIR)
35		35
36	clean:	36	clean:
37	-rm -f *.o scope_to_mat	37	-rm -f *.o scope_to_mat

Lines 1-11 Link Here

(-)cad/chipmunk/files/patch-ar (-4 / +4 lines)
1	--- util/spc-tools/sf/Makefile.orig Wed Mar 12 02:47:29 1997	1	--- util/spc-tools/sf/Makefile.orig Wed Mar 12 02:47:29 1997
2	+++ util/spc-tools/sf/Makefile Tue Sep 21 03:41:57 1999	2	+++ util/spc-tools/sf/Makefile Sat May 18 13:15:35 2002
3	@@ -18,7 +18,7 @@	3	@@ -18,7 +18,7 @@
4	#	4	#
5	# sf makefile	5	# sf makefile
6		6
7	-BINDIR= ../../../bin	7	-BINDIR= ../../../bin
8	+BINDIR= %%PREFIX%%/bin	8	+BINDIR= ${PREFIX}/bin
9		9
10	##	10	##
11	## (1) Choosing your compiler	11	## (1) Choosing your compiler
Lines 23-36 Link Here
23	##	23	##
24		24
25	-CFLAGS =	25	-CFLAGS =
26	+CFLAGS = -DBSD -DF_OK=0	26	+CFLAGS += -DBSD -DF_OK=0
27		27
28	sf: sf.o hash.o spice.o	28	sf: sf.o hash.o spice.o
29	$(CC) sf.o hash.o spice.o -o sf	29	$(CC) sf.o hash.o spice.o -o sf
30		30
31	install: sf	31	install: sf
32	- cp sf $(BINDIR)	32	- cp sf $(BINDIR)
33	+ install -c -s sf $(BINDIR)	33	+ ${BSD_INSTALL_PROGRAM} sf $(BINDIR)
34		34
35	clean:	35	clean:
36	-rm -f *.o sf	36	-rm -f *.o sf

Lines 1-11 Link Here

(-)cad/chipmunk/files/patch-as (-4 / +4 lines)
1	--- util/spc-tools/ss/Makefile.orig Wed Mar 12 02:47:27 1997	1	--- util/spc-tools/ss/Makefile.orig Wed Mar 12 02:47:27 1997
2	+++ util/spc-tools/ss/Makefile Tue Sep 21 03:40:50 1999	2	+++ util/spc-tools/ss/Makefile Sat May 18 13:16:25 2002
3	@@ -18,7 +18,7 @@	3	@@ -18,7 +18,7 @@
4	#	4	#
5	# ss makefile	5	# ss makefile
6		6
7	-BINDIR= ../../../bin	7	-BINDIR= ../../../bin
8	+BINDIR= %%PREFIX%%/bin	8	+BINDIR= ${PREFIX}/bin
9		9
10	##	10	##
11	## (1) Choosing your compiler	11	## (1) Choosing your compiler
Lines 31-38 Link Here
31	install: ss	31	install: ss
32	- cp ss $(BINDIR)	32	- cp ss $(BINDIR)
33	- cp test/ucbsim $(BINDIR)	33	- cp test/ucbsim $(BINDIR)
34	+ install -c -s ss $(BINDIR)	34	+ ${BSD_INSTALL_PROGRAM} ss $(BINDIR)
35	+ install -c test/ucbsim $(BINDIR)	35	+ ${BSD_INSTALL_SCRIPT} test/ucbsim $(BINDIR)
36		36
37	clean:	37	clean:
38	-rm -f *.o ss	38	-rm -f *.o ss

Lines 1-16 Link Here

(-)cad/chipmunk/files/patch-au (-17 / +24 lines)
1	--- view/Makefile.orig Wed Mar 12 02:50:04 1997	1	--- view/Makefile.orig Sat May 18 12:02:28 2002
2	+++ view/Makefile Mon Sep 20 07:19:44 1999	2	+++ view/Makefile Sat May 18 12:59:50 2002
3	@@ -41,7 +41,8 @@	3	@@ -40,7 +40,7 @@
4	## or some other directory, depending on your installation.	4	## or some other directory, depending on your installation.
5	##	5	##
6		6
7	-XINCLUDEDIR = .	7	-XINCLUDEDIR = .
8	+XINCLUDEDIR = %%X11BASE%%/include	8	+XINCLUDEDIR = ${X11BASE}/include
9	+XLIBDIR = %%X11BASE%%/lib
10		9
11	##	10	##
12	## If X isn't in the library path (the case for many MachTen and Linux	11	## If X isn't in the library path (the case for many MachTen and Linux
13	@@ -68,7 +69,7 @@	12	@@ -55,7 +55,7 @@
		13	## depending on your installation.
		14	##
		15
		16	-LIBX11 = -lX11
		17	+LIBX11 = -lX11 -L${X11BASE}/lib
		18
		19	LIBP2C = ../psys/src/libp2c.a
		20
		21	@@ -67,7 +67,7 @@
14	##	22	##
15	## 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
16		24
Lines 19-54 Link Here
19		27
20	##	28	##
21	## (2) IEEE library directory	29	## (2) IEEE library directory
22	@@ -115,7 +116,7 @@	30	@@ -114,7 +114,7 @@
23		31
24	CHIPMUNKCC = gcc -O2	32	CHIPMUNKCC = gcc -O3
25		33
26	-CC = $(CHIPMUNKCC)	34	-CC = $(CHIPMUNKCC)
27	+CC ?= $(CHIPMUNKCC)	35	+CC ?= $(CHIPMUNKCC)
28		36
29	##	37	##
30	## (4) Adding appropriate flags	38	## (4) Adding appropriate flags
31	@@ -171,11 +172,11 @@	39	@@ -172,11 +172,11 @@
32	## in view rule	40
33	##	41	CHIPMUNKFLAGS =
34		42
35	-CFLAGS= -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0	43	-CFLAGS= $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
36	+CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0	44	+CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
37		45
38	-LDFLAGS= $(LIBP2C) $(LIBX11) $(OTHERLIBS)	46	LDFLAGS= $(LIBP2C) $(LIBX11) $(OTHERLIBS)
39	+LDFLAGS += $(LIBP2C) $(LIBX11) $(OTHERLIBS) -L$(XLIBDIR)
40	MYLDFLAGS= $(LIBP2C) $(IEEEDIR) $(LIBX11) $(OTHERLIBS)	47	MYLDFLAGS= $(LIBP2C) $(IEEEDIR) $(LIBX11) $(OTHERLIBS)
41	-BINDIR= ../bin	48	-BINDIR= ../bin
42	+BINDIR = %%PREFIX%%/bin	49	+BINDIR = ${PREFIX}/bin
43		50
44	OBJS = \	51	OBJS = \
45	viewfit.o \	52	viewfit.o \
46	@@ -243,7 +244,7 @@	53	@@ -244,7 +244,7 @@
47	(chdir mt; make; chdir ..; chdir tek2430; make; chdir ..; make mtlink)	54	(chdir mt; make; chdir ..; chdir tek2430; make; chdir ..; make mtlink)
48		55
49	install: view	56	install: view
50	- cp view $(BINDIR)/vc	57	- cp view $(BINDIR)/vc
51	+ install -c -s view $(BINDIR)/vc	58	+ ${BSD_INSTALL_PROGRAM} view $(BINDIR)/vc
52		59
53	myinstall: myview	60	myinstall: myview
54	cp view ../bin/myview	61	cp view ../bin/myview

Lines 1-16 Link Here

(-)cad/chipmunk/files/patch-ay (-20 / +25 lines)
1	--- wol/Makefile.orig Wed Mar 12 02:51:43 1997	1	--- wol/Makefile.orig Sat May 18 12:02:28 2002
2	+++ wol/Makefile Mon Sep 20 07:08:14 1999	2	+++ wol/Makefile Sat May 18 13:01:59 2002
3	@@ -39,7 +39,8 @@	3	@@ -39,7 +39,7 @@
4	## or some other directory, depending on your installation.	4	## or some other directory, depending on your installation.
5	##	5	##
6		6
7	-XINCLUDEDIR = .	7	-XINCLUDEDIR = .
8	+XINCLUDEDIR = %%X11BASE%%/include	8	+XINCLUDEDIR = ${X11BASE}/include
9	+XLIBDIR = %%X11BASE%%/lib
10		9
11	##	10	##
12	## If X isn't in the library path (the case for many MachTen and Linux	11	## If X isn't in the library path (the case for many MachTen and Linux
13	@@ -66,7 +67,7 @@	12	@@ -54,7 +54,7 @@
		13	## depending on your installation.
		14	##
		15
		16	-LIBX11 = -lX11
		17	+LIBX11 = -lX11 -L${X11BASE}/lib
		18
		19
		20
		21	@@ -66,7 +66,7 @@
14	##	22	##
15	## on some systems, -ldl must be added to the following line	23	## on some systems, -ldl must be added to the following line
16		24
Lines 19-57 Link Here
19		27
20		28
21	##	29	##
22	@@ -97,11 +98,11 @@	30	@@ -97,11 +97,11 @@
23	##	31	##
24		32
25	CHIPMUNKCC = gcc	33	CHIPMUNKCC = gcc -O3
26	-CC = $(CHIPMUNKCC)	34	-CC = $(CHIPMUNKCC)
27	+CC ?= $(CHIPMUNKCC)	35	+CC ?= $(CHIPMUNKCC)
28		36
29	-LIBDIR = `pwd`/	37	-LIBDIR = `pwd`/
30	+LIBDIR = %%PREFIX%%/share/chipmunk	38	+LIBDIR = ${PREFIX}/share/chipmunk
31	WOLPL = $(LIBDIR)	39	WOLPL = $(LIBDIR)
32	-BINDIR = ../bin	40	-BINDIR = ../bin
33	+BINDIR = %%PREFIX%%/bin	41	+BINDIR = ${PREFIX}/bin
34		42
35		43
36	##	44	##
37	@@ -155,9 +156,9 @@	45	@@ -157,7 +157,7 @@
38	## in view rule	46
39	##	47	CHIPMUNKFLAGS =
40		48
41	-CFLAGS= -I$(LOCINC) -I$(XINCLUDEDIR) -DWOLLIBDIR=\"$(WOLPL)\"	49	-CFLAGS= $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DWOLLIBDIR=\"$(WOLPL)\"
42	+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -DWOLLIBDIR=\"$(WOLPL)\"	50	+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -DWOLLIBDIR=\"$(WOLPL)\"
43		51
44	-LDFLAGS= $(LIBP2C) $(LIBX11) $(OTHERLIBS)	52	LDFLAGS= $(LIBP2C) $(LIBX11) $(OTHERLIBS)
45	+LDFLAGS += $(LIBP2C) $(LIBX11) $(OTHERLIBS) -L$(XLIBDIR)
46		53
47	OBJ = \	54	@@ -200,7 +200,7 @@
48	cell_stuff.o \
49	@@ -198,7 +199,7 @@
50		55
51		56
52	install: wol	57	install: wol
53	- cp wol $(BINDIR)	58	- cp wol $(BINDIR)
54	+ install -c -s wol $(BINDIR)	59	+ ${BSD_INSTALL_PROGRAM} wol $(BINDIR)
55		60
56	clean:	61	clean:
57	-rm -f *.o wol	62	-rm -f *.o wol

Lines 1-25 Link Here

(-)cad/chipmunk/files/patch-az (-10 / +9 lines)
1	--- wolcomp/Makefile.orig Wed Mar 12 02:53:32 1997	1	--- wolcomp/Makefile.orig Sat May 18 12:02:28 2002
2	+++ wolcomp/Makefile Mon Sep 20 07:10:09 1999	2	+++ wolcomp/Makefile Sat May 18 13:03:14 2002
3	@@ -52,10 +52,11 @@	3	@@ -52,10 +52,10 @@
4		4
5		5
6	CHIPMUNKCC = gcc	6	CHIPMUNKCC = gcc -O3
7	-CC = $(CHIPMUNKCC)	7	-CC = $(CHIPMUNKCC)
8	+CC ?= $(CHIPMUNKCC)	8	+CC ?= $(CHIPMUNKCC)
9		9
10	LOCINC = ../psys/include	10	LOCINC = ../psys/include
11	-XINCLUDEDIR = .	11	-XINCLUDEDIR = .
12	+XINCLUDEDIR = %%X11BASE%%/include	12	+XINCLUDEDIR = ${X11BASE}/include
13	+XLIBDIR = %%X11BASE%%/lib
14		13
15	##	14	##
16	## (2) Adding appropriate flags	15	## (2) Adding appropriate flags
17	@@ -109,7 +110,7 @@	16	@@ -109,7 +109,7 @@
18		17
19		18
20		19	CHIPMUNKFLAGS =
21	-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR)	20	-CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR)
22	+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -L$(XLIBDIR)	21	+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR)
23		22
24	install : $(OBJS)	23	install : $(OBJS)
25	-rm -f wolcomp.a	24	-rm -f wolcomp.a