aboutsummaryrefslogtreecommitdiff
path: root/graphics/netpbm/files/patch-bc
blob: d109dcf2d5b94efb87d4c370363e1c74829f137e (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
--- Makefile.config.orig	Mon Jun  5 08:08:43 2000
+++ Makefile.config	Sat Jun 10 00:00:00 2000
@@ -39,7 +39,7 @@
 #Tru64:
 #CC =		cc
 #CC =		gcc
-CC =		gcc
+CC ?=		gcc
 
 # The linker.
 LD = $(CC)
@@ -53,7 +53,7 @@
 # calls compress or pack.  Mantocat, included with Netpbm, is used on
 # systems which use man pages in the "cat" format.
 
-MANCP =	$(INSTALL) -m $(INSTALL_PERM_MAN)
+MANCP =	${BSD_INSTALL_MAN}
 #MANCP = $(SRCDIR)/mantocat
 
 # MAKE is set automatically by Make to what was used to invoke Make.
@@ -73,7 +73,7 @@
 
 # C compiler options
 
-CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG)
+CFLAGS += $(CDEBUG)
 # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
 #Tru64:
 #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
@@ -123,7 +123,7 @@
 # independent code, so you need -fpic or fPIC here.  (The rule is: if 
 # -fpic works, use it.  If it bombs, go to fPIC).
 
-CFLAGS_SHLIB = 
+CFLAGS_SHLIB = -fPIC -DPIC
 # Solaris, SunOS, and NetBSD:
 #CFLAGS_SHLIB = -fpic
 #CFLAGS_SHLIB = -fPIC
@@ -142,8 +142,8 @@
 TIFFHDR_DIR = $(SRCDIR)/libtiff
 TIFFLIB_DIR = $(SRCDIR)/libtiff
 #NetBSD:
-#TIFFHDR_DIR = $(LOCALBASE)/include
-#TIFFLIB_DIR = $(LOCALBASE)/lib
+TIFFHDR_DIR = $(LOCALBASE)/include
+TIFFLIB_DIR = $(LOCALBASE)/lib
 # OSF, Tru64:
 #TIFFHDR_DIR = /usr/local1/DEC/include
 #TIFFLIB_DIR = /usr/local1/DEC/lib
@@ -164,11 +164,11 @@
 # at least JPEGLIB_DIR here, or the tiff converters will not build at
 # all.
 
-JPEGLIB_DIR = /usr/lib/jpeg
-JPEGHDR_DIR = /usr/include/jpeg
+#JPEGLIB_DIR = /usr/lib/jpeg
+#JPEGHDR_DIR = /usr/include/jpeg
 # Netbsd:
-#JPEGLIB_DIR = ${LOCALBASE}/lib
-#JPEGHDR_DIR = ${LOCALBASE}/include
+JPEGLIB_DIR = ${LOCALBASE}/lib
+JPEGHDR_DIR = ${LOCALBASE}/include
 # OSF, Tru64:
 #JPEGLIB_DIR = /usr/local1/DEC/lib
 #JPEGHDR_DIR = /usr/local1/DEC/include
@@ -186,11 +186,11 @@
 # here.  If you do not have the PNG library, and still want to
 # successully build everything else, put NONE for these.
 
-PNGLIB_DIR = /lib
-PNGHDR_DIR = /usr/include/png
+#PNGLIB_DIR = /lib
+#PNGHDR_DIR = /usr/include/png
 # NetBSD:
-#PNGLIB_DIR = $(LOCALBASE)/lib
-#PNGHDR_DIR = $(LOCALBASE)/include
+PNGLIB_DIR = $(LOCALBASE)/lib
+PNGHDR_DIR = $(LOCALBASE)/include
 # OSF/Tru64:
 #PNGLIB_DIR = /usr/local1/DEC/lib
 #PNGHDR_DIR = /usr/local1/DEC/include
@@ -204,8 +204,10 @@
 
 # And the Utah Raster Toolkit (aka URT aka RLE) library:
 
-URTHDR_DIR = $(SRCDIR)/urt
-URTLIB_DIR = $(SRCDIR)/urt
+#URTLIB_DIR = $(SRCDIR)/urt
+#URTHDR_DIR = $(SRCDIR)/urt
+URTLIB_DIR = NONE
+URTHDR_DIR = NONE
 
 # These are -l options to link in the network libraries.  Often, these are
 # built into the standard C library, so this can be null.  If you don't