Update to version 5.51

PR:		13902
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
This commit is contained in:
Chris Piazza 1999-09-24 05:11:58 +00:00
parent 0aea472832
commit 1512ff152b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=21907
25 changed files with 921 additions and 65 deletions

View File

@ -1,23 +1,24 @@
# New ports collection makefile for: chipmunk
# Version required: 5.10
# Version required: 5.51
# Date created: 29 July 1995
# Whom: janek@gaja.ipan.lublin.pl
#
# $FreeBSD$
#
DISTNAME= chipmunk-5.10
DISTNAME= chipmunk-5.51
CATEGORIES= cad
MASTER_SITES= ftp://ftp.ifi.uio.no/pub/chipmunk/
DISTFILES= psys-1.10.tar.Z log-5.10.tar.Z netcmpbeta.tar.Z \
mosisbeta.tar.Z wolbeta.tar.Z wolcompbeta.tar.Z \
untilbeta.tar.Z viewbeta.tar.Z Makefile
MASTER_SITES= http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/
DISTFILES= psys-1.51.tar.gz log-5.51.tar.gz netcmpbeta.tar.gz \
mosisbeta.tar.gz wolbeta.tar.gz wolcompbeta.tar.gz \
untilbeta.tar.gz util1.1.tar.gz viewbeta.tar.gz \
Makefile
MAINTAINER= ports@FreeBSD.org
EXTRACT_ONLY= psys-1.10.tar.Z log-5.10.tar.Z netcmpbeta.tar.Z \
mosisbeta.tar.Z wolbeta.tar.Z wolcompbeta.tar.Z \
untilbeta.tar.Z viewbeta.tar.Z
EXTRACT_ONLY= psys-1.51.tar.gz log-5.51.tar.gz netcmpbeta.tar.gz \
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
@ -25,6 +26,12 @@ USE_GMAKE= yes
NO_WRKSUBDIR= yes
post-extract:
${CP} ${DISTDIR}/${DIST_SUBDIR}/Makefile ${WRKSRC}/Makefile
@${CP} ${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>

View File

@ -1,9 +1,10 @@
MD5 (chipmunk/psys-1.10.tar.Z) = 9fc3b15d95eeb578f0257df18f33c1eb
MD5 (chipmunk/log-5.10.tar.Z) = 04ac36348280f57502f47de638664e2c
MD5 (chipmunk/netcmpbeta.tar.Z) = cbaa0f7daa69982f4751d19cb8032c19
MD5 (chipmunk/mosisbeta.tar.Z) = 75e50239a05ded76e6483ff4fd3e3c21
MD5 (chipmunk/wolbeta.tar.Z) = ef7ce33e539b115a4ce9e53b99381ee7
MD5 (chipmunk/wolcompbeta.tar.Z) = 04fbaca9fda01ee5d56b9e338bd4288a
MD5 (chipmunk/untilbeta.tar.Z) = 30ae9559135b327859e487efcbd71cd7
MD5 (chipmunk/viewbeta.tar.Z) = 482eaea901742f47c75df1f5a76e637e
MD5 (chipmunk/Makefile) = 73709e1eae08764bf9796239c6dd2e56
MD5 (chipmunk/psys-1.51.tar.gz) = 98bbe116211568d7022c5bc14fc22cf6
MD5 (chipmunk/log-5.51.tar.gz) = d64ddfd87cfe183dc2612a08c7921dc0
MD5 (chipmunk/netcmpbeta.tar.gz) = 4ae81f28aaf576b8872da9a8fde6c538
MD5 (chipmunk/mosisbeta.tar.gz) = 315e211b901a0f3b8367f51649f8f801
MD5 (chipmunk/wolbeta.tar.gz) = e4771f728b24d1181663a0b0ea55e4fd
MD5 (chipmunk/wolcompbeta.tar.gz) = 06c7b6c94950246f403058580dbb6a08
MD5 (chipmunk/untilbeta.tar.gz) = 6620ffd30693a819f09d814d1379a593
MD5 (chipmunk/util1.1.tar.gz) = f95de90c953e1be6b07dbdd4b034a9c4
MD5 (chipmunk/viewbeta.tar.gz) = e2f8feef9e1353bd2bc9a79671f8cbb9
MD5 (chipmunk/Makefile) = ffec44e157c227bb2b904d338b35dfaf

View File

@ -0,0 +1,37 @@
--- Makefile.orig Mon Sep 20 06:06:10 1999
+++ Makefile Mon Sep 20 06:40:16 1999
@@ -38,10 +38,12 @@
wolcomp \
until/V1.2 \
view
+
+all: makeonly
makeonly: lib bin
for i in $(PACKAGES) ;\
- do (cd $$i ; echo "Making in $$i..."; make $(MFLAGS)); done
+ do (cd $$i ; echo "Making in $$i..."; $(MAKE) $(MFLAGS)); done
World: lib bin clean install
@@ -54,17 +56,17 @@
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
create:
for i in $(PACKAGES) ;\
do (cd $$i ; echo "Making create in $$i..."; \
- make create); done
+ $(MAKE) create); done

