diff options
Diffstat (limited to 'math/calctool/files')
| -rw-r--r-- | math/calctool/files/patch-Makefile | 115 | ||||
| -rw-r--r-- | math/calctool/files/patch-display.c | 10 | ||||
| -rw-r--r-- | math/calctool/files/patch-functions.c | 26 | ||||
| -rw-r--r-- | math/calctool/files/patch-get.c | 26 | ||||
| -rw-r--r-- | math/calctool/files/patch-graphics.c | 44 | ||||
| -rw-r--r-- | math/calctool/files/patch-tty.c | 55 | ||||
| -rw-r--r-- | math/calctool/files/patch-xview.c | 20 |
7 files changed, 0 insertions, 296 deletions
diff --git a/math/calctool/files/patch-Makefile b/math/calctool/files/patch-Makefile deleted file mode 100644 index 5c8e17fe46e6..000000000000 --- a/math/calctool/files/patch-Makefile +++ /dev/null @@ -1,115 +0,0 @@ ---- Makefile.orig Sat May 29 20:35:43 1993 -+++ Makefile Thu Jul 13 12:05:36 2006 -@@ -28,7 +28,7 @@ - # It can also be specified here by uncommenting the following - # macro definition and setting appropriately. - # --HELPNAME = -DHELPNAME=\"$(LIBDIR)/calctool.help\" -+HELPNAME = -DHELPNAME=\"%%DATADIR%%/calctool.help\" - #----------------------------------------------------------------------- - # An attempt is now made at using a portable math library. You should - # carefully setup the following three definitions. -@@ -85,13 +85,13 @@ - # uncomment the other three definitions below, commented out the initial - # two. - # --LIBNAME = libcalctool.a --CALCLIB = $(LIBNAME) -+#LIBNAME = libcalctool.a -+#CALCLIB = $(LIBNAME) - # - # Shared library definitions. Uncomment if required. --#LIBNAME = libcalctool.so.1.1 --#CALCLIB = -L. -lcalctool --#SHLIB = -pic -+LIBNAME = libcalctool.so.1 -+CALCLIB = -L . -lcalctool -+SHLIB = %%FPIC%% - #----------------------------------------------------------------------- - # If you are not running under a BSD4.3 derived system, then the - # second parameter to a select call is a pointer to an integer function, -@@ -116,38 +116,37 @@ - # library files are not in a standard place, then the following - # two lines should be uncommented, and set appropriately. - # --#X11INCDIR = -I$(OPENWINHOME)/include --#X11LIBDIR = -L$(OPENWINHOME)/lib -+X11INCDIR = -I%%LOCALBASE%%/include -+X11LIBDIR = -L%%LOCALBASE%%/lib - #------------------------------------------------------------------------- - # If you are compiling the XView version, then the following two lines - # should be uncommented. - # --XVIEWINCDIR = -I$(OPENWINHOME)/include --XVIEWLIBDIR = -L$(OPENWINHOME)/lib -+XVIEWINCDIR = -I%%LOCALBASE%%/include -+XVIEWLIBDIR = -L%%LOCALBASE%%/lib - # - #========================================================================= - # - # Default locations where calctool files will be installed. - # You might wish to alter these values. - # --BINDIR = /usr/local/bin --LIBDIR = /usr/local/lib --MANDIR = /usr/man/man$(MANSECT) --MANSECT = l -+BINDIR = $(PREFIX)/bin -+LIBDIR = $(PREFIX)/lib -+MANDIR = $(PREFIX)/man/man$(MANSECT) -+MANSECT = 1 - # - # Compilation flags and standard macro definitions. - # --CFLAGS = -g $(HELPNAME) $(NEWSFILE) $(STUPID_FPE) $(NOIEEE) \ -+CFLAGS += $(HELPNAME) $(NEWSFILE) $(STUPID_FPE) $(NOIEEE) \ - $(NOINDEX) $(RCNAME) $(SELTYPE) $(SHLIB) $(SIGRET) \ - $(SUN4_KEYBOARD) $(TTEXT) $(MGRPARAM) $(MGRINCDIR) \ - $(X11INCDIR) $(XVIEWINCDIR) - # - #========================================================================= - --BINARIES = mgr_calctool ps_calctool sv_calctool \ -- tty_calctool xcalctool xv_calctool -+BINARIES = %%BINARIES%% - --CC = cc -+#CC = cc - - LIBSRCS = graphics.c display.c functions.c get.c - LIBOBJS = graphics.o display.o functions.o get.o -@@ -208,19 +207,16 @@ - $(CC) -o sv_calctool $(CFLAGS) $(STDOBJS) sunview.o $(SVIEWLIBS) - -cp sv_calctool calctool - --tty: $(OBJS) tty.o -+tty_calctool: $(OBJS) tty.o - $(CC) -o tty_calctool $(CFLAGS) $(STDOBJS) tty.o $(TTYLIBS) -- -cp tty_calctool calctool - --x11: $(OBJS) x11.o -+xcalctool: $(OBJS) x11.o - $(CC) -o xcalctool $(X11LIBDIR) $(CFLAGS) $(STDOBJS) x11.o \ - $(X11LIBS) -- -cp xcalctool calctool - --xview: $(OBJS) xview.o -+xv_calctool: $(OBJS) xview.o - $(CC) -o xv_calctool $(XVIEWLIBDIR) $(CFLAGS) $(STDOBJS) \ - xview.o $(XVIEWLIBS) -- -cp xv_calctool calctool - - libcalctool.a: $(LIBOBJS) - ar rv $@ $? -@@ -229,8 +225,9 @@ - # These are the library creation rules for making the shared calctool - # library (available with SunOS v4.x). - --libcalctool.so.1.1: $(LIBOBJS) -- ld -o libcalctool.so.1.1 -assert pure-text $? -+libcalctool.so.1: $(LIBOBJS) -+ $(CC) -shared -o ${LIBNAME} $? -+ ln -sf ${LIBNAME} libcalctool.so - - install: - install -c -m 644 $(LIBNAME) $(LIBDIR) diff --git a/math/calctool/files/patch-display.c b/math/calctool/files/patch-display.c deleted file mode 100644 index 9e59e7cb0fb3..000000000000 --- a/math/calctool/files/patch-display.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ./display.c.orig 1990-02-02 03:02:53.000000000 +0100 -+++ ./display.c 2012-08-24 12:52:07.093913492 +0200 -@@ -269,6 +269,7 @@ - } - - -+void - process_item(n) - int n ; - { diff --git a/math/calctool/files/patch-functions.c b/math/calctool/files/patch-functions.c deleted file mode 100644 index c1b21b5e5fe9..000000000000 --- a/math/calctool/files/patch-functions.c +++ /dev/null @@ -1,26 +0,0 @@ ---- ./functions.c.orig 1993-06-02 19:13:52.000000000 +0200 -+++ ./functions.c 2012-08-24 12:53:33.505914506 +0200 -@@ -233,6 +233,7 @@ - } - - -+void - do_help() /* Show online help facility. */ - { - char help_str[MAXLINE], nextline[MAXLINE], *p ; -@@ -333,6 +334,7 @@ - } - - -+void - do_number() - { - int n ; -@@ -371,6 +373,7 @@ - } - - -+void - do_pending() - { - if (base != DEC) grey_buttons(DEC) ; /* Reshow all the keys. */ diff --git a/math/calctool/files/patch-get.c b/math/calctool/files/patch-get.c deleted file mode 100644 index 9f0a2903643e..000000000000 --- a/math/calctool/files/patch-get.c +++ /dev/null @@ -1,26 +0,0 @@ ---- ./get.c.orig 1990-02-16 00:28:39.000000000 +0100 -+++ ./get.c 2012-08-24 12:54:31.377915039 +0200 -@@ -157,6 +157,7 @@ - } - - -+void - get_helpfile(helpname) /* Open helpfile if present. */ - char *helpname ; - { -@@ -188,6 +189,7 @@ - } - - -+void - get_rcfile(name) /* Read .calctoolrc file. */ - char *name ; - { -@@ -281,6 +283,7 @@ - } - - -+void - read_rcfiles() /* Read .calctoolrc's from home and current directories. */ - { - char *home ; /* Pathname for users home directory. */ diff --git a/math/calctool/files/patch-graphics.c b/math/calctool/files/patch-graphics.c deleted file mode 100644 index fff4080e66ef..000000000000 --- a/math/calctool/files/patch-graphics.c +++ /dev/null @@ -1,44 +0,0 @@ ---- ./graphics.c.orig 1990-02-02 03:02:42.000000000 +0100 -+++ ./graphics.c 2012-08-24 12:51:05.209915967 +0200 -@@ -20,7 +20,9 @@ - #include "color.h" - #include "extern.h" - -+void make_registers(); - -+void - but_text(row, column, portion, state) - int row, column, portion ; - enum but_state state ; -@@ -116,6 +118,7 @@ - } - - -+void - grey_buttons(base) /* Grey out numeric buttons depending upon base. */ - enum base_type base ; - { -@@ -142,6 +145,7 @@ - } - - -+void - handle_down_event(type) - int type ; - { -@@ -263,6 +267,7 @@ - } - - -+void - make_registers() /* Calculate memory register frame values. */ - { - char line[MAXLINE] ; /* Current memory register line. */ -@@ -279,6 +284,7 @@ - } - - -+void - process_event(type) /* Process this event. */ - int type ; - { diff --git a/math/calctool/files/patch-tty.c b/math/calctool/files/patch-tty.c deleted file mode 100644 index 3ca66993a29f..000000000000 --- a/math/calctool/files/patch-tty.c +++ /dev/null @@ -1,55 +0,0 @@ ---- ./tty.c.orig 1990-02-06 05:47:47.000000000 +0100 -+++ ./tty.c 2012-08-24 12:55:15.782915559 +0200 -@@ -18,6 +18,7 @@ - #include <stdio.h> - #include <strings.h> - #include <signal.h> -+#include <termios.h> - #include <sys/types.h> - #include <sys/ioctl.h> - #include <sys/time.h> -@@ -30,7 +31,7 @@ - char *getenv(), *tgetstr(), *tgoto() ; - int destroy_frame(), outc() ; - --struct sgttyb in_new, in_old ; -+struct termios in_new, in_old ; - - - SIGRET -@@ -90,7 +91,7 @@ - } - do_move(0, 0) ; - SIGNAL(SIGINT, SIG_IGN) ; -- IOCTL(0, TIOCSETP, &in_old) ; -+ tcsetattr(0, TCSANOW, &in_old) ; - exit(0) ; - } - -@@ -128,6 +129,7 @@ - } - - -+void - drawline(x1, y1, x2, y2) - int x1, y1, x2, y2 ; - { -@@ -315,11 +317,14 @@ - - SIGNAL(SIGINT, cleanup) ; - -- IOCTL(0, TIOCGETP, &in_old) ; /* Setup standard input. */ -+ tcgetattr(0, &in_old) ; /* Setup standard input. */ - in_new = in_old ; -- in_new.sg_flags |= RAW ; -- in_new.sg_flags &= ~(ECHO | CRMOD) ; -- IOCTL(0, TIOCSETP, &in_new) ; -+ in_new.c_iflag |= IGNBRK; -+ in_new.c_iflag &= ~ICRNL; -+ in_new.c_lflag &= ~(ECHOCTL|ISIG|ICANON|IEXTEN); -+ in_new.c_oflag &= ~ONLCR; -+ in_new.c_lflag &= ~ECHO; -+ tcsetattr(0, TCSANOW, &in_new) ; - - setbuf(stdout, (char *) NULL) ; - diff --git a/math/calctool/files/patch-xview.c b/math/calctool/files/patch-xview.c deleted file mode 100644 index 993c90c42bd8..000000000000 --- a/math/calctool/files/patch-xview.c +++ /dev/null @@ -1,20 +0,0 @@ ---- xview.c.orig Thu Jul 13 12:10:02 2006 -+++ xview.c Thu Jul 13 12:11:30 2006 -@@ -525,7 +525,7 @@ - XV_HEIGHT, 16, - SERVER_IMAGE_BITS, help_cursor_array, - 0) ; -- help_cursor = xv_create(NULL, CURSOR, -+ help_cursor = xv_create(0, CURSOR, - CURSOR_XHOT, 0, - CURSOR_YHOT, 0, - CURSOR_OP, PIX_SRC | PIX_DST, -@@ -590,7 +590,7 @@ - { - int choice ; - -- choice = (int) menu_get(menu_item, MENU_VALUE,NULL) ; -+ choice = (int) menu_get(menu_item, MENU_VALUE, 0) ; - if (choice) handle_menu_selection(curmenu, choice) ; - } - |