cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove chipmunk: ancient cruft ported to Unix some 25 years ago and

Browse Source 
on life support for a long time; ok sthen@
This commit is contained in:
naddy 2014-03-21 20:01:42 +00:00
parent 67d92c4866
commit 095dd0e8e9
27 changed files with 5 additions and 746 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cad/Makefile
View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.21 2013/12/10 21:57:12 naddy Exp $
# $OpenBSD: Makefile,v 1.22 2014/03/21 20:01:42 naddy Exp $
SUBDIR =
SUBDIR += chipmunk
SUBDIR += fritzing
SUBDIR += geda-gaf
SUBDIR += gerbv

63
cad/chipmunk/Makefile
View File

@ -1,63 +0,0 @@
# $OpenBSD: Makefile,v 1.18 2013/12/05 12:19:00 naddy Exp $
COMMENT= electronic CAD system
BROKEN-sparc64 = Assembler messages: Error: Illegal operands
PKGNAME= chipmunk-1.57
REVISION= 5
DISTNAME= psys-1.57
DISTFILES= psys-1.57.tar.gz webdoc1.46.tar.gz log-5.61.tar.gz \
view-1.13.tar.gz until-1.13.tar.gz wol-1.13.tar.gz \
wolcomp-1.13.tar.gz
CATEGORIES= cad
HOMEPAGE= http://www.cs.berkeley.edu/~lazzaro/chipmunk/
MAINTAINER= Peter Valchev <pvalchev@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= X11 c m
#MASTER_SITES= http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/
MASTER_SITES= http://www.sightly.net/distfiles/
DIST_SUBDIR= chipmunk
WRKDIST= ${WRKDIR}
ALL_TARGET= makeonly
LDIR= ${LOCALBASE}/share/chipmunk/
MAKE_FLAGS= CHIPMUNKCC="${CC} ${CFLAGS}" XINCLUDEDIR="${X11BASE}/include" \
CHIPMUNKFLAGS="-DBSD -Dfreebsd -Dlinux -DF_OK=0" \
LIBX11="-L${X11BASE}/lib -lX11" \
CHIPLIB="${LDIR}" \
LOGLIBDIR="${LDIR}" \
LIBDIR="${LDIR}" \
WOLLIBDIR="${LDIR}" \
UNTILPSMAP="${LDIR}/pensps.map"
NO_TEST= Yes
post-extract:
@cp ${FILESDIR}/Makefile ${WRKDIR}
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/chipmunk
${INSTALL_DATA} ${WRKSRC}/psys/src/texstuff.ps ${PREFIX}/share/doc/chipmunk/
${INSTALL_DATA} ${WRKSRC}/psys/src/untilstuff.ps ${PREFIX}/share/doc/chipmunk/
${INSTALL_PROGRAM} ${WRKSRC}/log/src/log ${PREFIX}/bin/diglog
${INSTALL_PROGRAM} ${WRKSRC}/log/src/log ${PREFIX}/bin/analog
${INSTALL_PROGRAM} ${WRKSRC}/log/src/loged ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/log/src/fixfet7 ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/wol/wol ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/until/V1.2/until ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/until/V1.2/pensps.map ${PREFIX}/share/doc/chipmunk/
${INSTALL_DATA} ${WRKSRC}/until/V1.2/system.untilrc ${PREFIX}/share/doc/chipmunk/
${INSTALL_DATA} ${WRKSRC}/until/V1.2/until.pro ${PREFIX}/share/doc/chipmunk/
${INSTALL_DATA} ${WRKSRC}/until/V1.2/until.ps ${PREFIX}/share/doc/chipmunk/
${INSTALL_DATA} ${WRKSRC}/view/view ${PREFIX}/bin/cview
${INSTALL_DATA_DIR} ${PREFIX}/share/chipmunk
${INSTALL_DATA} ${WRKSRC}/log/lib/*.* ${PREFIX}/share/chipmunk
${INSTALL_DATA} ${WRKSRC}/view/lib/* ${PREFIX}/share/chipmunk
.include <bsd.port.mk>

35
cad/chipmunk/distinfo
View File

@ -1,35 +0,0 @@
MD5 (chipmunk/log-5.61.tar.gz) = O6xlbmWMFgAe7ohnruXrdg==
MD5 (chipmunk/psys-1.57.tar.gz) = gNHsfAbHNB3IToS6mTTA2Q==
MD5 (chipmunk/until-1.13.tar.gz) = BGUVMRxypfNBKgFtvMcpWw==
MD5 (chipmunk/view-1.13.tar.gz) = MMxLwKUvEBbuu2fHVMQHjw==
MD5 (chipmunk/webdoc1.46.tar.gz) = opRV1EhRKAw9/V2y/GFA1w==
MD5 (chipmunk/wol-1.13.tar.gz) = Qw5bv7AZ0cEJ5u8wjdxdMQ==
MD5 (chipmunk/wolcomp-1.13.tar.gz) = kPa0J/8YTDvHc/26ur3X4A==
RMD160 (chipmunk/log-5.61.tar.gz) = 4r2T0VDPSx8FteF8xGBEAy1lFCg=
RMD160 (chipmunk/psys-1.57.tar.gz) = Uv6WIuXepvwkt46KBiSRdjHRrGY=
RMD160 (chipmunk/until-1.13.tar.gz) = 7F9BqU0cZmsYTMNO1I4rno/lkIs=
RMD160 (chipmunk/view-1.13.tar.gz) = K9avoaq6drxjl3FUGODkO9rkddE=
RMD160 (chipmunk/webdoc1.46.tar.gz) = vUFHy0KQ57RugaV4yvHqMvN3MxM=
RMD160 (chipmunk/wol-1.13.tar.gz) = cyruCG0MxibYsBwdBDn0GZuXRkw=
RMD160 (chipmunk/wolcomp-1.13.tar.gz) = Ak5qMfI+oGZIVrtV83broE/DOE0=
SHA1 (chipmunk/log-5.61.tar.gz) = vmwPKbCH82gPTt3dp+A9xPHiXuE=
SHA1 (chipmunk/psys-1.57.tar.gz) = 33a/JWpBmX9dzZq16hRizA4PZmA=
SHA1 (chipmunk/until-1.13.tar.gz) = P8sOcwW4xk+DG7jxr1nuRdF+q+I=
SHA1 (chipmunk/view-1.13.tar.gz) = 1PnHOVLnv/Pv2U0xu6tFGAWPR38=
SHA1 (chipmunk/webdoc1.46.tar.gz) = lc88oUZGYqHhE7DJ/6cEUoBO/x4=
SHA1 (chipmunk/wol-1.13.tar.gz) = tGLpq0hEop3Kgs95n6V570VLWkY=
SHA1 (chipmunk/wolcomp-1.13.tar.gz) = t5SrvCasVqKcrsZBmlfvaQdf8nk=
SHA256 (chipmunk/log-5.61.tar.gz) = sJ9/Q3WCbheHD3ZU6qqVbwbdoU8BcPbbCCXw/yTrEdY=
SHA256 (chipmunk/psys-1.57.tar.gz) = pui1mAEOqbYUFsoBi4gEG6usZFUuj+hB6MEVwONE4xs=
SHA256 (chipmunk/until-1.13.tar.gz) = LxJH2JKifiNCPJ65Pul0T6+FBgDRXA1DcIzHiSq2Px8=
SHA256 (chipmunk/view-1.13.tar.gz) = kdWAlaV0E6PKTDtRD7ahTZDNRq4f+RkQsarF7QPoPtE=
SHA256 (chipmunk/webdoc1.46.tar.gz) = QqC7/sySNfqFCFvRo6Pw6RHPm8ck4+htZqYA8B1klcs=
SHA256 (chipmunk/wol-1.13.tar.gz) = dB0D05wascBMOvGEJinvfGEJZvwUCVg/4Tj9FTxT7Ts=
SHA256 (chipmunk/wolcomp-1.13.tar.gz) = Vu9cNca5NZ4GwUwmcfxOTMpHiDs6XC/UGDg5zuKLB9c=
SIZE (chipmunk/log-5.61.tar.gz) = 2049089
SIZE (chipmunk/psys-1.57.tar.gz) = 201493
SIZE (chipmunk/until-1.13.tar.gz) = 147293
SIZE (chipmunk/view-1.13.tar.gz) = 359023
SIZE (chipmunk/webdoc1.46.tar.gz) = 1872325
SIZE (chipmunk/wol-1.13.tar.gz) = 380361
SIZE (chipmunk/wolcomp-1.13.tar.gz) = 22265

69
cad/chipmunk/files/Makefile
View File

@ -1,69 +0,0 @@
# System Makefile for the Chipmunk Tools
#
# Copyright (C) 1983, 1990, 1993 California Institute of Technology.
# Authors: Dave Gillespie, Marwan Jabri
# Maintainers: John Lazzaro and Dave Gillespie
# Maintainers's address: lazzaro@cs.berkeley.edu;
# EECS/571 Evans Hall/UCB/Berkeley CA 94720
# daveg@synaptics.com;
# Send questions, bug fixes, to these addresses.
#
#
#This program is free software; you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
#the Free Software Foundation (Version 1, 1989).
#
#This program is distributed in the hope that it will be useful,
#but WITHOUT ANY WARRANTY; without even the implied warranty of
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#GNU General Public License for more details.
#
#You should have received a copy of the GNU General Public License
#along with this program; see the file COPYING. If not, write to
#the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
# This makefile allows you to make and install the entire
# chipmunk toolset in one command. It assume you have all of the
# tools in the distribution; if not, comment out the tools you
# do not have in the lines below.
PACKAGES= \
psys/src \
log/src \
wol \
wolcomp \
until/V1.2 \
view
# mosis \
# util \
# netcmp \
makeonly: lib bin
for i in $(PACKAGES) ;\
do (cd $$i ; echo "Making in $$i..."; make $(MFLAGS)); done
World: lib bin clean install
lib:
-mkdir lib
bin:
-mkdir bin
clean:
for i in $(PACKAGES) ;\
do (cd $$i ; echo "Making clean in $$i..."; \
make clean); done
install:
for i in $(PACKAGES) ;\
do (cd $$i ; echo "Making install in $$i..."; \
make install); done
create:
for i in $(PACKAGES) ;\
do (cd $$i ; echo "Making create in $$i..."; \
make create); done

12
cad/chipmunk/patches/patch-log_src_ana_globals_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-log_src_ana_globals_c,v 1.1.1.1 2003/10/25 18:33:27 pvalchev Exp $
--- log/src/ana/globals.c.orig 2003-03-12 15:49:31.000000000 -0700
+++ log/src/ana/globals.c 2003-10-23 23:36:34.000000000 -0600
@@ -341,7 +341,7 @@ double *Value;
m_graphics_on();
printf("\f");
printf("%s[% .5E]:", Varname, *Value);
- gets(Name);
+ fgets(Name, 255, stdin);
TRY(try1);
Newval = strtod(Name, &STR3);
Temp = STR3 - Name + 1;

12
cad/chipmunk/patches/patch-log_src_ana_inter_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-log_src_ana_inter_c,v 1.1.1.1 2003/10/25 18:33:27 pvalchev Exp $
--- log/src/ana/inter.c.orig 2003-03-12 15:49:31.000000000 -0700
+++ log/src/ana/inter.c 2003-10-24 00:56:57.000000000 -0600
@@ -125,7 +125,7 @@ log_action *act;
putchar('\n');
do {
printf("<modulename>_<Procname> : ");
- gets(Response);
+ fgets(Response, 255, stdin);
} while (strlen(Response) < 1);
strcpy(STR1, strltrim(Response));
strcpy(Response, STR1);

50
cad/chipmunk/patches/patch-log_src_log_c
View File

@ -1,50 +0,0 @@
$OpenBSD: patch-log_src_log_c,v 1.2 2010/05/09 17:18:53 espie Exp $
--- log/src/log.c.orig Wed Mar 12 23:49:30 2003
+++ log/src/log.c Sun May 9 19:14:48 2010
@@ -2865,6 +2865,8 @@ Static Void show_events()
}
+Static boolean pollkbd2(void);
+
Static Void pen()
{
@@ -2873,7 +2875,6 @@ Static Void pen()
long x, y;
short i, rx, ry, cred;
- Static boolean pollkbd2(void);
static oldx, oldy;
static long awake;
long now;
@@ -21278,6 +21279,9 @@ Static Void initialize()
short FORLIM;
nk_keytransinfo *WITH;
log_sigrec *WITH1;
+ int fd = -1;
+ char tmpf[25] = "/tmp/chipmunk.XXXXXXXXXX";
+ FILE *tmpp;
#ifdef OS2
_control87(EM_UNDERFLOW, EM_UNDERFLOW); /* Turn off underflow exception. */
@@ -21576,8 +21580,17 @@ Static Void initialize()
if (flag) {
if (libf1[k]->f != NULL)
rewind(libf1[k]->f);
- else
- libf1[k]->f = tmpfile();
+ else {
+ if ((fd = mkstemp(tmpf)) == -1 ||
+ (tmpp = fdopen(fd, "w+")) == NULL) {
+ if (fd != -1) {
+ unlink(tmpf);
+ close(fd);
+ }
+ libf1[k]->f = NULL;
+ } else
+ libf1[k]->f = tmpp;
+ }
if (libf1[k]->f == NULL) {
P_escapecode = -10;
P_ioresult = FileNotFound;

33
cad/chipmunk/patches/patch-log_src_loged_c
View File

@ -1,33 +0,0 @@
$OpenBSD: patch-log_src_loged_c,v 1.1.1.1 2003/10/25 18:33:27 pvalchev Exp $
--- log/src/loged.c.orig 2003-03-12 15:49:30.000000000 -0700
+++ log/src/loged.c 2003-10-25 10:51:38.000000000 -0600
@@ -1956,6 +1956,9 @@ Char *s_, *gname_;
descrec *WITH;
vectorrec *WITH2;
Char STR5[256];
+ int fd = -1;
+ char tmpf[25] = "/tmp/chipmunk.XXXXXXXXXX";
+ FILE *tmpp;
strcpy(s, s_);
strcpy(gname, gname_);
@@ -2032,8 +2035,17 @@ Char *s_, *gname_;
/* p2c: loged.text, line 1701: Note: OPEN does not specify a name [181] */
if (V.f != NULL)
rewind(V.f);
- else
- V.f = tmpfile();
+ else {
+ if ((fd == mkstemp(tmpf)) == -1 ||
+ (tmpp = fdopen(fd, "w+")) == NULL) {
+ if (fd != -1) {
+ unlink(tmpf);
+ close(fd);
+ }
+ V.f = NULL;
+ } else
+ V.f = tmpp;
+ }
if (V.f == NULL) {
P_escapecode = -10;
P_ioresult = FileNotFound;

12
cad/chipmunk/patches/patch-psys_include_p2c_lunix_pas_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-psys_include_p2c_lunix_pas_h,v 1.1 2013/04/03 15:35:54 naddy Exp $
--- psys/include/p2c/lunix_pas.h.orig Wed Mar 12 23:47:35 2003
+++ psys/include/p2c/lunix_pas.h Wed Apr 3 17:29:13 2013
@@ -70,7 +70,7 @@ extern Void lunix_dologerr PP((Char *s));
extern Char *lunix_spoolname PP((Char *lunix_Result, Char *directory,
Char *extension));
extern long lunix_datetoint PP((daterec date, timerec time));
-extern Void lunix_intToDate (long idate, daterec *date, timerec *time);
+extern Void lunix_intToDate (time_t idate, daterec *date, timerec *time);
extern Void lunix_fasttime PP((lunix_fasttimerec *f));
extern Void lunix_datetostr PP((datetimerec datetime, Char *s));
extern Void lunix_qsort PP((Char *a, int n, int es, _PROCEDURE fc));

19
cad/chipmunk/patches/patch-psys_include_p2c_p2c_h
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-psys_include_p2c_p2c_h,v 1.3 2013/12/05 12:19:00 naddy Exp $
--- psys/include/p2c/p2c.h.orig Wed Mar 12 23:47:35 2003
+++ psys/include/p2c/p2c.h Thu Dec 5 00:11:53 2013
@@ -80,6 +80,7 @@ extern char *strdup(const char *);
#endif
#ifdef linux
+#include <limits.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
@@ -336,6 +337,7 @@ extern Void P_sun_argv PP( (char *, int, int) );
#define EndOfFile 30
/* Creating temporary files */
+#define HAVE_TMPFILE
#if (defined(BSD) || defined(NO_TMPFILE)) && !defined(HAVE_TMPFILE)
# define tmpfile() (fopen(tmpnam(NULL), "w+"))
#endif

21
cad/chipmunk/patches/patch-psys_src_Makefile
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-psys_src_Makefile,v 1.2 2003/12/29 22:25:48 espie Exp $
--- psys/src/Makefile.orig 2003-03-12 23:47:36.000000000 +0100
+++ psys/src/Makefile 2003-12-29 23:17:52.000000000 +0100
@@ -149,7 +149,7 @@ CD = cd
CHIPMUNKFLAGS =
-CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"`$(CD) $(LIBDIR); pwd`\"
+CFLAGS = $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"$(LIBDIR)\"
P2CFLAGS = -DLOCAL_INIT=_local_p2c_init
@@ -174,7 +174,7 @@ CHIPMUNKRANFLAGS =
all: setup libp2c.a
setup:
- -if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi
+ #-if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi
install: setup all
cp libp2c.a $(LIB)

12
cad/chipmunk/patches/patch-psys_src_lunix_pas_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-psys_src_lunix_pas_c,v 1.3 2013/04/03 15:35:54 naddy Exp $
--- psys/src/lunix_pas.c.orig Wed Mar 12 23:47:35 2003
+++ psys/src/lunix_pas.c Wed Apr 3 17:28:25 2013
@@ -13,7 +13,7 @@
-Void lunix_intToDate (long idate, daterec *date, timerec *time)
+Void lunix_intToDate (time_t idate, daterec *date, timerec *time)
{
struct tm *temp_tm;

18
cad/chipmunk/patches/patch-psys_src_misc_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-psys_src_misc_c,v 1.1.1.1 2003/10/25 18:33:27 pvalchev Exp $
--- psys/src/misc.c.orig 2003-03-12 15:47:35.000000000 -0700
+++ psys/src/misc.c 2003-09-19 00:31:20.000000000 -0600
@@ -136,12 +136,14 @@ char *ptr;
#ifdef freebsd
+#ifndef __OpenBSD__
int cfree(ptr)
char *ptr;
{
free(ptr);
return 0;
}
+#endif
int _cfree(ptr)
char *ptr;

12
cad/chipmunk/patches/patch-psys_src_newasmlib_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-psys_src_newasmlib_c,v 1.1.1.1 2003/10/25 18:33:27 pvalchev Exp $
--- psys/src/newasmlib.c.orig 2003-03-12 15:47:35.000000000 -0700
+++ psys/src/newasmlib.c 2003-10-25 00:25:01.000000000 -0600
@@ -1815,7 +1815,7 @@ register long i, w;
Char *strdate(res, opts) /* ignore opts for now */
Char *res, *opts;
{
- time_t t = time((long *)0);
+ time_t t = time((time_t *)0);
strcpy(res, ctime(&t));
res[strlen(res)-1] = 0; /* eat the \n */
return res;

93
cad/chipmunk/patches/patch-psys_src_newcrt_c
View File

@ -1,93 +0,0 @@
$OpenBSD: patch-psys_src_newcrt_c,v 1.1 2003/12/29 22:26:33 espie Exp $
--- psys/src/newcrt.c.orig 2003-03-12 23:47:35.000000000 +0100
+++ psys/src/newcrt.c 2003-12-29 23:15:44.000000000 +0100
@@ -2,11 +2,7 @@
#define HIRES
#include <stdio.h>
-#ifdef OS2
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include <signal.h>
#include <p2c/p2c.h>
@@ -307,7 +303,7 @@ uchar c;
}
-extern void nc_fprintf();
+extern void nc_fprintf(FILE *, Char *, ...);
static void show_string(str)
@@ -841,17 +837,16 @@ unsigned char *str, *buf;
#ifndef OS2
-void nc_printf(va_alist)
-va_dcl
+void nc_printf(Char *fmt, ...)
{
va_list args;
- Char *fmt, fmt2[1024];
+
+ Char fmt2[1024];
Char printbuffer[2000], printbuffer2[2000];
Char *p1, *p2;
/* fprintf(stderr, "nc_printf() called, cursor at (%d,%d)\n", XPOS, YPOS); */
- va_start(args);
- fmt = va_arg(args, Char *);
+ va_start(args, fmt);
if (! nc_text_in_window) {
fix_string(fmt, fmt2);
@@ -907,21 +902,17 @@ Char *fmt;
#ifndef OS2
-void zfprintf(va_alist)
-va_dcl
+void zfprintf(FILE *outfile, Char *fmt, ...)
{
va_list args;
- FILE *outfile;
- Char *fmt;
Char fmt2[1024];
Char printbuffer[2000], printbuffer2[2000];
Char *p1, *p2;
- va_start(args);
- outfile = va_arg(args, FILE *);
- fmt = va_arg(args, Char *);
+ va_start(args, fmt);
vfprintf(outfile, fmt, args);
+ va_end(args);
}
#else
@@ -944,18 +935,14 @@ Char *fmt;
#ifndef OS2
-void nc_fprintf(va_alist)
-va_dcl
+void nc_fprintf(FILE *outfile, Char *fmt, ...)
{
va_list args;
- FILE *outfile;
- Char *fmt, fmt2[1024];
+ Char fmt2[1024];
Char printbuffer[2000], printbuffer2[2000];
Char *p1, *p2;
- va_start(args);
- outfile = va_arg(args, FILE *);
- fmt = va_arg(args, Char *);
+ va_start(args, fmt);
/*
vfprintf(outfile, fmt, args);
*/

33
cad/chipmunk/patches/patch-psys_src_plot_c
View File

@ -1,33 +0,0 @@
$OpenBSD: patch-psys_src_plot_c,v 1.1.1.1 2003/10/25 18:33:27 pvalchev Exp $
--- psys/src/plot.c.orig 2003-03-12 15:47:36.000000000 -0700
+++ psys/src/plot.c 2003-10-25 10:50:56.000000000 -0600
@@ -2633,6 +2633,9 @@ long *which_;
Char STR4[256];
point *pp1;
chardesc *cd1;
+ int fd = -1;
+ char tmpf[25] = "/tmp/chipmunk.XXXXXXXXXX";
+ FILE *tmpp;
P_setcpy(which, which_);
f = NULL;
@@ -2664,8 +2667,17 @@ long *which_;
if (f != NULL) {
/* p2c: plot.text, line 2335: Note: OPEN does not specify a name [181] */
rewind(f);
- } else
- f = tmpfile();
+ } else {
+ if ((fd == mkstemp(tmpf)) == -1 ||
+ (tmpp = fdopen(fd, "w+")) == NULL) {
+ if (fd != -1) {
+ unlink(tmpf);
+ close(fd);
+ }
+ f = NULL;
+ } else
+ f = tmpp;
+ }
if (f == NULL) {
P_escapecode = -10;
P_ioresult = FileNotFound;

12
cad/chipmunk/patches/patch-until_V1_2_data_types_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-until_V1_2_data_types_c,v 1.2 2010/05/09 17:18:53 espie Exp $
--- until/V1.2/data_types.c.orig Wed Mar 12 23:59:51 2003
+++ until/V1.2/data_types.c Sun May 9 19:11:21 2010
@@ -87,7 +87,7 @@ short curRots; /* Number of possible rotations */
Char *today(Char *Result)
{
- long now;
+ time_t now;
Char s[64];
Char u[41];

37
cad/chipmunk/patches/patch-until_V1_2_ffman_c
View File

@ -1,37 +0,0 @@
$OpenBSD: patch-until_V1_2_ffman_c,v 1.1 2012/03/18 18:05:03 naddy Exp $
--- until/V1.2/ffman.c.orig Sun Mar 18 11:56:30 2012
+++ until/V1.2/ffman.c Sun Mar 18 11:57:01 2012
@@ -136,7 +136,7 @@ Static void read_error(Char *s)
}
-Static boolean getline(void)
+Static boolean get_line(void)
{
Char *TEMP;
@@ -181,13 +181,13 @@ Static boolean getInterestingLine(void)
if (cpos <= strlen(buffer))
return true;
- if (!getline())
+ if (!get_line())
return false;
q = true;
skip_blanks();
while (cpos > strlen(buffer) && q) {
- q = getline();
+ q = get_line();
skip_blanks();
}
return (q == true);
@@ -1512,7 +1512,7 @@ fileSpec *read_in_a_file(Char *s_)
strcpy(s, s_);
if (start_Read_operation(s)) {
fs = make_filespec(s, established);
- while (getline()) /*still more stuff out there*/
+ while (get_line()) /*still more stuff out there*/
f = read_figure();
Result = fs;
if (ff_file != NULL)

21
cad/chipmunk/patches/patch-until_V1_2_main_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-until_V1_2_main_c,v 1.1.1.1 2003/10/25 18:33:27 pvalchev Exp $
--- until/V1.2/main.c.orig 2003-03-12 15:59:51.000000000 -0700
+++ until/V1.2/main.c 2003-09-19 00:48:05.000000000 -0600
@@ -2051,7 +2051,7 @@ Static void myFixedMenuHandler(long f)
break;
case 13: /*Undelete*/
- undelete();
+ Cundelete();
break;
case 14: /*Zoom*/
@@ -2345,7 +2345,7 @@ Static void buildMenus(void)
addElem("Quit", "^Q", do_exit);
startMenu("Edit");
- addElem("Undelete", "", undelete);
+ addElem("Undelete", "", Cundelete);
addElem("", "", nothing);
addElem("Extend-curFig", "", extendCurFig);
addElem("Extend-files", "", extendFiles);

12
cad/chipmunk/patches/patch-until_V1_2_prim_stuff_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-until_V1_2_prim_stuff_c,v 1.1.1.1 2003/10/25 18:33:27 pvalchev Exp $
--- until/V1.2/prim_stuff.c.orig 2003-03-12 15:59:51.000000000 -0700
+++ until/V1.2/prim_stuff.c 2003-09-19 00:47:39.000000000 -0600
@@ -2620,7 +2620,7 @@ Static void insert_obj(object *o)
/* Restore the top thing from the deleted list */
-void undelete(void)
+void Cundelete(void)
{
object *next;

12
cad/chipmunk/patches/patch-until_V1_2_prim_stuff_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-until_V1_2_prim_stuff_h,v 1.1.1.1 2003/10/25 18:33:27 pvalchev Exp $
--- until/V1.2/prim_stuff.h.orig 2003-09-19 00:44:33.000000000 -0600
+++ until/V1.2/prim_stuff.h 2003-09-19 00:47:30.000000000 -0600
@@ -87,7 +87,7 @@ extern void update_root_mbb(void);
extern void pr_refresh(void);
extern void setup(long x, long y, objkinds kind);
extern void dispose_obj(object *op);
-extern void undelete(void);
+extern void Cundelete(void);
extern void refObj(object *op);
extern void drawObj(object *op);
extern object *copyObj(object *op);

39
cad/chipmunk/patches/patch-view_viewmod_c
View File

@ -1,39 +0,0 @@
$OpenBSD: patch-view_viewmod_c,v 1.1 2013/12/05 12:19:00 naddy Exp $
--- view/viewmod.c.orig Fri Mar 14 04:34:36 2003
+++ view/viewmod.c Thu Dec 5 00:08:23 2013
@@ -2914,7 +2914,7 @@ Static Void ilogwrite(msg)
Char *msg;
{
Char STR2[256];
- Char username[L_cuserid];
+ Char username[LOGIN_NAME_MAX];
if (!(v_initdone && *(Char *)v_p_logfile->val.U99.l1 != '\0'))
return;
@@ -4038,7 +4038,7 @@ boolean appending;
v_curverec *cp;
long ver;
Char STR1[256], STR3[256];
- Char username[L_cuserid];
+ Char username[LOGIN_NAME_MAX];
V.f = NULL;
if (*fn == '\0') {
@@ -6646,7 +6646,7 @@ Char *fn, *buf_;
FILE *f;
cmdrec *cmdp;
Char STR2[256];
- Char username[L_cuserid];
+ Char username[LOGIN_NAME_MAX];
strcpy(buf, buf_);
f = NULL;
@@ -7806,7 +7806,7 @@ boolean quiet;
Char STR1[256];
long SET[3];
Char STR2[256];
- Char username[L_cuserid];
+ Char username[LOGIN_NAME_MAX];
v_exitflag = false;
v_initdone = false;

12
cad/chipmunk/patches/patch-wol_wol_init_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-wol_wol_init_c,v 1.1 2013/12/05 12:19:00 naddy Exp $
--- wol/wol_init.c.orig Wed Mar 12 23:58:23 2003
+++ wol/wol_init.c Thu Dec 5 00:04:16 2013
@@ -495,7 +495,7 @@ Static void init_vars(void)
short i, count;
newci_parserec parsetab[11];
Char infname[81];
- Char username[L_cuserid];
+ Char username[LOGIN_NAME_MAX];
_PROCEDURE TEMP;
/* clear out ALL global varibles upon program invokation */

20
cad/chipmunk/pkg/DESCR
View File

@ -1,20 +0,0 @@
The software tools in the Chipmunk system perform a wide variety of
tasks: electronic circuit simulation and schematic capture, graphics
editing, and curve plotting, to name a few.
Here is a brief description of each of the Chipmunk tools:
Log: a graphical environment for entering circuit schematics, and
for analog and digital circuit simulation.
View: a tool for manipulating and plotting data.
Until: a graphics editor.
Wol: a tool for creating integrated circuit layout.
In addition to these major tools, many supplementary tools are part of
the Chipmunk system.
These tools were originally written for HP 200 Series ("Chipmunk")
computers, and were later ported to Unix and the X Window System.

82
cad/chipmunk/pkg/PLIST
View File

@ -1,82 +0,0 @@
@comment $OpenBSD: PLIST,v 1.6 2013/04/03 15:35:54 naddy Exp $
@conflict wol-*
@conflict analog-*
@bin bin/analog
bin/cview
@bin bin/diglog
bin/fixfet7
@bin bin/loged
@bin bin/until
@bin bin/wol
share/chipmunk/
share/chipmunk/Makefile
share/chipmunk/actel.gate
share/chipmunk/actellog.cnf
share/chipmunk/add
share/chipmunk/ana.gate
share/chipmunk/analog-man.ps
share/chipmunk/analog-tr.ps
share/chipmunk/analog.cnf
share/chipmunk/cheat.text
share/chipmunk/crunch.view
share/chipmunk/diglog.cnf
share/chipmunk/ebasis.view
share/chipmunk/errbar.view
share/chipmunk/errbar2.view
share/chipmunk/examples.log
share/chipmunk/examples.out
share/chipmunk/examples.view
share/chipmunk/fet5model.ps
share/chipmunk/fet7model.pdf
share/chipmunk/fet7model.ps
share/chipmunk/filter.view
share/chipmunk/genlog.cnf
share/chipmunk/groups.cnf
share/chipmunk/histogram.view
share/chipmunk/integrate.view
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/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
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/oview.cnf
share/chipmunk/pens.cnf
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/rev.view
share/chipmunk/reverse.view
share/chipmunk/spcfet5.lgf
share/chipmunk/spctest.lgf
share/chipmunk/swapxy.view
share/chipmunk/tweak.view
share/chipmunk/view.cnf
share/chipmunk/view.log
share/chipmunk/vlsi.cnf
share/chipmunk/zcross.view
share/doc/chipmunk/
share/doc/chipmunk/pensps.map
share/doc/chipmunk/system.untilrc
share/doc/chipmunk/texstuff.ps
share/doc/chipmunk/until.pro
share/doc/chipmunk/until.ps
share/doc/chipmunk/untilstuff.ps

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.126 2014/03/21 17:22:41 sthen Exp $
# $OpenBSD: Makefile,v 1.127 2014/03/21 20:01:42 naddy Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-1.123
PKGNAME = quirks-1.124
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

3
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.133 2014/03/21 17:22:41 sthen Exp $
# $OpenBSD: Quirks.pm,v 1.134 2014/03/21 20:01:42 naddy Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -378,6 +378,7 @@ my $obsolete_reason = {
'svk' => 3,
'p5-SVN-Dump' => 3,
'p5-SVN-Mirror' => 3,
'chipmunk' = 0,
};
# ->is_base_system($handle, $state):