View File

@ -0,0 +1,84 @@
--- log/src/Makefile.orig Wed Jul 21 04:10:58 1999
+++ log/src/Makefile Tue Sep 21 02:57:21 1999
@@ -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,10 @@
## 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
##
@@ -91,7 +92,7 @@
##
## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS
-OTHERLIBS= -lm
+OTHERLIBS= -lm -lcompat
##
@@ -110,7 +111,7 @@
CHIPMUNKCC = gcc -O2
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
##
## (4) Adding appropriate flags
@@ -145,7 +146,7 @@
## -m68040 : for 68040 and 68060
##
-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0
+CFLAGS += -DBSD -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0 -L$(XLIBDIR)
DIGOBJ = logsim.o logdig.o logsimasm.o logsimed.o diggates.o \
loghier.o logsimh.o swap.o
@@ -178,11 +179,12 @@
##
install: all
- cp log $(BINDIR)/diglog
+ install -c -s log $(BINDIR)/diglog
-rm -f $(BINDIR)/analog
-ln $(BINDIR)/diglog $(BINDIR)/analog
- cp loged $(BINDIR)/loged
- cp fixfet7 $(BINDIR)/fixfet7
+ install -c -s loged $(BINDIR)
+ install -c fixfet7 $(BINDIR)
+ cp -R ../lib/* $(LOGLIBDIR)
clean:
-rm -f *.o ana/*.o log loged
@@ -192,12 +194,12 @@
main: log loged
makeana:
- ($(CD) ana; make $(MFLAGS) grab all)
+ ($(CD) ana; $(MAKE) $(MFLAGS) grab all)
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

View File

@ -0,0 +1,29 @@
--- log/src/ana/Makefile.orig Wed Jul 21 04:10:58 1999
+++ log/src/ana/Makefile Mon Sep 20 06:46:41 1999
@@ -25,7 +25,7 @@
LOCINC = ../../../psys/include
-XINCLUDEDIR = .
+XINCLUDEDIR = %%X11BASE%%/include
##
## (1) Choosing your compiler
@@ -46,7 +46,7 @@
CHIPMUNKCC = gcc -O2
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
##
## (2) Adding appropriate flags
@@ -80,7 +80,7 @@
##
-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR)
+CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR)
ANAOBJ = globals.o nsolver.o main.o inter.o $(GATESOBJ)
GATESOBJ = numbers.o mmeter.o iscope.o \

View File

@ -0,0 +1,58 @@
--- mosis/Makefile.orig Wed Aug 3 03:31:44 1994
+++ mosis/Makefile Tue Sep 21 06:22:09 1999
@@ -23,6 +23,8 @@
#
#
+BINDIR = %%PREFIX%%/bin
+
##
## (1) Choosing your compiler
## ---------------------------
@@ -48,10 +50,11 @@
##
-CC = gcc
+CC ?= gcc
LIBX11 = -lX11
-XINCLUDEDIR = .
+XINCLUDEDIR = %%X11BASE%%/include
+XLIBDIR = %%X11BASE%%/lib
##
## (2) Adding appropriate flags
@@ -91,7 +94,7 @@
## CFLAGS = -ansi
##
-CFLAGS = -O -I../psys/include -I$(XINCLUDEDIR)
+CFLAGS += -DBSD -DF_OK -I../psys/include -I$(XINCLUDEDIR)
##
## (3) Library additions
@@ -99,20 +102,20 @@
##
## on some systems, -ldl must be added to the following line
-OTHERLIBS= -lm
+OTHERLIBS= -lm -lcompat
##
##
##
-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
+ install -c -s mosis $(BINDIR)
clean:
rm -f *.o mosis

View File

@ -0,0 +1,37 @@
--- netcmp/Makefile.orig Wed Mar 12 02:41:59 1997
+++ netcmp/Makefile Mon Sep 20 06:53:59 1999
@@ -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
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
##
## (2) Adding appropriate flags
@@ -90,13 +90,13 @@
## -ansi
##
-CFLAGS =
+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 -lcompat -o netcmp
install: netcmp
- cp netcmp $(BINDIR)
+ install -c -s netcmp $(BINDIR)
clean:
-rm -f *.o netcmp

View File

@ -0,0 +1,50 @@
--- psys/src/Makefile.orig Wed Jul 21 04:06:28 1999
+++ psys/src/Makefile Mon Sep 20 06:38:54 1999
@@ -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,8 @@
## or some other directory, depending on your installation.
##
-XINCLUDEDIR = .
+XINCLUDEDIR = %%X11BASE%%/include
+XLIBDIR = %%X11BASE%%/lib
##
## (1) Choosing your compiler
@@ -101,7 +102,7 @@
LIBSTUFF = texstuff.ps untilstuff.ps plot.font
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
##
@@ -147,7 +148,7 @@
## -m68040 : for 68040 and 68060
##
-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"`$(CD) $(LIBDIR); pwd`\"
+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"$(LIBDIR)\" -L$(XLIBDIR)
P2CFLAGS = -DLOCAL_INIT=_local_p2c_init
@@ -163,7 +164,7 @@
## below; however the "-" allows this to be non-fatal and thus not essential
## to delete
-all: setup libp2c.a
+all: libp2c.a
setup:
-if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi

View File

@ -0,0 +1,56 @@
--- psys/src/mylib.c.orig Wed Jul 21 04:06:25 1999
+++ psys/src/mylib.c Mon Sep 20 06:58:55 1999
@@ -4162,7 +4162,7 @@
if (currentmode == m_hitdet) {
m_hitcount += hitdet_drawpoly(n, pointlist);
- cfree(pointlist);
+ free(pointlist);
return;
}
@@ -4174,7 +4174,7 @@
Xfprintf(stderr, "XDrawLines()\n");
XDrawLines(m_display, m_window, gc[currentcolor], pointlist, n+1, CoordModeOrigin);
- cfree(pointlist);
+ free(pointlist);
#ifdef SAVECURSOR
if (cursor_is_on)
@@ -4335,7 +4335,7 @@
j++;
} while (count != 0 && j < last);
if (edges[i].curx <= m_clip_x2 && edges[j-1].curx >= m_clip_x1) {
- cfree(edges);
+ free(edges);
return 1; /* Found a visible trapezoid */
}
}
@@ -4345,7 +4345,7 @@
}
/* No trapezoids intersect */
- cfree(edges);
+ free(edges);
return 0;
}
@@ -4370,7 +4370,7 @@
if (currentmode == m_hitdet) {
m_hitcount += hitdet_fillpoly(n, pointlist);
- cfree(pointlist);
+ free(pointlist);
return;
}
@@ -4382,7 +4382,7 @@
Xfprintf(stderr, "XFillPolygon()\n");
XFillPolygon(m_display, m_window, gc[currentcolor], pointlist, n, Complex, CoordModeOrigin);
- cfree(pointlist);
+ free(pointlist);
#ifdef SAVECURSOR
if (cursor_is_on)

