- use our naming scheme for patches

This commit is contained in:
ajacoutot 2007-10-26 22:00:31 +00:00
parent 8b6b52a5bd
commit 6f6a7ef275
17 changed files with 109 additions and 115 deletions

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-Makefile,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- Makefile.orig Fri Oct 26 23:52:30 2007
+++ Makefile Fri Oct 26 23:52:33 2007
@@ -23,8 +23,8 @@ OBJ = astrolog.o data.o data2.o general.o io.o\
charts0.o charts1.o charts2.o charts3.o intrpret.o\
xdata.o xgeneral.o xdevice.o xcharts0.o xcharts1.o xcharts2.o xscreen.o
# If you don't have X windows, delete the "-lX11" part from the line below:
-LIBS = -lm -lX11
-CFLAGS = -O
+LIBS = -L${X11BASE}/lib -lX11 -lm
+CFLAGS += -I${X11BASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\"
astrolog:: $(OBJ)
cc -o $(NAME) $(OBJ) $(LIBS)

View File

@ -1,21 +0,0 @@
*** makefile.unx.bak Sun Sep 29 23:27:00 1996
--- Makefile Tue Jan 14 01:06:55 1997
***************
*** 23,30 ****
charts0.o charts1.o charts2.o charts3.o intrpret.o\
xdata.o xgeneral.o xdevice.o xcharts0.o xcharts1.o xcharts2.o xscreen.o
# If you don't have X windows, delete the "-lX11" part from the line below:
! LIBS = -lm -lX11
! CFLAGS = -O
astrolog:: $(OBJ)
cc -o $(NAME) $(OBJ) $(LIBS)
--- 23,30 ----
charts0.o charts1.o charts2.o charts3.o intrpret.o\
xdata.o xgeneral.o xdevice.o xcharts0.o xcharts1.o xcharts2.o xscreen.o
# If you don't have X windows, delete the "-lX11" part from the line below:
! LIBS = -L${X11BASE}/lib -lX11 -lm
! CFLAGS += -I${X11BASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\"
astrolog:: $(OBJ)
cc -o $(NAME) $(OBJ) $(LIBS)

View File

@ -1,39 +0,0 @@
*** astrolog.h.orig Sun Feb 2 23:06:03 1997
--- astrolog.h Thu May 29 05:06:03 1997
***************
*** 82,92 ****
#define ENVIRON /* Comment out this #define if your system doesn't have */
/* environment variables or can't compile calls to them. */
! #define ATOF /* Comment out this #define if you have a system in which */
/* 'atof' and related functions aren't defined in stdio.h, */
/* such as most PC's, Linux, VMS compilers, and NeXT's. */
! /*#define PROTO /* Comment out this #define if you have an older compiler */
/* which doesn't allow full Ansi function prototypes. This */
/* is for programmers only and has no effect on executable. */
--- 82,92 ----
#define ENVIRON /* Comment out this #define if your system doesn't have */
/* environment variables or can't compile calls to them. */
! /*#define ATOF /* Comment out this #define if you have a system in which */
/* 'atof' and related functions aren't defined in stdio.h, */
/* such as most PC's, Linux, VMS compilers, and NeXT's. */
! #define PROTO /* Comment out this #define if you have an older compiler */
/* which doesn't allow full Ansi function prototypes. This */
/* is for programmers only and has no effect on executable. */
***************
*** 131,137 ****
--- 131,139 ----
*/
#ifndef PC
+ #ifndef DEFAULT_DIR
#define DEFAULT_DIR "~/astrolog"
+ #endif
#else
#define DEFAULT_DIR "C:\\ASTROLOG"
#endif

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-astrolog_h,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- astrolog.h.orig Fri Oct 26 23:52:30 2007
+++ astrolog.h Fri Oct 26 23:52:33 2007
@@ -82,11 +82,11 @@
#define ENVIRON /* Comment out this #define if your system doesn't have */
/* environment variables or can't compile calls to them. */
-#define ATOF /* Comment out this #define if you have a system in which */
+/*#define ATOF /* Comment out this #define if you have a system in which */
/* 'atof' and related functions aren't defined in stdio.h, */
/* such as most PC's, Linux, VMS compilers, and NeXT's. */
-/*#define PROTO /* Comment out this #define if you have an older compiler */
+#define PROTO /* Comment out this #define if you have an older compiler */
/* which doesn't allow full Ansi function prototypes. This */
/* is for programmers only and has no effect on executable. */
@@ -131,7 +131,9 @@
*/
#ifndef PC
+#ifndef DEFAULT_DIR
#define DEFAULT_DIR "~/astrolog"
+#endif
#else
#define DEFAULT_DIR "C:\\ASTROLOG"
#endif

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-Makefile,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- Makefile.orig Thu Jan 9 07:19:34 1997
+++ Makefile Tue Mar 20 18:26:43 2001
@@ -17,10 +17,10 @@
+++ Makefile Fri Oct 26 23:53:28 2007
@@ -17,10 +17,10 @@ HAVE_RC_FILE=true
# can be disabled to make dialog a bit smaller (could be done for more things)
HAVE_GUAGE=true
@ -14,7 +15,7 @@
CPP = gcc -E
OPTIM = -O2 -Wall -Wstrict-prototypes -fomit-frame-pointer -pipe
#OPTIM = -O -Wall -Wstrict-prototypes -g -pipe
@@ -29,8 +29,8 @@
@@ -29,8 +29,8 @@ OPTIM = -O2 -Wall -Wstrict-prototypes -fomit-frame-poi
#----------------------------------------------------------------------------
# do not edit below this line
@ -25,7 +26,7 @@
LDLIBS = -ldialog
OBJS = checklist.o inputbox.o menubox.o msgbox.o \
@@ -42,8 +42,8 @@
@@ -42,8 +42,8 @@ CFLAGS+=-DHAVE_LIBGPM
OBJS+=mouse.o
endif
ifeq ($(HAVE_NCURSES), true)
@ -36,7 +37,7 @@
endif
ifeq ($(HAVE_RC_FILE), true)
CFLAGS+=-DHAVE_RC_FILE
@@ -59,7 +59,8 @@
@@ -59,7 +59,8 @@ SRCS = $(OBJS:.o=.c)
all: libdialog.a dialog
libdialog.a: $(OBJS)

View File

@ -1,6 +1,7 @@
--- dialog.c.orig Mon Nov 8 14:48:14 1999
+++ dialog.c Mon Nov 8 14:48:42 1999
@@ -56,7 +56,7 @@
$OpenBSD: patch-dialog_c,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- dialog.c.orig Thu Jan 9 07:14:39 1997
+++ dialog.c Fri Oct 26 23:53:28 2007
@@ -56,7 +56,7 @@ static struct Mode modes[] =
{"--radiolist", 9, 0, 3, j_radiolist},
{"--inputbox", 5, 6, 1, j_inputbox},
#ifdef HAVE_GUAGE
@ -9,7 +10,7 @@
#endif
{NULL, 0, 0, 0, NULL}
};
@@ -197,7 +197,7 @@
@@ -197,7 +197,7 @@ fprintf(stderr," %s [--title <title>] [--separat
\n --checklist <text> <height> <width> <list height> <tag1> <item1> <status1>...\
\n --radiolist <text> <height> <width> <list height> <tag1> <item1> <status1>...\n",name);
#ifdef HAVE_GUAGE

View File

@ -1,6 +1,7 @@
--- dialog.man.orig Mon Nov 8 14:49:01 1999
+++ dialog.man Mon Nov 8 14:49:52 1999
@@ -41,7 +41,7 @@
$OpenBSD: patch-dialog_man,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- dialog.man.orig Thu Jan 9 07:15:24 1997
+++ dialog.man Fri Oct 26 23:53:28 2007
@@ -41,7 +41,7 @@ these types of dialog boxes are implemented:
.BR yes/no " box," " menu" " box," " input" " box,"
.BR message " box," " text" " box," " info" " box,"
'\" NOHAVEGUAGE
@ -9,7 +10,7 @@
'\" NOHAVEGUAGE
.BR checklist " box, and" " radiolist" " box."
.SH OPTIONS
@@ -189,14 +189,14 @@
@@ -189,14 +189,14 @@ that you can indicate which entry is currently selecte
.IR status " to " on "."
'\" NOHAVEGUAGE

View File

@ -1,6 +1,7 @@
--- guage.c.orig Mon Nov 8 14:08:43 1999
+++ guage.c Mon Nov 8 14:36:22 1999
@@ -86,16 +86,16 @@
$OpenBSD: patch-guage_c,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- guage.c.orig Sat Aug 12 00:54:52 1995
+++ guage.c Fri Oct 26 23:53:28 2007
@@ -86,16 +86,16 @@ dialog_guage (const char *title, const char *prompt, i
if (feof (stdin))
break;

View File

@ -1,6 +1,7 @@
--- tkcron.tcl.orig Tue Oct 10 09:56:00 1995
+++ tkcron.tcl Mon Mar 27 20:17:48 2000
@@ -281,6 +281,7 @@
$OpenBSD: patch-tkcron_tcl,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- tkcron.tcl.orig Fri Oct 26 23:55:57 2007
+++ tkcron.tcl Fri Oct 26 23:55:58 2007
@@ -281,6 +281,7 @@ proc getEntryFromGadgets {} {
# Return the crontab string as a list
proc parseCrontabFile {str} {

View File

@ -1,5 +1,6 @@
--- Makefile.patched Sat Mar 8 18:07:20 1997
+++ Makefile Sat Mar 8 18:08:02 1997
$OpenBSD: patch-Makefile,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- Makefile.orig Fri Apr 14 15:30:54 1995
+++ Makefile Fri Oct 26 23:57:18 2007
@@ -1,42 +1,30 @@
#######
-# Where the executable goes
@ -47,7 +48,7 @@
####################################################################
# You shouldn't have to modify anything below this line.
####################################################################
@@ -89,15 +77,13 @@
@@ -89,15 +77,13 @@ inviz_num.o: viz.h translate.h
$(CC) $(CFLAGS) -c inviz_num.c
install: viz inviz
@ -68,24 +69,3 @@
# Because of the wide variation in shar commands, the shar arguments
# used below sticks to a minimal set, and we generate various shar file
--- viz.c.patched Sat Mar 8 18:07:20 1997
+++ viz.c Sat Mar 8 18:07:26 1997
@@ -55,14 +55,17 @@
#define VIZ_MAIN
#include "viz.h"
+#ifndef _SYS_ERRNO_H_
extern errno;
extern int sys_nerr;
extern char *sys_errlist[];
+#endif
-
+#ifndef _STDLIB_H_
extern char *malloc();
extern optind, opterr;
extern char *optarg;
+#endif
char *prog;
struct Format Fmt = {

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-viz_c,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- viz.c.orig Fri Apr 14 15:30:56 1995
+++ viz.c Fri Oct 26 23:57:18 2007
@@ -55,14 +55,17 @@
#define VIZ_MAIN
#include "viz.h"
+#ifndef _SYS_ERRNO_H_
extern errno;
extern int sys_nerr;
extern char *sys_errlist[];
+#endif
-
+#ifndef _STDLIB_H_
extern char *malloc();
extern optind, opterr;
extern char *optarg;
+#endif
char *prog;
struct Format Fmt = {

View File

@ -1,6 +1,8 @@
--- Imakefile.orig Mon Jul 17 07:28:19 1995
+++ Imakefile Sun Jul 9 19:59:27 2000
@@ -22,7 +22,7 @@
--- Imakefile.orig Mon Jul 17 13:28:19 1995
+++ Imakefile Fri Oct 26 23:58:56 2007
@@ -20,9 +20,9 @@
SUBDIRS = common Xbr
-SYS_LIBRARIES = $(XBRLIB) $(COMMONLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) -lm
+SYS_LIBRARIES = -L${PREFIX}/lib $(XBRLIB) $(COMMONLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) -lm
@ -10,7 +12,7 @@
SRCS = about.c help.c xtar.c
OBJS = $(SRCS:.c=.o)
@@ -30,5 +30,5 @@
@@ -30,5 +30,5 @@ OBJS = $(SRCS:.c=.o)
MakeSubdirs($(SUBDIRS))
ComplexProgramTarget(xtar)
MakeDirectories(install,$(LIBDIR)/xtar)

View File

@ -1,6 +1,6 @@
--- Xbr/Imakefile.orig Sun Jul 9 19:58:00 2000
+++ Xbr/Imakefile Sun Jul 9 19:58:13 2000
@@ -20,7 +20,7 @@
--- Xbr/Imakefile.orig Tue May 9 10:06:46 1995
+++ Xbr/Imakefile Fri Oct 26 23:58:56 2007
@@ -20,7 +20,7 @@ SRCS = XbrCB.c XbrCreate.c XbrCursor.c XbrDialog.c \
OBJS = $(SRCS:.c=.o)

View File

@ -1,5 +1,6 @@
$OpenBSD: patch-XTar_tmpl,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- XTar.tmpl.orig Mon Jul 17 14:04:17 1995
+++ XTar.tmpl Wed Jun 7 00:29:15 2000
+++ XTar.tmpl Fri Oct 26 23:58:56 2007
@@ -27,7 +27,7 @@ CCOPTIONS = -Ae
XMINC = -I/usr/include/Motif1.2
XMLIB = -L/usr/lib/Motif1.2 -lXm -lPW

View File

@ -1,5 +1,6 @@
$OpenBSD: patch-common_str_c,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- common/str.c.orig Tue May 9 10:06:46 1995
+++ common/str.c Wed Jun 7 00:29:15 2000
+++ common/str.c Fri Oct 26 23:58:56 2007
@@ -283,7 +283,6 @@ char *str_word(char **string)
char *str_error(int errnum)
{

View File

@ -1,5 +1,6 @@
$OpenBSD: patch-common_tmpfile_c,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- common/tmpfile.c.orig Tue May 9 10:06:46 1995
+++ common/tmpfile.c Wed Jun 7 00:29:15 2000
+++ common/tmpfile.c Fri Oct 26 23:58:56 2007
@@ -90,7 +90,12 @@ void tmpfile_free()
char *tmpfile_create()
{

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-xtar_c,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- xtar.c.orig Mon Jul 17 13:44:19 1995
+++ xtar.c Wed Jun 7 00:29:15 2000
@@ -1164,7 +1164,7 @@ static int xtar_show(char *tfname, char
+++ xtar.c Fri Oct 26 23:58:56 2007
@@ -1164,7 +1164,7 @@ static int xtar_show(char *tfname, char *filename)
static int xtar_attributes(TAR_FILE *tf, char *filename)
{
int retval = 0;