summaryrefslogtreecommitdiff
path: root/graphics/hp2xx/patches/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/hp2xx/patches/patch-ab')
-rw-r--r--graphics/hp2xx/patches/patch-ab64
1 files changed, 44 insertions, 20 deletions
diff --git a/graphics/hp2xx/patches/patch-ab b/graphics/hp2xx/patches/patch-ab
index 4db7686c0cb..404fb064f30 100644
--- a/graphics/hp2xx/patches/patch-ab
+++ b/graphics/hp2xx/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2002/02/18 15:14:21 seb Exp $
+$NetBSD: patch-ab,v 1.7 2004/11/28 15:12:11 dmcmahill Exp $
---- Makefile.orig Fri Feb 15 14:23:08 2002
+--- Makefile.orig Sat Nov 27 23:52:19 2004
+++ Makefile
-@@ -28,13 +28,13 @@
+@@ -28,13 +28,13 @@ SHELL = /bin/sh
CHMOD = chmod
CP = cp
@@ -18,55 +18,79 @@ $NetBSD: patch-ab,v 1.6 2002/02/18 15:14:21 seb Exp $
bindir = $(prefix)/bin
includedir = $(prefix)/include
mandir = $(prefix)/man
-@@ -44,12 +44,12 @@
+@@ -44,12 +44,12 @@ infodir = $(prefix)/info
# CC and CFLAGS set for gcc, but any ANSI-C compiler should work.
# For non-gcc compilers, simply set CFLAGS = -O (to start with)
#
-CC = gcc
--CFLAGS = -O2 -Wall -ansi -fstrength-reduce -finline-functions
+-CFLAGS = -O2 -Wall -finline-functions
+#CC = gcc
-+CFLAGS+= -Wall -ansi -fstrength-reduce -finline-functions
++#CFLAGS = -O2 -Wall -finline-functions
-LFLAGS = # only sometimes needed; see below for examples
-CPPFLAGS = -I. # only sometimes needed; see below for examples
-BINDCMD = # only needed for EMX and DJGPP DOS extenders
-+LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib # only sometimes needed; see below for examples
-+CPPFLAGS = -I. -I${X11BASE}/include -I${LOCALBASE}/include # only sometimes needed; see below for examples
-+BINDCMD = echo # only needed for EMX and DJGPP DOS extenders
++LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
++CPPFLAGS = -I. -I${X11BASE}/include -I${LOCALBASE}/include
++BINDCMD = echo
-@@ -62,7 +62,7 @@
+@@ -62,7 +62,7 @@ BINDCMD = # only needed
#
DEFINES = -DUNIX -DHAS_UNIX_X11
PREVIEWER = to_x11
-ALL_LIBS = -lX11 -lm # Maybe -lX instead of -lX11 is needed?
-+ALL_LIBS = -lX11 -lm -lz -lpng -ltiff -ljpeg
++ALL_LIBS = -lX11 -lm -lz -lpng -lpdf -ltiff -ljpeg
#
# Generic UNIX, no previewer
#
-@@ -182,14 +182,14 @@
+@@ -197,29 +197,29 @@ EX_OBJ =
EX_DEFS =
#
# PNG support (requires -lpng and -lz on the ALL_LIBS line)
-#EX_SRC = png.c to_png.c
-#EX_OBJ = png.o to_png.o
-#EX_DEFS= -DPNG
-+EX_SRC+= png.c to_png.c
-+EX_OBJ+= png.o to_png.o
-+EX_DEFS+= -DPNG
++EX_SRC = png.c to_png.c
++EX_OBJ = png.o to_png.o
++EX_DEFS= -DPNG
#
# TIFF support (requires -ltiff and possibly -lz on the ALL_LIBS line)
-#EX_SRC = to_tif.c
-#EX_OBJ = to_tif.o
-#EX_DEFS = -DTIF
-+EX_SRC+= to_tif.c
-+EX_OBJ+= to_tif.o
-+EX_DEFS+= -DTIF
++EX_SRC = to_tif.c
++EX_OBJ = to_tif.o
++EX_DEFS = -DTIF
+ #
+ # JPEG support (requires -ljpeg)
+-#EX_SRC = to_jpg.c
+-#EX_OBJ = to_jpg.o
+-#EX_DEFS = -DJPG
++EX_SRC = to_jpg.c
++EX_OBJ = to_jpg.o
++EX_DEFS = -DJPG
+ #
+ # PDF support (requires -lpdf)
+-#EX_SRC = to_pdf.c
+-#EX_OBJ = to_pdf.o
+-#EX_DEFS = -DUSEPDF
++EX_SRC = to_pdf.c
++EX_OBJ = to_pdf.o
++EX_DEFS = -DUSEPDF
#
# Include extras:
- # EX_SRC = to_pic.c to_pac.c
-@@ -305,15 +305,11 @@
+-# EX_SRC = to_pic.c to_pac.c
+-# EX_OBJ = to_pic.o to_pac.o
+-# EX_DEFS = -DPIC_PAC
++EX_SRC = to_pic.c to_pac.c
++EX_OBJ = to_pic.o to_pac.o
++EX_DEFS = -DPIC_PAC
+ #
+ #############################################################################
+ # No user-serviceable parts below!
+@@ -332,15 +332,11 @@ TAGS:
install: install-bin install-info install-man
install-bin: $(PROGRAM)