View File

@ -0,0 +1,58 @@
--- until/V1.2/Makefile.orig Wed Sep 23 07:04:47 1998
+++ until/V1.2/Makefile Mon Sep 20 07:01:56 1999
@@ -41,7 +41,8 @@
##
-XINCLUDEDIR = .
+XINCLUDEDIR = %%X11BASE%%/include
+XLIBDIR = %%X11BASE%%/lib
##
## If X isn't in the library path (the case for many MachTen and Linux
@@ -68,7 +69,7 @@
##
## on some systems, -ldl must be added to the following line
-OTHERLIBS= -lm
+OTHERLIBS= -lm -lcompat
##
## (2) Choosing your compiler
@@ -98,10 +99,10 @@
CHIPMUNKCC = gcc
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
-BINDIR = ../../bin
-LIBDIR = `pwd`/../../lib
+BINDIR = %%PREFIX%%/bin
+LIBDIR = %%PREFIX%%/share/chipmunk
SYSRC = $(LIBDIR)/system.untilrc
SYSPS = $(LIBDIR)/pensps.map
@@ -161,11 +162,11 @@
##
-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR) \
+CFLAGS += -DBSD -I$(LOCINC) -I$(XINCLUDEDIR) \
-DF_OK=0 -DUNTILRC=\"$(SYSRC)\" -DUNTILPSMAP=\"$(SYSPS)\" \
-DUNTILHEADER=\"$(SYSHD)\"
-LDFLAGS = $(LIBP2C) $(LIBX11) $(OTHERLIBS)
+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,7 +196,7 @@
## Until as its moved to bin; non ksh-users may wish to change it back.
install: until
- cp until $(BINDIR)/Until
+ install -c -s until $(BINDIR)/Until
cp pensps.map $(LIBDIR)/pensps.map
cp system.untilrc $(LIBDIR)/system.untilrc
cp until.pro $(LIBDIR)/until.pro

