Rename patches to make update-patches useful, delete the .orig files after

applying the distribution internal patches not to confuse update-patches.
This commit is contained in:
pvalchev 2001-08-02 23:54:56 +00:00
parent 8aa054a42d
commit cdd1b7dcc9
7 changed files with 38 additions and 32 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2001/08/02 22:53:18 pvalchev Exp $
# $OpenBSD: Makefile,v 1.14 2001/08/02 23:54:56 pvalchev Exp $
COMMENT= "Simulation Program for Integrated Circuit Electronics"
@ -30,11 +30,13 @@ pre-patch:
${PATCH} -d ${WRKSRC}/src/lib/fte -E -p1 < grid.patch; \
${PATCH} -d ${WRKSRC}/src/lib/fte -E -p1 < newcoms.patch; \
${PATCH} -d ${WRKSRC}/src/lib/sparse -E -p1 < spsmp.patch
@find ${WRKSRC}/ -name \*.orig -exec rm -f {} \;
.else
@cd ${WRKDIR}/3f4patches; \
${PATCH} -d ${WRKSRC}/src/lib/fte -N -s -E -p1 < grid.patch; \
${PATCH} -d ${WRKSRC}/src/lib/fte -N -s -E -p1 < newcoms.patch; \
${PATCH} -d ${WRKSRC}/src/lib/sparse -N -s -E -p1 < spsmp.patch
@find ${WRKSRC}/ -name \*.orig -exec rm -f {} \;
.endif
do-configure:

View File

@ -1,12 +0,0 @@
--- src/include/cpstd.h.~1~ Wed Apr 14 12:57:42 1993
+++ src/include/cpstd.h Wed Jun 3 14:49:24 1998
@@ -50,7 +50,9 @@
extern char *printnum();
extern int cp_numdgt;
extern void fatal();
+#if ! defined( HAS_STDLIB )
extern void setenv();
+#endif
extern void cp_printword();
/* Externs from wlist.c */

View File

@ -1,12 +0,0 @@
--- src/lib/mfb/mfbgnc.c.orig Mon May 18 03:41:26 1998
+++ src/lib/mfb/mfbgnc.c Tue May 19 00:52:27 1998
@@ -25,7 +25,9 @@
/* Library routines */
#ifdef HAS_FTIME
+#ifndef __OpenBSD__
extern void ftime();
+#endif /*__OpenBSD__*/
#endif
/*

View File

@ -1,6 +1,7 @@
--- src/bin/sconvert.c.~1~ Mon Sep 14 18:30:41 1992
+++ src/bin/sconvert.c Tue Jun 2 22:06:32 1998
@@ -42,6 +42,7 @@
$OpenBSD: patch-src_bin_sconvert_c,v 1.1 2001/08/02 23:54:56 pvalchev Exp $
--- src/bin/sconvert.c.orig Mon Sep 14 19:30:41 1992
+++ src/bin/sconvert.c Thu Aug 2 17:32:11 2001
@@ -42,6 +42,7 @@ main(ac, av)
{
char *sf, *af;
char buf[BSIZE_SP];
@ -8,7 +9,7 @@
char t, f;
struct plot *pl;
int i;
@@ -80,19 +81,47 @@
@@ -80,19 +81,47 @@ main(ac, av)
case 1: printf("Input file: ");
(void) fflush(stdout);

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_include_cpstd_h,v 1.1 2001/08/02 23:54:56 pvalchev Exp $
--- src/include/cpstd.h.orig Wed Apr 14 13:57:42 1993
+++ src/include/cpstd.h Thu Aug 2 17:06:58 2001
@@ -50,7 +50,9 @@ extern char *tildexpand();
extern char *printnum();
extern int cp_numdgt;
extern void fatal();
+#if ! defined( HAS_STDLIB )
extern void setenv();
+#endif
extern void cp_printword();
/* Externs from wlist.c */

View File

@ -1,6 +1,7 @@
--- src/lib/fte/inp.c.~1~ Thu Apr 29 16:06:28 1993
+++ src/lib/fte/inp.c Tue Jun 2 22:07:46 1998
@@ -666,7 +666,7 @@
$OpenBSD: patch-src_lib_fte_inp_c,v 1.1 2001/08/02 23:54:56 pvalchev Exp $
--- src/lib/fte/inp.c.orig Thu Apr 29 17:06:28 1993
+++ src/lib/fte/inp.c Thu Aug 2 17:06:58 2001
@@ -666,7 +666,7 @@ com_edit(wl)
fprintf(cp_out, "run circuit? ");
fflush(cp_out);

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_lib_mfb_mfbgnc_c,v 1.1 2001/08/02 23:54:56 pvalchev Exp $
--- src/lib/mfb/mfbgnc.c.orig Tue Apr 9 20:08:26 1991
+++ src/lib/mfb/mfbgnc.c Thu Aug 2 17:06:58 2001
@@ -25,7 +25,9 @@ Author: -C- 1982 Giles C. Billingsley
/* Library routines */
#ifdef HAS_FTIME
+#ifndef __OpenBSD__
extern void ftime();
+#endif /*__OpenBSD__*/
#endif
/*