mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-20 20:09:11 +00:00
upgrade to 5.59
PR: 38227 Submitted by: Ports Fury
This commit is contained in:
Ying-Chieh Liao
parent
2c96437f3e
commit
797d6cd4f1
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=59586
@ -6,32 +6,25 @@
|
||||
#
|
||||
|
||||
PORTNAME= chipmunk
|
||||
PORTVERSION= 5.51
|
||||
PORTVERSION= 5.59
|
||||
CATEGORIES= cad
|
||||
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 \
|
||||
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
|
||||
|
||||
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
|
||||
USE_GMAKE= yes
|
||||
NO_WRKSUBDIR= yes
|
||||
USE_XLIB= yes
|
||||
USE_GMAKE= yes
|
||||
|
||||
post-extract:
|
||||
@${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" \{} \;
|
||||
@${CP} -f ${DISTDIR}/${DIST_SUBDIR}/Makefile ${WRKSRC}/Makefile
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
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/psys-1.56.tar.gz) = 43f7f0496bab0e4535397ad6d1be268e
|
||||
MD5 (chipmunk/log-5.59.tar.gz) = 681dcc067d4d2c43fb11eb5d863f0556
|
||||
MD5 (chipmunk/netcmp-1.12.tar.gz) = ccc78ce4bf471705bacac8804dfa59cc
|
||||
MD5 (chipmunk/mosis-1.12.tar.gz) = 7558999d1cb11ddb510cef268ef298b7
|
||||
MD5 (chipmunk/wol-1.12.tar.gz) = 071167553fab12f52934c75a6f7beefc
|
||||
MD5 (chipmunk/wolcomp-1.12.tar.gz) = 4dda3bd03995ad6d351deb13714f5f9f
|
||||
MD5 (chipmunk/until-1.12.tar.gz) = b52d0656134f76e297d9a47f872caa84
|
||||
MD5 (chipmunk/util1.1.tar.gz) = f95de90c953e1be6b07dbdd4b034a9c4
|
||||
MD5 (chipmunk/viewbeta.tar.gz) = e2f8feef9e1353bd2bc9a79671f8cbb9
|
||||
MD5 (chipmunk/view-1.12.tar.gz) = 133883b385069a99eccc1c916a43943b
|
||||
MD5 (chipmunk/Makefile) = ffec44e157c227bb2b904d338b35dfaf
|
||||
|
||||
@ -1,30 +1,38 @@
|
||||
--- log/src/Makefile.orig Tue Jul 20 16:10:36 1999
|
||||
+++ log/src/Makefile Tue Feb 20 14:18:59 2001
|
||||
--- 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
|
||||
+LOGLIBDIR = ${PREFIX}/share/chipmunk
|
||||
+LIBDIR = ${PREFIX}/share/chipmunk
|
||||
|
||||
LOCINC = ../../psys/include
|
||||
|
||||
@@ -63,9 +63,10 @@
|
||||
@@ -63,9 +63,9 @@
|
||||
## or some other directory, depending on your installation.
|
||||
##
|
||||
|
||||
-XINCLUDEDIR = .
|
||||
+XINCLUDEDIR = %%X11BASE%%/include
|
||||
+XLIBDIR = %%X11BASE%%/lib
|
||||
+XINCLUDEDIR = ${X11BASE}/include
|
||||
|
||||
-BINDIR = ../../bin
|
||||
+BINDIR = %%PREFIX%%/bin
|
||||
+BINDIR = ${PREFIX}/bin
|
||||
LIBP2C = ../../psys/src/libp2c.a
|
||||
|
||||
##
|
||||
@@ -91,7 +92,7 @@
|
||||
@@ -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
|
||||
|
||||
@ -33,42 +41,47 @@
|
||||
|
||||
|
||||
##
|
||||
@@ -110,7 +111,7 @@
|
||||
@@ -110,7 +110,7 @@
|
||||
|
||||
CHIPMUNKCC = gcc -O2
|
||||
CHIPMUNKCC = gcc -O3
|
||||
|
||||
-CC = $(CHIPMUNKCC)
|
||||
+CC ?= $(CHIPMUNKCC)
|
||||
|
||||
##
|
||||
## (4) Adding appropriate flags
|
||||
@@ -145,7 +146,7 @@
|
||||
## -m68040 : for 68040 and 68060
|
||||
##
|
||||
@@ -147,7 +147,7 @@
|
||||
|
||||
-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0
|
||||
+CFLAGS += -DBSD -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0 -L$(XLIBDIR)
|
||||
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,11 +179,13 @@
|
||||
@@ -178,22 +178,24 @@
|
||||
## older operating systems -- if problems arise, use a hard link.
|
||||
##
|
||||
|
||||
+all: makeana main
|
||||
+
|
||||
install: all
|
||||
- cp log $(BINDIR)/diglog
|
||||
+ install -c -s log $(BINDIR)/diglog
|
||||
+ ${BSD_INSTALL_PROGRAM} log $(BINDIR)/diglog
|
||||
-rm -f $(BINDIR)/analog
|
||||
-ln $(BINDIR)/diglog $(BINDIR)/analog
|
||||
-(cd $(BINDIR); ln -s diglog analog)
|
||||
- cp loged $(BINDIR)/loged
|
||||
- cp fixfet7 $(BINDIR)/fixfet7
|
||||
+ install -c -s loged $(BINDIR)
|
||||
+ install -c fixfet7 $(BINDIR)
|
||||
+ ${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
|
||||
@@ -192,12 +195,12 @@
|
||||
|
||||
-all: makeana main
|
||||
-
|
||||
main: log loged
|
||||
|
||||
makeana:
|
||||
@ -77,9 +90,3 @@
|
||||
|
||||
|
||||
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
|
||||
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
--- log/src/ana/Makefile.orig Wed Jul 21 04:10:58 1999
|
||||
+++ log/src/ana/Makefile Mon Sep 20 06:46:41 1999
|
||||
--- 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
|
||||
+XINCLUDEDIR = ${X11BASE}/include
|
||||
|
||||
##
|
||||
## (1) Choosing your compiler
|
||||
@@ -46,7 +46,7 @@
|
||||
CHIPMUNKCC = gcc -O2
|
||||
CHIPMUNKCC = gcc -O3
|
||||
|
||||
|
||||
-CC = $(CHIPMUNKCC)
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
##
|
||||
## (2) Adding appropriate flags
|
||||
@@ -80,7 +80,7 @@
|
||||
##
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
|
||||
-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR)
|
||||
CHIPMUNKFLAGS =
|
||||
|
||||
-CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR)
|
||||
+CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR)
|
||||
|
||||
ANAOBJ = globals.o nsolver.o main.o inter.o $(GATESOBJ)
|
||||
|
||||
@ -1,38 +1,38 @@
|
||||
--- mosis/Makefile.orig Wed Aug 3 03:31:44 1994
|
||||
+++ mosis/Makefile Tue Sep 21 06:22:09 1999
|
||||
--- 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
|
||||
+BINDIR = ${PREFIX}/bin
|
||||
+
|
||||
##
|
||||
## (1) Choosing your compiler
|
||||
## ---------------------------
|
||||
@@ -48,10 +50,11 @@
|
||||
@@ -48,10 +50,10 @@
|
||||
##
|
||||
|
||||
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
|
||||
LIBX11 = -lX11
|
||||
-LIBX11 = -lX11
|
||||
-XINCLUDEDIR = .
|
||||
+XINCLUDEDIR = %%X11BASE%%/include
|
||||
+XLIBDIR = %%X11BASE%%/lib
|
||||
+LIBX11 = -lX11 -L${X11BASE}/lib
|
||||
+XINCLUDEDIR = ${X11BASE}/include
|
||||
|
||||
##
|
||||
## (2) Adding appropriate flags
|
||||
@@ -91,7 +94,7 @@
|
||||
## CFLAGS = -ansi
|
||||
##
|
||||
@@ -88,7 +90,7 @@
|
||||
|
||||
-CFLAGS = -O -I../psys/include -I$(XINCLUDEDIR)
|
||||
CHIPMUNKFLAGS =
|
||||
|
||||
-CFLAGS = $(CHIPMUNKFLAGS) -O -I../psys/include -I$(XINCLUDEDIR)
|
||||
+CFLAGS += -DBSD -DF_OK -I../psys/include -I$(XINCLUDEDIR)
|
||||
|
||||
##
|
||||
## (3) Library additions
|
||||
@@ -99,20 +102,20 @@
|
||||
@@ -96,7 +98,7 @@
|
||||
##
|
||||
## on some systems, -ldl must be added to the following line
|
||||
|
||||
@ -41,18 +41,12 @@
|
||||
|
||||
##
|
||||
##
|
||||
##
|
||||
|
||||
|
||||
-LDFLAGS = ../psys/src/libp2c.a $(OTHERLIBS) $(LIBX11)
|
||||
+LDFLAGS += ../psys/src/libp2c.a $(OTHERLIBS) $(LIBX11) -L$(XLIBDIR)
|
||||
|
||||
mosis: mosis.o
|
||||
@@ -109,7 +111,7 @@
|
||||
$(CC) -o mosis mosis.o $(LDFLAGS)
|
||||
|
||||
install: mosis
|
||||
- cp mosis ../bin/mosis
|
||||
+ install -c -s mosis $(BINDIR)
|
||||
+ ${BSD_INSTALL_PROGRAM} mosis $(BINDIR)
|
||||
|
||||
clean:
|
||||
rm -f *.o mosis
|
||||
|
||||
@ -1,37 +1,41 @@
|
||||
--- netcmp/Makefile.orig Wed Mar 12 02:41:59 1997
|
||||
+++ netcmp/Makefile Mon Sep 20 06:53:59 1999
|
||||
--- 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
|
||||
+BINDIR= ${PREFIX}/bin
|
||||
|
||||
##
|
||||
## (1) Choosing your compiler
|
||||
@@ -48,7 +48,7 @@
|
||||
## For SGI, cc is recommended
|
||||
|
||||
CHIPMUNKCC = gcc
|
||||
CHIPMUNKCC = gcc -O3
|
||||
-CC = $(CHIPMUNKCC)
|
||||
+CC ?= $(CHIPMUNKCC)
|
||||
|
||||
##
|
||||
## (2) Adding appropriate flags
|
||||
@@ -90,13 +90,13 @@
|
||||
@@ -90,15 +90,17 @@
|
||||
## -ansi
|
||||
##
|
||||
|
||||
-CFLAGS =
|
||||
+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 -lcompat -o netcmp
|
||||
+ $(CC) parser.o datastruct.o compare.o main.o $(OTHERLIBS) -o netcmp
|
||||
|
||||
install: netcmp
|
||||
- cp netcmp $(BINDIR)
|
||||
+ install -c -s netcmp $(BINDIR)
|
||||
+ ${BSD_INSTALL_PROGRAM} netcmp $(BINDIR)
|
||||
|
||||
clean:
|
||||
-rm -f *.o netcmp
|
||||
|
||||
@ -1,27 +1,26 @@
|
||||
--- psys/src/Makefile.orig Wed Jul 21 04:06:28 1999
|
||||
+++ psys/src/Makefile Mon Sep 20 06:38:54 1999
|
||||
--- 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
|
||||
+LIBDIR = ${PREFIX}/share/chipmunk
|
||||
+BINDIR = ${PREFIX}/bin
|
||||
|
||||
|
||||
LIB = ../libp2c.a
|
||||
@@ -51,7 +51,8 @@
|
||||
@@ -51,7 +51,7 @@
|
||||
## or some other directory, depending on your installation.
|
||||
##
|
||||
|
||||
-XINCLUDEDIR = .
|
||||
+XINCLUDEDIR = %%X11BASE%%/include
|
||||
+XLIBDIR = %%X11BASE%%/lib
|
||||
+XINCLUDEDIR = ${X11BASE}/include
|
||||
|
||||
##
|
||||
## (1) Choosing your compiler
|
||||
@@ -101,7 +102,7 @@
|
||||
@@ -101,7 +101,7 @@
|
||||
LIBSTUFF = texstuff.ps untilstuff.ps plot.font
|
||||
|
||||
|
||||
@ -30,16 +29,16 @@
|
||||
|
||||
|
||||
##
|
||||
@@ -147,7 +148,7 @@
|
||||
## -m68040 : for 68040 and 68060
|
||||
##
|
||||
@@ -149,7 +149,7 @@
|
||||
|
||||
-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"`$(CD) $(LIBDIR); pwd`\"
|
||||
+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"$(LIBDIR)\" -L$(XLIBDIR)
|
||||
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
|
||||
|
||||
@@ -163,7 +164,7 @@
|
||||
@@ -165,7 +165,7 @@
|
||||
## below; however the "-" allows this to be non-fatal and thus not essential
|
||||
## to delete
|
||||
|
||||
|
||||
@ -1,16 +1,24 @@
|
||||
--- until/V1.2/Makefile.orig Tue Sep 22 19:04:26 1998
|
||||
+++ until/V1.2/Makefile Tue Feb 20 14:20:29 2001
|
||||
@@ -41,7 +41,8 @@
|
||||
--- 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
|
||||
+XINCLUDEDIR = ${X11BASE}/include
|
||||
|
||||
##
|
||||
## If X isn't in the library path (the case for many MachTen and Linux
|
||||
@@ -68,7 +69,7 @@
|
||||
@@ -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
|
||||
|
||||
@ -19,7 +27,7 @@
|
||||
|
||||
##
|
||||
## (2) Choosing your compiler
|
||||
@@ -98,10 +99,10 @@
|
||||
@@ -98,10 +98,10 @@
|
||||
|
||||
|
||||
CHIPMUNKCC = gcc
|
||||
@ -28,39 +36,34 @@
|
||||
|
||||
-BINDIR = ../../bin
|
||||
-LIBDIR = `pwd`/../../lib
|
||||
+BINDIR = %%PREFIX%%/bin
|
||||
+LIBDIR = %%PREFIX%%/share/chipmunk
|
||||
+BINDIR = ${PREFIX}/bin
|
||||
+LIBDIR = ${PREFIX}/share/chipmunk
|
||||
|
||||
SYSRC = $(LIBDIR)/system.untilrc
|
||||
SYSPS = $(LIBDIR)/pensps.map
|
||||
@@ -161,11 +162,11 @@
|
||||
##
|
||||
@@ -165,7 +165,7 @@
|
||||
|
||||
|
||||
-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR) \
|
||||
CHIPMUNKFLAGS =
|
||||
|
||||
-CFLAGS = $(CHIPMUNKFLAGS) -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,11 +196,15 @@
|
||||
@@ -199,11 +199,11 @@
|
||||
## 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
|
||||
+ chmod 0444 $(LIBDIR)/pensps.map
|
||||
cp system.untilrc $(LIBDIR)/system.untilrc
|
||||
+ chmod 0444 $(LIBDIR)/system.untilrc
|
||||
cp until.pro $(LIBDIR)/until.pro
|
||||
+ chmod 0444 $(LIBDIR)/until.pro
|
||||
cp until.ps $(LIBDIR)/until.ps
|
||||
+ chmod 0444 $(LIBDIR)/until.ps
|
||||
- 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
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
--- util/boxify/Makefile.orig Wed Mar 12 02:47:23 1997
|
||||
+++ util/boxify/Makefile Tue Sep 21 21:29:44 1999
|
||||
+++ util/boxify/Makefile Sat May 18 13:12:54 2002
|
||||
@@ -21,7 +21,7 @@
|
||||
#
|
||||
# boxify makefile
|
||||
|
||||
-BINDIR= ../../bin
|
||||
+BINDIR= %%PREFIX%%/bin
|
||||
+BINDIR= ${PREFIX}/bin
|
||||
|
||||
##
|
||||
## (1) Choosing your compiler
|
||||
@ -40,7 +40,7 @@
|
||||
|
||||
install: boxify
|
||||
- cp boxify $(BINDIR)
|
||||
+ install -c -s boxify $(BINDIR)
|
||||
+ ${BSD_INSTALL_PROGRAM} -c -s boxify $(BINDIR)
|
||||
|
||||
clean:
|
||||
- (cd trapes; make clean)
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# cleancif makefile
|
||||
|
||||
-BINDIR= ../../bin
|
||||
+BINDIR= %%PREFIX%%/bin
|
||||
+BINDIR= ${PREFIX}/bin
|
||||
|
||||
##
|
||||
## (1) Choosing your compiler
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# cleancif makefile
|
||||
|
||||
-BINDIR= ../../bin
|
||||
+BINDIR= %%PREFIX%%/bin
|
||||
+BINDIR= ${PREFIX}/bin
|
||||
|
||||
##
|
||||
## (1) Choosing your compiler
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
--- util/conscripts/Makefile.orig Wed Mar 12 02:47:25 1997
|
||||
+++ util/conscripts/Makefile Tue Sep 21 03:36:32 1999
|
||||
+++ util/conscripts/Makefile Sat May 18 13:13:47 2002
|
||||
@@ -18,11 +18,11 @@
|
||||
#
|
||||
# mconvert makefile
|
||||
|
||||
-BINDIR= ../../bin
|
||||
+BINDIR= %%PREFIX%%/bin
|
||||
+BINDIR= ${PREFIX}/bin
|
||||
|
||||
install:
|
||||
- cp mconvert $(BINDIR)
|
||||
- cp unmconvert $(BINDIR)
|
||||
+ install -c mconvert $(BINDIR)
|
||||
+ install -c unmconvert $(BINDIR)
|
||||
+ ${BSD_INSTALL_SCRIPT} mconvert $(BINDIR)
|
||||
+ ${BSD_INSTALL_SCRIPT} unmconvert $(BINDIR)
|
||||
|
||||
clean:
|
||||
-rm -f *.o
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
--- util/sctomat/Makefile.orig Wed Mar 12 02:47:26 1997
|
||||
+++ util/sctomat/Makefile Tue Sep 21 03:37:35 1999
|
||||
+++ util/sctomat/Makefile Sat May 18 13:14:35 2002
|
||||
@@ -5,7 +5,7 @@
|
||||
#
|
||||
# sctomat makefile
|
||||
|
||||
-BINDIR= ../../bin
|
||||
+BINDIR= %%PREFIX%%/bin
|
||||
+BINDIR= ${PREFIX}/bin
|
||||
|
||||
##
|
||||
## (1) Choosing your compiler
|
||||
@ -31,7 +31,7 @@
|
||||
|
||||
install: scope_to_mat
|
||||
- cp scope_to_mat $(BINDIR)
|
||||
+ install -c -s scope_to_mat $(BINDIR)
|
||||
+ ${BSD_INSTALL_PROGRAM} scope_to_mat $(BINDIR)
|
||||
|
||||
clean:
|
||||
-rm -f *.o scope_to_mat
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
--- 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
|
||||
+++ util/spc-tools/sf/Makefile Sat May 18 13:15:35 2002
|
||||
@@ -18,7 +18,7 @@
|
||||
#
|
||||
# sf makefile
|
||||
|
||||
-BINDIR= ../../../bin
|
||||
+BINDIR= %%PREFIX%%/bin
|
||||
+BINDIR= ${PREFIX}/bin
|
||||
|
||||
##
|
||||
## (1) Choosing your compiler
|
||||
@ -23,14 +23,14 @@
|
||||
##
|
||||
|
||||
-CFLAGS =
|
||||
+CFLAGS = -DBSD -DF_OK=0
|
||||
+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)
|
||||
+ ${BSD_INSTALL_PROGRAM} sf $(BINDIR)
|
||||
|
||||
clean:
|
||||
-rm -f *.o sf
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
--- 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
|
||||
+++ util/spc-tools/ss/Makefile Sat May 18 13:16:25 2002
|
||||
@@ -18,7 +18,7 @@
|
||||
#
|
||||
# ss makefile
|
||||
|
||||
-BINDIR= ../../../bin
|
||||
+BINDIR= %%PREFIX%%/bin
|
||||
+BINDIR= ${PREFIX}/bin
|
||||
|
||||
##
|
||||
## (1) Choosing your compiler
|
||||
@ -31,8 +31,8 @@
|
||||
install: ss
|
||||
- cp ss $(BINDIR)
|
||||
- cp test/ucbsim $(BINDIR)
|
||||
+ install -c -s ss $(BINDIR)
|
||||
+ install -c test/ucbsim $(BINDIR)
|
||||
+ ${BSD_INSTALL_PROGRAM} ss $(BINDIR)
|
||||
+ ${BSD_INSTALL_SCRIPT} test/ucbsim $(BINDIR)
|
||||
|
||||
clean:
|
||||
-rm -f *.o ss
|
||||
|
||||
@ -1,16 +1,24 @@
|
||||
--- view/Makefile.orig Wed Mar 12 02:50:04 1997
|
||||
+++ view/Makefile Mon Sep 20 07:19:44 1999
|
||||
@@ -41,7 +41,8 @@
|
||||
--- 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
|
||||
+XINCLUDEDIR = ${X11BASE}/include
|
||||
|
||||
##
|
||||
## If X isn't in the library path (the case for many MachTen and Linux
|
||||
@@ -68,7 +69,7 @@
|
||||
@@ -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
|
||||
|
||||
@ -19,36 +27,35 @@
|
||||
|
||||
##
|
||||
## (2) IEEE library directory
|
||||
@@ -115,7 +116,7 @@
|
||||
@@ -114,7 +114,7 @@
|
||||
|
||||
CHIPMUNKCC = gcc -O2
|
||||
CHIPMUNKCC = gcc -O3
|
||||
|
||||
-CC = $(CHIPMUNKCC)
|
||||
+CC ?= $(CHIPMUNKCC)
|
||||
|
||||
##
|
||||
## (4) Adding appropriate flags
|
||||
@@ -171,11 +172,11 @@
|
||||
## in view rule
|
||||
##
|
||||
@@ -172,11 +172,11 @@
|
||||
|
||||
CHIPMUNKFLAGS =
|
||||
|
||||
-CFLAGS= -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
|
||||
-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)
|
||||
LDFLAGS= $(LIBP2C) $(LIBX11) $(OTHERLIBS)
|
||||
MYLDFLAGS= $(LIBP2C) $(IEEEDIR) $(LIBX11) $(OTHERLIBS)
|
||||
-BINDIR= ../bin
|
||||
+BINDIR = %%PREFIX%%/bin
|
||||
+BINDIR = ${PREFIX}/bin
|
||||
|
||||
OBJS = \
|
||||
viewfit.o \
|
||||
@@ -243,7 +244,7 @@
|
||||
@@ -244,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
|
||||
+ ${BSD_INSTALL_PROGRAM} view $(BINDIR)/vc
|
||||
|
||||
myinstall: myview
|
||||
cp view ../bin/myview
|
||||
|
||||
@ -1,16 +1,24 @@
|
||||
--- wol/Makefile.orig Wed Mar 12 02:51:43 1997
|
||||
+++ wol/Makefile Mon Sep 20 07:08:14 1999
|
||||
@@ -39,7 +39,8 @@
|
||||
--- 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
|
||||
+XINCLUDEDIR = ${X11BASE}/include
|
||||
|
||||
##
|
||||
## If X isn't in the library path (the case for many MachTen and Linux
|
||||
@@ -66,7 +67,7 @@
|
||||
@@ -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
|
||||
|
||||
@ -19,39 +27,36 @@
|
||||
|
||||
|
||||
##
|
||||
@@ -97,11 +98,11 @@
|
||||
@@ -97,11 +97,11 @@
|
||||
##
|
||||
|
||||
CHIPMUNKCC = gcc
|
||||
CHIPMUNKCC = gcc -O3
|
||||
-CC = $(CHIPMUNKCC)
|
||||
+CC ?= $(CHIPMUNKCC)
|
||||
|
||||
-LIBDIR = `pwd`/
|
||||
+LIBDIR = %%PREFIX%%/share/chipmunk
|
||||
+LIBDIR = ${PREFIX}/share/chipmunk
|
||||
WOLPL = $(LIBDIR)
|
||||
-BINDIR = ../bin
|
||||
+BINDIR = %%PREFIX%%/bin
|
||||
+BINDIR = ${PREFIX}/bin
|
||||
|
||||
|
||||
##
|
||||
@@ -155,9 +156,9 @@
|
||||
## in view rule
|
||||
##
|
||||
@@ -157,7 +157,7 @@
|
||||
|
||||
-CFLAGS= -I$(LOCINC) -I$(XINCLUDEDIR) -DWOLLIBDIR=\"$(WOLPL)\"
|
||||
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)
|
||||
LDFLAGS= $(LIBP2C) $(LIBX11) $(OTHERLIBS)
|
||||
|
||||
OBJ = \
|
||||
cell_stuff.o \
|
||||
@@ -198,7 +199,7 @@
|
||||
@@ -200,7 +200,7 @@
|
||||
|
||||
|
||||
install: wol
|
||||
- cp wol $(BINDIR)
|
||||
+ install -c -s wol $(BINDIR)
|
||||
+ ${BSD_INSTALL_PROGRAM} wol $(BINDIR)
|
||||
|
||||
clean:
|
||||
-rm -f *.o wol
|
||||
|
||||
@ -1,25 +1,24 @@
|
||||
--- wolcomp/Makefile.orig Wed Mar 12 02:53:32 1997
|
||||
+++ wolcomp/Makefile Mon Sep 20 07:10:09 1999
|
||||
@@ -52,10 +52,11 @@
|
||||
--- 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
|
||||
CHIPMUNKCC = gcc -O3
|
||||
-CC = $(CHIPMUNKCC)
|
||||
+CC ?= $(CHIPMUNKCC)
|
||||
|
||||
LOCINC = ../psys/include
|
||||
-XINCLUDEDIR = .
|
||||
+XINCLUDEDIR = %%X11BASE%%/include
|
||||
+XLIBDIR = %%X11BASE%%/lib
|
||||
+XINCLUDEDIR = ${X11BASE}/include
|
||||
|
||||
##
|
||||
## (2) Adding appropriate flags
|
||||
@@ -109,7 +110,7 @@
|
||||
@@ -109,7 +109,7 @@
|
||||
|
||||
|
||||
|
||||
-CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR)
|
||||
+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -L$(XLIBDIR)
|
||||
CHIPMUNKFLAGS =
|
||||
-CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR)
|
||||
+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR)
|
||||
|
||||
install : $(OBJS)
|
||||
-rm -f wolcomp.a
|
||||
|
||||
@ -15,7 +15,6 @@ 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
|
||||
@ -38,6 +37,7 @@ share/chipmunk/linkloged
|
||||
share/chipmunk/log.cnf
|
||||
share/chipmunk/log.doc
|
||||
share/chipmunk/log.gate
|
||||
share/chipmunk/log.text
|
||||
share/chipmunk/lognews.text
|
||||
share/chipmunk/logntk.cnf
|
||||
share/chipmunk/logspc.cnf
|
||||
|
||||
Loading…
Reference in New Issue
Block a user