View File

@ -0,0 +1,25 @@
--- 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
+all:
+ for i in $(PACKAGES) ;\
+ do (cd $$i ; echo "Making clean 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
dist:
rm -rf util

View File

@ -0,0 +1,50 @@
--- util/boxify/Makefile.orig Wed Mar 12 02:47:23 1997
+++ util/boxify/Makefile Tue Sep 21 21:29:44 1999
@@ -21,7 +21,7 @@
#
# boxify makefile
-BINDIR= ../../bin
+BINDIR= %%PREFIX%%/bin
##
## (1) Choosing your compiler
@@ -48,7 +48,7 @@
##
CHIPMUNKCC = gcc
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
##
## (2) Adding appropriate flags
@@ -92,7 +92,7 @@
## -m68040 : for 68040 and 68060
##
-CFLAGS =
+CFLAGS += -DBSD -DF_OK=0
TRAPESSRC = trapes/edges.c trapes/findnext.c trapes/mates.c \
trapes/delete.c trapes/gentrapes.c trapes/trapes.c
@@ -102,16 +102,16 @@
INCLUDES = trapes/poly.h trapes/trapes.h p2c.h boxify.h
-boxify: boxify.o
- (cd trapes; make)
+all: boxify.o
+ (cd trapes; $(MAKE) all)
$(CC) -o boxify boxify.o $(TRAPESOBJ) -lm
install: boxify
- cp boxify $(BINDIR)
+ install -c -s boxify $(BINDIR)
clean:
- (cd trapes; make clean)
+ (cd trapes; $(MAKE) clean)
-rm -f *.o boxify
#tar: $(INCLUDES) $(TRAPESSRC) boxify.c boxify.1 Makefile

View File

@ -0,0 +1,29 @@
--- util/boxify/trapes/Makefile.orig Wed Mar 12 02:47:22 1997
+++ util/boxify/trapes/Makefile Tue Sep 21 05:36:58 1999
@@ -18,7 +18,7 @@
#
# cleancif makefile
-BINDIR= ../../bin
+BINDIR= %%PREFIX%%/bin
##
## (1) Choosing your compiler
@@ -45,7 +45,7 @@
##
CHIPMUNKCC = gcc
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
##
## (2) Adding appropriate flags
@@ -89,7 +89,7 @@
## -m68040 : for 68040 and 68060
##
-CFLAGS =
+CFLAGS += -DBSD -DF_OK=0
all: edges.o findnext.o mates.o delete.o gentrapes.o trapes.o

View File

@ -0,0 +1,37 @@
--- util/cleancif/Makefile.orig Wed Mar 12 02:47:24 1997
+++ util/cleancif/Makefile Tue Sep 21 03:35:20 1999
@@ -18,7 +18,7 @@
#
# cleancif makefile
-BINDIR= ../../bin
+BINDIR= %%PREFIX%%/bin
##
## (1) Choosing your compiler
@@ -45,7 +45,7 @@
##
CHIPMUNKCC = gcc
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
##
## (2) Adding appropriate flags
@@ -89,13 +89,13 @@
## -m68040 : for 68040 and 68060
##
-CFLAGS =
+CFLAGS += -DBSD -DF_OK=0
-cleancif: cleancif.o
+all: cleancif.o
$(CC) cleancif.o -lm -o cleancif
install: cleancif
- cp cleancif $(BINDIR)
+ install -c -s cleancif $(BINDIR)
clean:
-rm -f *.o cleancif

View File

@ -0,0 +1,16 @@
--- util/spc-tools/Makefile.orig Wed Mar 12 02:47:32 1997
+++ util/spc-tools/Makefile Tue Sep 21 03:38:10 1999
@@ -11,11 +11,11 @@
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

View File

@ -0,0 +1,36 @@
--- util/spc-tools/sf/Makefile.orig Wed Mar 12 02:47:29 1997
+++ util/spc-tools/sf/Makefile Tue Sep 21 03:41:57 1999
@@ -18,7 +18,7 @@
#
# sf makefile
-BINDIR= ../../../bin
+BINDIR= %%PREFIX%%/bin
##
## (1) Choosing your compiler
@@ -46,7 +46,7 @@
CHIPMUNKCC = gcc
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
##
## (2) Adding appropriate flags
@@ -90,13 +90,13 @@
## -m68040 : for 68040 and 68060
##
-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)
+ install -c -s sf $(BINDIR)
clean:
-rm -f *.o sf

