summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1998-10-05 02:56:45 +0000
committerSteve Price <steve@FreeBSD.org>1998-10-05 02:56:45 +0000
commite991c1d1417ed4df458fb273434c622d308bdbec (patch)
tree485cb1cce779b5d555d6f7f907614a29a1e95b3e
parentRemove regexp support libEZ library. (diff)
Fix build for ELF.
Notes
Notes: svn path=/head/; revision=13643
-rw-r--r--graphics/fbm/files/patch-aa117
1 files changed, 48 insertions, 69 deletions
diff --git a/graphics/fbm/files/patch-aa b/graphics/fbm/files/patch-aa
index 4d825d299ac3..400d83edb0d6 100644
--- a/graphics/fbm/files/patch-aa
+++ b/graphics/fbm/files/patch-aa
@@ -1,69 +1,48 @@
-*** Makefile.orig Thu Jun 3 11:30:50 1993
---- Makefile Tue Feb 17 14:37:50 1998
-***************
-*** 63,94 ****
- #
- ################################################################
-
-! INSTALL= ln
-! BIN= /usr/mlm/bin/
-! MAN= /usr/mlm/man/
-! FTP= /usr/mlm/ftp/
-! TIFINC= ../tiff/libtiff/
-! TIFLIB= ../tiff/libtiff/
- MANEXT= l
-
- # Make the C compiler behave on the NeXT
-! DBG= -g -D__STRICT_BSD__
-
- #----------------JPEG linkage----------------
- # If you don't have the JPEG library, use these two lines
-! #JPEG=
-! #JLIB=
- # If you have the JPEG library, use the next lines instead
-! JPEG= -DDO_JPEG -I../jpeg
-! JLIB= -L../jpeg -ljpeg
-
- #----------------Utah RLE linkage----------------
- # If you don't have the Utah RLE library, use these two lines
- RLE=
- RLIB=
- # If you have the Utah RLE library, use the next lines instead
-! #RLE= -DRLE -I/usr/mlm/include
-! #RLIB= -L. -lfbm -L/usr/mlm/lib -lrle
-
- LIB= -L. -lfbm $(JLIB) $(RLIB)
-
---- 63,94 ----
- #
- ################################################################
-
-! INSTALL= install
-! BIN= $(PREFIX)/bin/
- MANEXT= l
-+ MAN= $(PREFIX)/man/man$(MANEXT)/
-+ FTP= /usr/mlm/ftp/
-+ TIFINC= $(LOCALBASE)/include/
-+ TIFLIB= $(LOCALBASE)/lib/
-
- # Make the C compiler behave on the NeXT
-! # DBG= -g -D__STRICT_BSD__
-
- #----------------JPEG linkage----------------
- # If you don't have the JPEG library, use these two lines
-! JPEG=
-! JLIB=
- # If you have the JPEG library, use the next lines instead
-! #JPEG= -DDO_JPEG -I$(LOCALBASE)/include
-! #JLIB= -L$(LOCALBASE)/lib -ljpeg
-
- #----------------Utah RLE linkage----------------
- # If you don't have the Utah RLE library, use these two lines
- RLE=
- RLIB=
- # If you have the Utah RLE library, use the next lines instead
-! #RLE= -DRLE -I$(LOCALBASE)/include
-! #RLIB= -L. -lfbm -L$(LOCALBASE)/lib -lrle
-
- LIB= -L. -lfbm $(JLIB) $(RLIB)
-
+--- Makefile.orig Thu Jun 3 11:30:50 1993
++++ Makefile Sun Oct 4 12:44:18 1998
+@@ -63,32 +63,32 @@
+ #
+ ################################################################
+
+-INSTALL= ln
+-BIN= /usr/mlm/bin/
+-MAN= /usr/mlm/man/
+-FTP= /usr/mlm/ftp/
+-TIFINC= ../tiff/libtiff/
+-TIFLIB= ../tiff/libtiff/
++INSTALL= install -c
++BIN= $(PREFIX)/bin/
+ MANEXT= l
++MAN= $(PREFIX)/man/man$(MANEXT)/
++FTP= /usr/mlm/ftp/
++TIFINC= $(LOCALBASE)/include/
++TIFLIB= $(LOCALBASE)/lib/
+
+ # Make the C compiler behave on the NeXT
+-DBG= -g -D__STRICT_BSD__
++# DBG= -g -D__STRICT_BSD__
+
+ #----------------JPEG linkage----------------
+ # If you don't have the JPEG library, use these two lines
+-#JPEG=
+-#JLIB=
++JPEG=
++JLIB=
+ # If you have the JPEG library, use the next lines instead
+-JPEG= -DDO_JPEG -I../jpeg
+-JLIB= -L../jpeg -ljpeg
++#JPEG= -DDO_JPEG -I$(LOCALBASE)/include
++#JLIB= -L$(LOCALBASE)/lib -ljpeg
+
+ #----------------Utah RLE linkage----------------
+ # If you don't have the Utah RLE library, use these two lines
+ RLE=
+ RLIB=
+ # If you have the Utah RLE library, use the next lines instead
+-#RLE= -DRLE -I/usr/mlm/include
+-#RLIB= -L. -lfbm -L/usr/mlm/lib -lrle
++#RLE= -DRLE -I$(LOCALBASE)/include
++#RLIB= -L. -lfbm -L$(LOCALBASE)/lib -lrle
+
+ LIB= -L. -lfbm $(JLIB) $(RLIB)
+