diff options
author | Adam Weinberger <adamw@FreeBSD.org> | 2014-07-28 23:33:47 +0000 |
---|---|---|
committer | Adam Weinberger <adamw@FreeBSD.org> | 2014-07-28 23:33:47 +0000 |
commit | a14c0668720dcafde3f60b7659a01d99ec693a41 (patch) | |
tree | 9c1a149bc961f7cd84b7aa93a2d61fec3d0f9685 /math/calctool/files/patch-ab | |
parent | Rename mail/ patch-xy patches to reflect the files they modify. (diff) |
Rename math/ patch-xy patches to reflect the files they modify.
Notes
Notes:
svn path=/head/; revision=363276
Diffstat (limited to 'math/calctool/files/patch-ab')
-rw-r--r-- | math/calctool/files/patch-ab | 115 |
1 files changed, 0 insertions, 115 deletions
diff --git a/math/calctool/files/patch-ab b/math/calctool/files/patch-ab deleted file mode 100644 index 5c8e17fe46e6..000000000000 --- a/math/calctool/files/patch-ab +++ /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) |