View File

@ -0,0 +1,38 @@
--- util/spc-tools/ss/Makefile.orig Wed Mar 12 02:47:27 1997
+++ util/spc-tools/ss/Makefile Tue Sep 21 03:40:50 1999
@@ -18,7 +18,7 @@
#
# ss makefile
-BINDIR= ../../../bin
+BINDIR= %%PREFIX%%/bin
##
## (1) Choosing your compiler
@@ -46,7 +46,7 @@
CHIPMUNKCC = gcc
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
##
## (2) Adding appropriate flags
@@ -90,14 +90,14 @@
## -m68040 : for 68040 and 68060
##
-CFLAGS =
+CFLAGS += -DBSD -DF_OK=0
ss: spice.o ss.o
$(CC) ss.o spice.o -o ss
install: ss
- cp ss $(BINDIR)
- cp test/ucbsim $(BINDIR)
+ install -c -s ss $(BINDIR)
+ install -c test/ucbsim $(BINDIR)
clean:
-rm -f *.o ss

View File

@ -0,0 +1,15 @@
--- util/spc-tools/ss/test/Makefile.orig Wed Mar 12 02:47:28 1997
+++ util/spc-tools/ss/test/Makefile Tue Sep 21 03:40:27 1999
@@ -1,9 +1,9 @@
#!/bin/sh
test:
- make magic
- make log
- make gemini
+ $(MAKE) magic
+ $(MAKE) log
+ $(MAKE) gemini
magic:
ext2sim -R -C inv.ext

View File

@ -0,0 +1,54 @@
--- view/Makefile.orig Wed Mar 12 02:50:04 1997
+++ view/Makefile Mon Sep 20 07:19:44 1999
@@ -41,7 +41,8 @@
## 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
@@ -68,7 +69,7 @@
##
## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS
-OTHERLIBS= -lm
+OTHERLIBS= -lm -lcompat
##
## (2) IEEE library directory
@@ -115,7 +116,7 @@
CHIPMUNKCC = gcc -O2
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
##
## (4) Adding appropriate flags
@@ -171,11 +172,11 @@
## in view rule
##
-CFLAGS= -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 \
@@ -243,7 +244,7 @@
(chdir mt; make; chdir ..; chdir tek2430; make; chdir ..; make mtlink)
install: view
- cp view $(BINDIR)/vc
+ install -c -s view $(BINDIR)/vc
myinstall: myview
cp view ../bin/myview

