update chipmunk to 5.62 which unbreaks the CURRENT build

9 files changed, 107 insertions, 65 deletions

diff --git a/cad/chipmunk/Makefile b/cad/chipmunk/Makefile
index 9e0b255..1e85fde 100644
--- a/cad/chipmunk/Makefile
+++ b/cad/chipmunk/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	chipmunk
-PORTVERSION=	5.59
+PORTVERSION=	5.62
 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 \
+DISTFILES=	psys-1.58.tar.gz log-5.62.tar.gz netcmp-1.13.tar.gz \
+		mosis-1.14.tar.gz wol-1.14.tar.gz wolcomp-1.14.tar.gz \
+		until-1.14.tar.gz util-1.11.tar.gz view-1.14.tar.gz \
 		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
+EXTRACT_ONLY=	psys-1.58.tar.gz log-5.62.tar.gz netcmp-1.13.tar.gz \
+		mosis-1.14.tar.gz wol-1.14.tar.gz wolcomp-1.14.tar.gz \
+		until-1.14.tar.gz util-1.11.tar.gz view-1.14.tar.gz
 DIST_SUBDIR=	chipmunk
 
 MAINTAINER=	ports@FreeBSD.org
@@ -24,13 +24,10 @@ COMMENT=	An electronic CAD system
 NO_WRKSUBDIR=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-extract:
 	@${CP} -f ${DISTDIR}/${DIST_SUBDIR}/Makefile ${WRKSRC}/Makefile
 
diff --git a/cad/chipmunk/distinfo b/cad/chipmunk/distinfo
index bb08090..54acdb1 100644
--- a/cad/chipmunk/distinfo
+++ b/cad/chipmunk/distinfo
@@ -1,10 +1,10 @@
-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/view-1.12.tar.gz) = 133883b385069a99eccc1c916a43943b
+MD5 (chipmunk/psys-1.58.tar.gz) = 7e83c91e5c6574cad7478906ece6ca31
+MD5 (chipmunk/log-5.62.tar.gz) = 9b75de99a5b3542881801cb942727b43
+MD5 (chipmunk/netcmp-1.13.tar.gz) = 50558d4a2791cab30a1a5e5d719b62ee
+MD5 (chipmunk/mosis-1.14.tar.gz) = 4cb7791bb6144b878d2dced2febe75b7
+MD5 (chipmunk/wol-1.14.tar.gz) = 2ab676624c5771104f3b7ddd8cbabab2
+MD5 (chipmunk/wolcomp-1.14.tar.gz) = c3c35fad428ae0059b3aff1ddb642f12
+MD5 (chipmunk/until-1.14.tar.gz) = 2e4cefe1305c80e15dec0f7989c8eda4
+MD5 (chipmunk/util-1.11.tar.gz) = 47f48f6fd638aac0251de82be097236d
+MD5 (chipmunk/view-1.14.tar.gz) = dc75cbc39d10b8a515aeaf6ed3962046
 MD5 (chipmunk/Makefile) = ffec44e157c227bb2b904d338b35dfaf
diff --git a/cad/chipmunk/files/patch-ad b/cad/chipmunk/files/patch-ad
index 5135252..e817242 100644
--- a/cad/chipmunk/files/patch-ad
+++ b/cad/chipmunk/files/patch-ad
@@ -1,5 +1,5 @@
---- log/src/Makefile.orig	Tue May 14 03:08:21 2002
-+++ log/src/Makefile	Sat May 18 15:49:22 2002
+--- log/src/Makefile.orig	Wed Nov  5 04:53:39 2003
++++ log/src/Makefile	Tue Dec  9 17:42:37 2003
 @@ -45,8 +45,8 @@
  
  CD = cd
@@ -12,8 +12,8 @@
  LOCINC = ../../psys/include
  
 @@ -63,9 +63,9 @@
- ## or some other directory, depending on your installation.
- ##
+ ## or some other directory, depending on your installation. Use the
+ ## first one for OS X.
  
 -XINCLUDEDIR = .
 +XINCLUDEDIR = ${X11BASE}/include
@@ -24,7 +24,7 @@
  
  ##
 @@ -81,7 +81,7 @@
- ## depending on your installation. 
+ ## depending on your installation. Use the second one for OS X.
  ##
  
 -LIBX11 = -lX11
@@ -50,7 +50,7 @@
  
  ##
  ## (4) Adding appropriate flags
-@@ -147,7 +147,7 @@
+@@ -148,7 +148,7 @@
  
  CHIPMUNKFLAGS = 
  
@@ -59,7 +59,7 @@
  
  DIGOBJ = logsim.o logdig.o logsimasm.o logsimed.o diggates.o \
           loghier.o logsimh.o swap.o
