summaryrefslogtreecommitdiff
path: root/graphics/ImageMagick/patches/patch-aa
blob: 4a30846364dd41d95c805ccbbf42081b22927caf (plain)
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
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
$NetBSD: patch-aa,v 1.8 1999/04/05 01:11:58 tron Exp $

--- Magick.tmpl.orig	Wed Mar 31 16:36:48 1999
+++ Magick.tmpl	Mon Apr  5 02:57:35 1999
@@ -37,17 +37,17 @@
 #ifdef RsArchitecture
 XCOMM EXTENSIONS_DEFINES= -DHasLZW -DHasShape
 #else
-XCOMM EXTENSIONS_DEFINES= -DHasLZW -DHasShape -DHasSharedMemory
+EXTENSIONS_DEFINES= -DHasLZW -DHasShape -DHasSharedMemory
 #endif
 
 XCOMM Set DoSharedLib to HasSharedLibraries to build ImageMagick with shared
 XCOMM libraries.
 XCOMM
-XCOMM #define DoSharedLib  HasSharedLibraries
+#define DoSharedLib  HasSharedLibraries
 
 XCOMM Define the location of the X11 RGB color database.
 XCOMM
-XCOMM DATABASE_DEFINES= -DRGBColorDatabase=\"/usr/openwin/lib/X11/rgb.txt\"
+DATABASE_DEFINES= -DRGBColorDatabase=\"/usr/X11R6/lib/X11/rgb.txt\"
 
 XCOMM By default, the maximum color value is 255.  To increase the maximum to
 XCOMM 65535 define:
@@ -59,16 +59,16 @@
 XCOMM of these optional delegates, uncomment the respective define.  Make sure
 XCOMM the path names are correct.  See README for more details.
 XCOMM
-XCOMM #define HasBZLIB
+#include "bzlib.tmpl"
 XCOMM #define HasDPS
 XCOMM #define HasFPX
 XCOMM #define HasHDF
 XCOMM #define HasJBIG
-XCOMM #define HasJPEG
-XCOMM #define HasPNG
-XCOMM #define HasTIFF
+#define HasJPEG
+#define HasPNG
+#define HasTIFF
 XCOMM #define HasTTF
-XCOMM #define HasZLIB
+#define HasZLIB
 
 #ifdef HasBZLIB
 BZLIB_DEFINES= -DHasBZLIB
@@ -107,24 +107,24 @@
 
 #ifdef HasJPEG
 JPEG_DEFINES= -DHasJPEG
-JPEG_INCLUDES= -I$(TOP)/jpeg
-JPEG_FLAGS= -L$(TOP)/jpeg
+JPEG_INCLUDES= -I${LOCALBASE}/include
+JPEG_FLAGS= -L${LOCALBASE}/lib
 JPEG_LIBRARIES= -ljpeg
 #endif
 
 #ifdef HasPNG
 XCOMM Use libpng-1.00 or above.  You must also link with Zlib.
 PNG_DEFINES= -DHasPNG
-PNG_INCLUDES= -I$(TOP)/png
-PNG_FLAGS= -L$(TOP)/png
+PNG_INCLUDES= -I${LOCALBASE}/include
+PNG_FLAGS= -L${LOCALBASE}/lib
 PNG_LIBRARIES= -lpng
 #endif
 
 #ifdef HasTIFF
 XCOMM Tiff library requires Jpeg and Zlib libraries.
 TIFF_DEFINES= -DHasTIFF
-TIFF_INCLUDES= -I$(TOP)/tiff/libtiff
-TIFF_FLAGS= -L$(TOP)/tiff/libtiff
+TIFF_INCLUDES= -I${LOCALBASE}/include
+TIFF_FLAGS= -L${LOCALBASE}/lib
 TIFF_LIBRARIES= -ltiff
 #endif
 
@@ -137,8 +137,8 @@
 
 #ifdef HasZLIB
 ZLIB_DEFINES= -DHasZLIB
-ZLIB_INCLUDES= -I$(TOP)/zlib
-ZLIB_FLAGS= -L$(TOP)/zlib
+ZLIB_INCLUDES= 
+ZLIB_FLAGS= 
 ZLIB_LIBRARIES= -lz
 #endif
 
@@ -155,16 +155,16 @@
 XCOMM the top level X11 include directory or X11/X.h will be overwritten.
 
 #ifndef PREFIX
-PREFIX= /usr/local
+PREFIX= ${X11BASE}
 #endif
 
 DelegatePath= -DDelegatePath=\"$(PREFIX)/share/ImageMagick/\"
 LOCALDIR= $(PREFIX)/bin
 LOCALINC= $(PREFIX)/include
 LOCALLIB= $(PREFIX)/lib
-LOCALMAN1= $(PREFIX)/man/man1
-LOCALMAN4= $(PREFIX)/man/man4
-LOCALMAN5= $(PREFIX)/man/man5
+LOCALMAN1= $(PREFIX)/man/cat1
+LOCALMAN4= $(PREFIX)/man/cat4
+LOCALMAN5= $(PREFIX)/man/cat5
 
 MAGICKDIR= $(TOP)/magick
 MAGICK_INCLUDES= -I$(TOP)