View File

@ -0,0 +1,15 @@
--- view/viewfit.c.orig Wed Mar 12 02:50:07 1997
+++ view/viewfit.c Mon Sep 20 21:50:59 1999
@@ -58,7 +58,12 @@
#include <stdio.h>
+#include <sys/param.h>
+#ifndef __STDC__
#include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
#include <math.h>
#include "global.h"

View File

@ -0,0 +1,19 @@
--- view/tek2430/Makefile.orig Wed Mar 12 02:50:18 1997
+++ view/tek2430/Makefile Mon Sep 20 22:08:14 1999
@@ -23,12 +23,12 @@
# tek2430 makefile
-CC = gcc
-CFLAGS= -I../../psys/include -DF_OK=0
+CC ?= gcc
+CFLAGS += -I../../psys/include -DF_OK=0
LIBP2C = ../../psys/src/libp2c.a
#IEEEDIR = ../../iotech/sun4c/4.1c/ieeeio.o
-IEEEDIR = /home/auspex/f/sounds/lazzaro/chipmunk/new/sun4c/4.1.1c/ieeeio.o
-LDFLAGS=$(LIBP2C) $(IEEEDIR)
+#IEEEDIR = /home/auspex/f/sounds/lazzaro/chipmunk/new/sun4c/4.1.1c/ieeeio.o
+LDFLAGS += $(LIBP2C) $(IEEEDIR)
OBJS = \
tek2430.o \

View File

@ -0,0 +1,57 @@
--- wol/Makefile.orig Wed Mar 12 02:51:43 1997
+++ wol/Makefile Mon Sep 20 07:08:14 1999
@@ -39,7 +39,8 @@
## 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
@@ -66,7 +67,7 @@
##
## on some systems, -ldl must be added to the following line
-OTHERLIBS= -lm
+OTHERLIBS= -lm -lcompat
##
@@ -97,11 +98,11 @@
##
CHIPMUNKCC = gcc
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
-LIBDIR = `pwd`/
+LIBDIR = %%PREFIX%%/share/chipmunk
WOLPL = $(LIBDIR)
-BINDIR = ../bin
+BINDIR = %%PREFIX%%/bin
##
@@ -155,9 +156,9 @@
## in view rule
##
-CFLAGS= -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)
OBJ = \
cell_stuff.o \
@@ -198,7 +199,7 @@
install: wol
- cp wol $(BINDIR)
+ install -c -s wol $(BINDIR)
clean:
-rm -f *.o wol

View File

@ -0,0 +1,25 @@
--- wolcomp/Makefile.orig Wed Mar 12 02:53:32 1997
+++ wolcomp/Makefile Mon Sep 20 07:10:09 1999
@@ -52,10 +52,11 @@
CHIPMUNKCC = gcc
-CC = $(CHIPMUNKCC)
+CC ?= $(CHIPMUNKCC)
LOCINC = ../psys/include
-XINCLUDEDIR = .
+XINCLUDEDIR = %%X11BASE%%/include
+XLIBDIR = %%X11BASE%%/lib
##
## (2) Adding appropriate flags
@@ -109,7 +110,7 @@
-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR)
+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -L$(XLIBDIR)
install : $(OBJS)
-rm -f wolcomp.a

View File

@ -1,4 +1,4 @@
Chipmunk CAD (Jan 1993 Revision)
Chipmunk CAD (Oct 1998 Revision)
-------- --- --- ---- --------
This directory contains a revised public beta-test version of the
@ -28,3 +28,5 @@ Naval Research were the main sources of funding for these tools. These
tools are distributed under a license very similar to the GNU license;
the minor changes protect Caltech from liability. Each tar file
contains this license.
WWW: http://www.pcmp.caltech.edu/chipmunk/

View File