-@@ -178,22 +178,24 @@
+@@ -179,22 +179,24 @@
  ##  older operating systems -- if problems arise, use a hard link.
  ##
  
@@ -78,7 +78,7 @@
 +	chmod -R a=r+X $(LOGLIBDIR)
  
  clean:
- 	-rm -f *.o ana/*.o log loged
+ 	-rm -f *.o ana/*.o ana/logdef.h log loged
  
 -all:  makeana main
 -
diff --git a/cad/chipmunk/files/patch-af b/cad/chipmunk/files/patch-af
index a0c60ea..42cb565 100644
--- a/cad/chipmunk/files/patch-af
+++ b/cad/chipmunk/files/patch-af
@@ -1,5 +1,5 @@
---- mosis/Makefile.orig	Tue Aug  7 09:25:31 2001
-+++ mosis/Makefile	Sat May 18 15:59:51 2002
+--- mosis/Makefile.orig	Tue Nov  4 22:19:13 2003
++++ mosis/Makefile	Tue Dec  9 17:44:45 2003
 @@ -23,6 +23,8 @@
  #
  #
@@ -9,21 +9,34 @@
  ##
  ##  (1) Choosing your compiler
  ##  ---------------------------
-@@ -48,10 +50,10 @@
+@@ -47,7 +49,7 @@
  ##
  
  
 -CC = gcc
 +CC ?= gcc
  
--LIBX11 = -lX11
+ ##
+ ## (2) If X isn't in the include path (the case for many MachTen and Linux 
+@@ -62,7 +64,7 @@
+ ## or some other directory, depending on your installation. Use the
+ ## first one for OS X.
+ 
 -XINCLUDEDIR = .
-+LIBX11 = -lX11 -L${X11BASE}/lib
 +XINCLUDEDIR = ${X11BASE}/include
  
  ##
- ## (2) Adding appropriate flags
-@@ -88,7 +90,7 @@
+ ## If X isn't in the library path (the case for many MachTen and Linux 
+@@ -77,7 +79,7 @@
+ ## depending on your installation. Use the second one for OS X.
+ ##
+ 
+-LIBX11 = -lX11
++LIBX11 = -lX11 -L${X11BASE}/lib
+ 
+ ##
+ ## (3) Adding appropriate flags
+@@ -115,7 +117,7 @@
  
  CHIPMUNKFLAGS = 
  
@@ -31,8 +44,8 @@
 +CFLAGS += -DBSD -DF_OK -I../psys/include -I$(XINCLUDEDIR)
  
  ##
- ## (3) Library additions
-@@ -96,7 +98,7 @@
+ ## (4) Library additions
+@@ -123,7 +125,7 @@
  ##
  ## on some systems, -ldl must be added to the following line
  
@@ -41,7 +54,7 @@
  
  ##
  ##
-@@ -109,7 +111,7 @@
+@@ -136,7 +138,7 @@
  	$(CC) -o mosis mosis.o  $(LDFLAGS)
  
  install: mosis
diff --git a/cad/chipmunk/files/patch-aw b/cad/chipmunk/files/patch-aw
index 73997f2..187ee42 100644
--- a/cad/chipmunk/files/patch-aw
+++ b/cad/chipmunk/files/patch-aw
@@ -1,15 +1,10 @@
---- 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 @@
+--- view/viewfit.c.orig	Wed Nov  5 20:37:49 2003
++++ view/viewfit.c	Tue Dec  9 17:46:46 2003
+@@ -58,6 +58,7 @@
  
  
  #include <stdio.h>
 +#include <sys/param.h>
-+#ifndef __STDC__ 
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
+ #include <stdlib.h>
  #include <math.h>
  
- #include "global.h"
diff --git a/cad/chipmunk/files/patch-ay b/cad/chipmunk/files/patch-ay
index f31e04b..23aed95 100644
--- a/cad/chipmunk/files/patch-ay
+++ b/cad/chipmunk/files/patch-ay
@@ -1,7 +1,7 @@
---- 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.
+--- wol/Makefile.orig	Wed Nov  5 20:24:18 2003
++++ wol/Makefile	Tue Dec  9 17:49:36 2003
+@@ -40,7 +40,7 @@
+ ## first one for OS X.
  ##
  
 -XINCLUDEDIR = .
@@ -9,8 +9,8 @@
  
  ##
  ## If X isn't in the library path (the case for many MachTen and Linux 
-@@ -54,7 +54,7 @@
- ## depending on your installation. 
+@@ -55,7 +55,7 @@
+ ## depending on your installation. Use the second one for OS X.
  ##
  
 -LIBX11 = -lX11
@@ -18,7 +18,7 @@
  
  
  
-@@ -66,7 +66,7 @@
+@@ -67,7 +67,7 @@
  ##
  ## on some systems, -ldl must be added to the following line
  
@@ -42,7 +42,7 @@
  
  
  ##
-@@ -157,7 +157,7 @@
+@@ -158,7 +158,7 @@
  
  CHIPMUNKFLAGS =
  
@@ -51,12 +51,14 @@
  
  LDFLAGS= $(LIBP2C)  $(LIBX11) $(OTHERLIBS)
  
-@@ -200,7 +200,7 @@
+@@ -201,8 +201,8 @@
    
  
  install: wol 
 -	cp wol $(BINDIR)
+-	cp fixcify $(BINDIR)
 +	${BSD_INSTALL_PROGRAM} wol $(BINDIR)
++	${BSD_INSTALL_SCRIPT} fixcify $(BINDIR)
  
  clean:
  	-rm -f *.o wol
diff --git a/cad/chipmunk/files/patch-az b/cad/chipmunk/files/patch-az
index 592f121..2bd2b0f 100644
--- a/cad/chipmunk/files/patch-az
+++ b/cad/chipmunk/files/patch-az
@@ -1,24 +1,29 @@
---- wolcomp/Makefile.orig	Sat May 18 12:02:28 2002
-+++ wolcomp/Makefile	Sat May 18 13:03:14 2002
-@@ -52,10 +52,10 @@
+--- wolcomp/Makefile.orig	Wed Nov  5 20:31:07 2003
++++ wolcomp/Makefile	Tue Dec  9 17:51:24 2003
+@@ -52,7 +52,7 @@
    
  
  CHIPMUNKCC = gcc -O3
 -CC = $(CHIPMUNKCC) 
-+CC ?= $(CHIPMUNKCC) 
++CC ? = $(CHIPMUNKCC) 
  
  LOCINC = ../psys/include
+ 
+@@ -71,7 +71,7 @@
+ ## first one for OS X.
+ ##
+ 
 -XINCLUDEDIR = .
 +XINCLUDEDIR = ${X11BASE}/include
  
+ 
  ##
- ## (2) Adding appropriate flags
-@@ -109,7 +109,7 @@
+@@ -128,7 +128,7 @@
    
  
- CHIPMUNKFLAGS = 
--CFLAGS =  $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR)
-+CFLAGS +=  -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR)
+ CHIPMUNKFLAGS =
+-CFLAGS =  $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -D_POSIX_SOURCE
++CFLAGS +=  -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -D_POSIX_SOURCE
  
  install : $(OBJS)
  	-rm -f wolcomp.a
diff --git a/cad/chipmunk/files/patch-bb b/cad/chipmunk/files/patch-bb
new file mode 100644
index 0000000..64ac91f
--- /dev/null
+++ b/cad/chipmunk/files/patch-bb
@@ -0,0 +1,21 @@
+--- util/lgf-tools/Makefile.orig	Tue Dec  9 18:20:07 2003
++++ util/lgf-tools/Makefile	Tue Dec  9 18:27:39 2003
+@@ -1,6 +1,6 @@
+ ## Makefile for lgf-tools
+ 
+-BINDIR=	../../bin
++BINDIR=	${PREFIX}/bin
+ 
+ SCRIPTS = logar lgfextract lgftodef lgftontk makeinstcopy
+ 
+@@ -9,7 +9,9 @@
+ 
+ install:
+ 	chmod +x $(SCRIPTS)
+-	cp -a $(SCRIPTS) $(BINDIR)
++	for i in $(SCRIPTS) ; do \
++		${BSD_INSTALL_SCRIPT} $$i $(BINDIR) ; \
++	done
+ 
+ clean:
+ 	rm -f *.bak *.old
diff --git a/cad/chipmunk/pkg-plist b/cad/chipmunk/pkg-plist
index ebc1a8c..edf8531b 100644
--- a/cad/chipmunk/pkg-plist
+++ b/cad/chipmunk/pkg-plist
@@ -3,12 +3,21 @@ bin/analog
 bin/boxify
 bin/cleancif
 bin/diglog
+bin/fixcify
 bin/fixfet7
+bin/lgfextract
+bin/lgftodef
+bin/lgftontk
+bin/logar
 bin/loged
+bin/makeinstcopy
 bin/mconvert
 bin/mosis
 bin/netcmp
 bin/scope_to_mat
+bin/sf
+bin/ss
+bin/ucbsim
 bin/unmconvert
 bin/vc
 bin/wol