@ -1,49 +1,70 @@
bin/diglog
bin/Until
bin/analog
bin/loged
bin/boxify
bin/cleancif
bin/diglog
bin/fixfet7
bin/netcmp
bin/loged
bin/mconvert
bin/mosis
bin/wol
bin/until
bin/netcmp
bin/scope_to_mat
bin/unmconvert
bin/vc
lib/chipmunk/plot.font
lib/chipmunk/untilstuff.ps
lib/chipmunk/texstuff.ps
lib/chipmunk/pwl-test.lgf
lib/chipmunk/pwl-test.iv
lib/chipmunk/pens.cnf
lib/chipmunk/models.cnf
lib/chipmunk/lplot.cnf
lib/chipmunk/logspc.cnf
lib/chipmunk/logntk.cnf
lib/chipmunk/lognews.text
lib/chipmunk/log.gate
lib/chipmunk/log.doc
lib/chipmunk/log.cnf
lib/chipmunk/linkloged
lib/chipmunk/linklog
lib/chipmunk/librstr.cnf
lib/chipmunk/lesson5.lgf
lib/chipmunk/lesson4.lgf
lib/chipmunk/lesson3.lgf
lib/chipmunk/lesson2.lgf
lib/chipmunk/lesson1.lgf
lib/chipmunk/groups.cnf
lib/chipmunk/genlog.cnf
lib/chipmunk/diglog.cnf
lib/chipmunk/cheat.text
lib/chipmunk/analog.cnf
lib/chipmunk/analog-tr.ps
lib/chipmunk/analog-man.ps
lib/chipmunk/ana.gate
lib/chipmunk/actellog.cnf
lib/chipmunk/vlsi.cnf
lib/chipmunk/actel.gate
lib/chipmunk/pensps.map
lib/chipmunk/system.untilrc
lib/chipmunk/until.pro
lib/chipmunk/until.ps
lib/chipmunk/bassen.ps
@exec mkdir %D/lib/chipmunk/ntk
@unexec rmdir %D/lib/chipmunk/ntk
bin/wol
share/chipmunk/actel.gate
share/chipmunk/actellog.cnf
share/chipmunk/ana.gate
share/chipmunk/ana.gsafe
share/chipmunk/analog-man.ps
share/chipmunk/analog-tr.ps
share/chipmunk/analog.cnf
share/chipmunk/cheat.text
share/chipmunk/diglog.cnf
share/chipmunk/fet5model.ps
share/chipmunk/fet7model.pdf
share/chipmunk/fet7model.ps
share/chipmunk/genlog.cnf
share/chipmunk/groups.cnf
share/chipmunk/ledit_models
share/chipmunk/lesson1.lgf
share/chipmunk/lesson2.lgf
share/chipmunk/lesson3.lgf
share/chipmunk/lesson4.lgf
share/chipmunk/lesson5.lgf
share/chipmunk/librstr.cnf
share/chipmunk/linklog
share/chipmunk/linkloged
share/chipmunk/log.cnf
share/chipmunk/log.doc
share/chipmunk/log.gate
share/chipmunk/lognews.text
share/chipmunk/logntk.cnf
share/chipmunk/logspc.cnf
share/chipmunk/logspc.tim
share/chipmunk/lplot.cnf
share/chipmunk/models.cnf
share/chipmunk/mos.cnf
share/chipmunk/mos14tb.cnf
share/chipmunk/mos26g.cnf
share/chipmunk/mos_example.cnf
share/chipmunk/mosscn12.cnf
share/chipmunk/pens.cnf
share/chipmunk/pensps.map
share/chipmunk/plot.font
share/chipmunk/post.spc
share/chipmunk/pre.spc
share/chipmunk/preamble.ps
share/chipmunk/pwl-test.iv
share/chipmunk/pwl-test.lgf
share/chipmunk/spcfet5.lgf
share/chipmunk/spctest.lgf
share/chipmunk/system.untilrc
share/chipmunk/texstuff.ps
share/chipmunk/until.pro
share/chipmunk/until.ps
share/chipmunk/untilstuff.ps
share/chipmunk/vlsi.cnf
@exec mkdir %D/share/chipmunk/ntk
@unexec rmdir %D/share/chipmunk/ntk
@dirrm share/chipmunk