Attachment #18885 for bug #33744

View | Details | Raw Unified | Return to bug 33744
Collapse All | Expand All

Lines 6-12 Link Here

(-)/usr/ports/www/analog/Makefile (-3 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= analog	8	PORTNAME= analog
9	PORTVERSION= 5.03	9	PORTVERSION= 5.1
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://www.analog.cx/ \	11	MASTER_SITES= http://www.analog.cx/ \
12	http://www.monash.edu.au/mirror/analog/ \	12	http://www.monash.edu.au/mirror/analog/ \
Lines 23-28 Link Here
23	jpeg.9:${PORTSDIR}/graphics/jpeg \	23	jpeg.9:${PORTSDIR}/graphics/jpeg \
24	png.5:${PORTSDIR}/graphics/png	24	png.5:${PORTSDIR}/graphics/png
25		25
		26	LIMGDIR?= www/data/images
		27	IMGDIR= ${PREFIX}/${LIMGDIR}
		28	PLIST_SUB= IMGDIR=${LIMGDIR}
		29
26	MAN1= analog.1	30	MAN1= analog.1
27	ALL_TARGET= analog	31	ALL_TARGET= analog
28		32
Lines 30-37 Link Here
30		34
31	do-install:	35	do-install:
32	${MKDIR} ${PREFIX}/share/analog/lang	36	${MKDIR} ${PREFIX}/share/analog/lang
33	${MKDIR} ${PREFIX}/share/analog/images	37	${MKDIR} ${IMGDIR}
34	${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/share/analog/images	38	${INSTALL_DATA} ${WRKSRC}/images/* ${IMGDIR}
35	${INSTALL_DATA} ${WRKSRC}/lang/* ${PREFIX}/share/analog/lang	39	${INSTALL_DATA} ${WRKSRC}/lang/* ${PREFIX}/share/analog/lang
36	${INSTALL_PROGRAM} ${WRKSRC}/analog ${PREFIX}/bin	40	${INSTALL_PROGRAM} ${WRKSRC}/analog ${PREFIX}/bin
37	.if !exists(${PREFIX}/etc/analog.cfg)	41	.if !exists(${PREFIX}/etc/analog.cfg)

Line 1 Link Here

(-)/usr/ports/www/analog/distinfo (-1 / +1 lines)
1	MD5 (analog-5.03.tar.gz) = 6a7b77615419e9a8ee1b78e90b88df34	1	MD5 (analog-5.1.tar.gz) = 5e84eaca93a2de5c305e0da0e20e9e42




--- src/Makefile.orig	Wed Jan  9 21:16:22 2002
+++ src/Makefile	Wed Jan  9 21:18:38 2002
@@ -1,14 +1,20 @@
 # Makefile for analog 5.1
 # Please read docs/Readme.html, or http://www.analog.cx/
-CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
+CC ?= gcc           # which compiler to use: eg cc, acc, gcc. NB Different
 #                    compilers need different CFLAGS, e.g., -O instead of -O2.
 MAKE = make        # which "make" to use
-CFLAGS = -O2    # options, e.g. for optimisation or ANSI compilation.
+LOCALBASE?=/usr/local
+CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/gd
+#CFLAGS = -O2    # options, e.g. for optimisation or ANSI compilation.
 #                 HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10)
 #                 BeOS needs CFLAGS = -O2 -Wl,-L/boot/home/config/lib
 #                 BS2000/OSD needs CFLAGS = -XLLML -XLLMK
 #                 NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp 
-DEFS =          # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
+DEFS = -DLOGFILE=\"/var/log/httpd-access.log\" \
+       -DIMAGEDIR=\"/images/\" \
+       -DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\" \
+       -DLANGDIR=\"${PREFIX}/share/analog/lang/\" \
+       -DCONFIGDIR=\"$(PREFIX)/share/analog/\"
+#DEFS =          # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
 #                 ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
 #                 ... -DEBCDIC -DUSE_PLAIN_SETJMP -DHAVE_GD -DHAVE_PCRE ...
 #                 ... -DNEED_STRCMP -DNEED_MEMMOVE -DNEED_STRTOUL ...
@@ -25,6 +31,12 @@
 #                 64-bit Solaris needs -DHAVE_ADDR_T
 #                 DYNIX/ptx needs -D_SOCKET_VERSION=11
 #                 MPE/iX needs -D_POSIX_SOURCE -D_SOCKET_SOURCE
+DEFS =	-DLOGFILE=\"/var/log/httpd-access.log\" \
+	-DIMAGEDIR=\"/images/\" \
+	-DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\" \
+	-DLANGDIR=\"${PREFIX}/share/analog/lang/\" \
+	-DCONFIGDIR=\"$(PREFIX)/share/analog/\"
+	
 #
 OS = UNIX         # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS
 #                   RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390
 LIBS = -lm  # extra libraries needed; most platforms (but not OS X or BeOS)
+LIBS = -lm
+
+.if !defined(WITHOUT_GD)
+DEFS+= -DHAVE_GD
+LIBS+=  -L${LOCALBASE}/lib -lgd -lpng -ljpeg -lz
+.endif
+
+# extra libraries needed; almost all platforms (but not OS X)
 #               need -lm LAST
 #             if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz
 #             if you defined HAVE_PCRE above you also need -lpcre

Lines 1-6 Link Here

(-)/usr/ports/www/analog/files/patch-ab (-3 / +3 lines)
1	--- src/tree.c.orig Thu May 3 19:31:50 2001	1	--- src/tree.c.orig Wed Jan 9 21:20:12 2002
2	+++ src/tree.c Thu May 3 19:32:22 2001	2	+++ src/tree.c Wed Jan 9 21:20:24 2002
3	@@ -803,8 +803,16 @@	3	@@ -886,8 +886,16 @@
4	}	4	}
5	else if (strstr(whole, "Linux") != NULL \|\| strstr(whole, "linux") != NULL)	5	else if (strstr(whole, "Linux") != NULL \|\| strstr(whole, "linux") != NULL)
6	*name = "Unix:Linux";	6	*name = "Unix:Linux";

Lines 1-9 Link Here

(-)/usr/ports/www/analog/files/patch-ac (-5 / +5 lines)
1	--- analog.cfg.orig Thu May 3 19:27:47 2001	1	--- analog.cfg.orig Wed Jan 9 21:21:05 2002
2	+++ analog.cfg Thu May 3 19:27:15 2001	2	+++ analog.cfg Wed Jan 9 21:21:22 2002
3	@@ -9,7 +9,8 @@	3	@@ -10,7 +10,8 @@
4	# There is a much more extensive configuration file in examples/big.cfg
5	#	4	#
6	# If you need a LOGFORMAT command it must go here, above the LOGFILE commands.	5	# If you need a LOGFORMAT command (most people don't -- try it without first!),
		6	# it must go here, above the LOGFILE commands.
7	-LOGFILE logfile.log	7	-LOGFILE logfile.log
8	+LOGFORMAT COMBINED	8	+LOGFORMAT COMBINED
9	+LOGFILE /var/log/httpd-access.log	9	+LOGFILE /var/log/httpd-access.log




share/analog/lang/bgmdom.tab
share/analog/lang/br.lng
share/analog/lang/bra.lng
share/analog/lang/bradesc.txt
share/analog/lang/bradom.tab
share/analog/lang/brdesc.txt
share/analog/lang/brdom.tab
share/analog/lang/cat.lng
share/analog/lang/cata.lng

%%PORTDOCS%%share/doc/analog/wasnew4.html
%%PORTDOCS%%share/doc/analog/webworks.html
%%PORTDOCS%%share/doc/analog/whatsnew.html
%%IMGDIR%%/analogo.gif
%%IMGDIR%%/analogo.png
%%IMGDIR%%/bara1.gif
%%IMGDIR%%/bara1.png
%%IMGDIR%%/bara16.gif
%%IMGDIR%%/bara16.png
%%IMGDIR%%/bara2.gif
%%IMGDIR%%/bara2.png
%%IMGDIR%%/bara32.gif
%%IMGDIR%%/bara32.png
%%IMGDIR%%/bara4.gif
%%IMGDIR%%/bara4.png
%%IMGDIR%%/bara8.gif
%%IMGDIR%%/bara8.png
%%IMGDIR%%/barb1.gif
%%IMGDIR%%/barb1.png
%%IMGDIR%%/barb16.gif
%%IMGDIR%%/barb16.png
%%IMGDIR%%/barb2.gif
%%IMGDIR%%/barb2.png
%%IMGDIR%%/barb32.gif
%%IMGDIR%%/barb32.png
%%IMGDIR%%/barb4.gif
%%IMGDIR%%/barb4.png
%%IMGDIR%%/barb8.gif
%%IMGDIR%%/barb8.png
%%IMGDIR%%/barc1.gif
%%IMGDIR%%/barc1.png
%%IMGDIR%%/barc16.gif
%%IMGDIR%%/barc16.png
%%IMGDIR%%/barc2.gif
%%IMGDIR%%/barc2.png
%%IMGDIR%%/barc32.gif
%%IMGDIR%%/barc32.png
%%IMGDIR%%/barc4.gif
%%IMGDIR%%/barc4.png
%%IMGDIR%%/barc8.gif
%%IMGDIR%%/barc8.png
%%IMGDIR%%/bard1.gif
%%IMGDIR%%/bard1.png
%%IMGDIR%%/bard16.gif
%%IMGDIR%%/bard16.png
%%IMGDIR%%/bard2.gif
%%IMGDIR%%/bard2.png
%%IMGDIR%%/bard32.gif
%%IMGDIR%%/bard32.png
%%IMGDIR%%/bard4.gif
%%IMGDIR%%/bard4.png
%%IMGDIR%%/bard8.gif
%%IMGDIR%%/bard8.png
%%IMGDIR%%/bare1.gif
%%IMGDIR%%/bare1.png
%%IMGDIR%%/bare16.gif
%%IMGDIR%%/bare16.png
%%IMGDIR%%/bare2.gif
%%IMGDIR%%/bare2.png
%%IMGDIR%%/bare32.gif
%%IMGDIR%%/bare32.png
%%IMGDIR%%/bare4.gif
%%IMGDIR%%/bare4.png
%%IMGDIR%%/bare8.gif
%%IMGDIR%%/bare8.png
%%IMGDIR%%/barf1.gif
%%IMGDIR%%/barf1.png
%%IMGDIR%%/barf16.gif
%%IMGDIR%%/barf16.png
%%IMGDIR%%/barf2.gif
%%IMGDIR%%/barf2.png
%%IMGDIR%%/barf32.gif
%%IMGDIR%%/barf32.png
%%IMGDIR%%/barf4.gif
%%IMGDIR%%/barf4.png
%%IMGDIR%%/barf8.gif
%%IMGDIR%%/barf8.png
%%IMGDIR%%/barg1.gif
%%IMGDIR%%/barg1.png
%%IMGDIR%%/barg16.gif
%%IMGDIR%%/barg16.png
%%IMGDIR%%/barg2.gif
%%IMGDIR%%/barg2.png
%%IMGDIR%%/barg32.gif
%%IMGDIR%%/barg32.png
%%IMGDIR%%/barg4.gif
%%IMGDIR%%/barg4.png
%%IMGDIR%%/barg8.gif
%%IMGDIR%%/barg8.png
%%IMGDIR%%/barh1.gif
%%IMGDIR%%/barh1.png
%%IMGDIR%%/barh16.gif
%%IMGDIR%%/barh16.png
%%IMGDIR%%/barh2.gif
%%IMGDIR%%/barh2.png
%%IMGDIR%%/barh32.gif
%%IMGDIR%%/barh32.png
%%IMGDIR%%/barh4.gif
%%IMGDIR%%/barh4.png
%%IMGDIR%%/barh8.gif
%%IMGDIR%%/barh8.png
%%IMGDIR%%/html2.gif
%%IMGDIR%%/html2.png
%%IMGDIR%%/sq0.png
%%IMGDIR%%/sq1.png
%%IMGDIR%%/sq2.png
%%IMGDIR%%/sq3.png
%%IMGDIR%%/sq4.png
%%IMGDIR%%/sq5.png
%%IMGDIR%%/sq6.png
%%IMGDIR%%/sq7.png
%%IMGDIR%%/sq8.png
%%IMGDIR%%/sq9.png
%%IMGDIR%%/sqg.png
@dirrm share/analog/lang
@dirrm share/analog
%%PORTDOCS%%@dirrm share/doc/analog
@unexec rmdir %D/%%IMGDIR%% 2>/dev/null || true

@unexec rmdir %D/www 2>/dev/null || true

Return to bug 33744

Lines 14-20 Link Here

(-)/usr/ports/www/analog/pkg-plist (-114 / +115 lines)
14	share/analog/lang/bgmdom.tab	14	share/analog/lang/bgmdom.tab
15	share/analog/lang/br.lng	15	share/analog/lang/br.lng
16	share/analog/lang/bra.lng	16	share/analog/lang/bra.lng
		17	share/analog/lang/bradesc.txt
17	share/analog/lang/bradom.tab	18	share/analog/lang/bradom.tab
		19	share/analog/lang/brdesc.txt
18	share/analog/lang/brdom.tab	20	share/analog/lang/brdom.tab
19	share/analog/lang/cat.lng	21	share/analog/lang/cat.lng
20	share/analog/lang/cata.lng	22	share/analog/lang/cata.lng
Lines 205-324 Link Here
205	%%PORTDOCS%%share/doc/analog/wasnew4.html	207	%%PORTDOCS%%share/doc/analog/wasnew4.html
206	%%PORTDOCS%%share/doc/analog/webworks.html	208	%%PORTDOCS%%share/doc/analog/webworks.html
207	%%PORTDOCS%%share/doc/analog/whatsnew.html	209	%%PORTDOCS%%share/doc/analog/whatsnew.html
208	www/data/images/analogo.gif	210	%%IMGDIR%%/analogo.gif
209	www/data/images/analogo.png	211	%%IMGDIR%%/analogo.png
210	www/data/images/bara1.gif	212	%%IMGDIR%%/bara1.gif
211	www/data/images/bara1.png	213	%%IMGDIR%%/bara1.png
212	www/data/images/bara16.gif	214	%%IMGDIR%%/bara16.gif
213	www/data/images/bara16.png	215	%%IMGDIR%%/bara16.png
214	www/data/images/bara2.gif	216	%%IMGDIR%%/bara2.gif
215	www/data/images/bara2.png	217	%%IMGDIR%%/bara2.png
216	www/data/images/bara32.gif	218	%%IMGDIR%%/bara32.gif
217	www/data/images/bara32.png	219	%%IMGDIR%%/bara32.png
218	www/data/images/bara4.gif	220	%%IMGDIR%%/bara4.gif
219	www/data/images/bara4.png	221	%%IMGDIR%%/bara4.png
220	www/data/images/bara8.gif	222	%%IMGDIR%%/bara8.gif
221	www/data/images/bara8.png	223	%%IMGDIR%%/bara8.png
222	www/data/images/barb1.gif	224	%%IMGDIR%%/barb1.gif
223	www/data/images/barb1.png	225	%%IMGDIR%%/barb1.png
224	www/data/images/barb16.gif	226	%%IMGDIR%%/barb16.gif
225	www/data/images/barb16.png	227	%%IMGDIR%%/barb16.png
226	www/data/images/barb2.gif	228	%%IMGDIR%%/barb2.gif
227	www/data/images/barb2.png	229	%%IMGDIR%%/barb2.png
228	www/data/images/barb32.gif	230	%%IMGDIR%%/barb32.gif
229	www/data/images/barb32.png	231	%%IMGDIR%%/barb32.png
230	www/data/images/barb4.gif	232	%%IMGDIR%%/barb4.gif
231	www/data/images/barb4.png	233	%%IMGDIR%%/barb4.png
232	www/data/images/barb8.gif	234	%%IMGDIR%%/barb8.gif
233	www/data/images/barb8.png	235	%%IMGDIR%%/barb8.png
234	www/data/images/barc1.gif	236	%%IMGDIR%%/barc1.gif
235	www/data/images/barc1.png	237	%%IMGDIR%%/barc1.png
236	www/data/images/barc16.gif	238	%%IMGDIR%%/barc16.gif
237	www/data/images/barc16.png	239	%%IMGDIR%%/barc16.png
238	www/data/images/barc2.gif	240	%%IMGDIR%%/barc2.gif
239	www/data/images/barc2.png	241	%%IMGDIR%%/barc2.png
240	www/data/images/barc32.gif	242	%%IMGDIR%%/barc32.gif
241	www/data/images/barc32.png	243	%%IMGDIR%%/barc32.png
242	www/data/images/barc4.gif	244	%%IMGDIR%%/barc4.gif
243	www/data/images/barc4.png	245	%%IMGDIR%%/barc4.png
244	www/data/images/barc8.gif	246	%%IMGDIR%%/barc8.gif
245	www/data/images/barc8.png	247	%%IMGDIR%%/barc8.png
246	www/data/images/bard1.gif	248	%%IMGDIR%%/bard1.gif
247	www/data/images/bard1.png	249	%%IMGDIR%%/bard1.png
248	www/data/images/bard16.gif	250	%%IMGDIR%%/bard16.gif
249	www/data/images/bard16.png	251	%%IMGDIR%%/bard16.png
250	www/data/images/bard2.gif	252	%%IMGDIR%%/bard2.gif
251	www/data/images/bard2.png	253	%%IMGDIR%%/bard2.png
252	www/data/images/bard32.gif	254	%%IMGDIR%%/bard32.gif
253	www/data/images/bard32.png	255	%%IMGDIR%%/bard32.png
254	www/data/images/bard4.gif	256	%%IMGDIR%%/bard4.gif
255	www/data/images/bard4.png	257	%%IMGDIR%%/bard4.png
256	www/data/images/bard8.gif	258	%%IMGDIR%%/bard8.gif
257	www/data/images/bard8.png	259	%%IMGDIR%%/bard8.png
258	www/data/images/bare1.gif	260	%%IMGDIR%%/bare1.gif
259	www/data/images/bare1.png	261	%%IMGDIR%%/bare1.png
260	www/data/images/bare16.gif	262	%%IMGDIR%%/bare16.gif
261	www/data/images/bare16.png	263	%%IMGDIR%%/bare16.png
262	www/data/images/bare2.gif	264	%%IMGDIR%%/bare2.gif
263	www/data/images/bare2.png	265	%%IMGDIR%%/bare2.png
264	www/data/images/bare32.gif	266	%%IMGDIR%%/bare32.gif
265	www/data/images/bare32.png	267	%%IMGDIR%%/bare32.png
266	www/data/images/bare4.gif	268	%%IMGDIR%%/bare4.gif
267	www/data/images/bare4.png	269	%%IMGDIR%%/bare4.png
268	www/data/images/bare8.gif	270	%%IMGDIR%%/bare8.gif
269	www/data/images/bare8.png	271	%%IMGDIR%%/bare8.png
270	www/data/images/barf1.gif	272	%%IMGDIR%%/barf1.gif
271	www/data/images/barf1.png	273	%%IMGDIR%%/barf1.png
272	www/data/images/barf16.gif	274	%%IMGDIR%%/barf16.gif
273	www/data/images/barf16.png	275	%%IMGDIR%%/barf16.png
274	www/data/images/barf2.gif	276	%%IMGDIR%%/barf2.gif
275	www/data/images/barf2.png	277	%%IMGDIR%%/barf2.png
276	www/data/images/barf32.gif	278	%%IMGDIR%%/barf32.gif
277	www/data/images/barf32.png	279	%%IMGDIR%%/barf32.png
278	www/data/images/barf4.gif	280	%%IMGDIR%%/barf4.gif
279	www/data/images/barf4.png	281	%%IMGDIR%%/barf4.png
280	www/data/images/barf8.gif	282	%%IMGDIR%%/barf8.gif
281	www/data/images/barf8.png	283	%%IMGDIR%%/barf8.png
282	www/data/images/barg1.gif	284	%%IMGDIR%%/barg1.gif
283	www/data/images/barg1.png	285	%%IMGDIR%%/barg1.png
284	www/data/images/barg16.gif	286	%%IMGDIR%%/barg16.gif
285	www/data/images/barg16.png	287	%%IMGDIR%%/barg16.png
286	www/data/images/barg2.gif	288	%%IMGDIR%%/barg2.gif
287	www/data/images/barg2.png	289	%%IMGDIR%%/barg2.png
288	www/data/images/barg32.gif	290	%%IMGDIR%%/barg32.gif
289	www/data/images/barg32.png	291	%%IMGDIR%%/barg32.png
290	www/data/images/barg4.gif	292	%%IMGDIR%%/barg4.gif
291	www/data/images/barg4.png	293	%%IMGDIR%%/barg4.png
292	www/data/images/barg8.gif	294	%%IMGDIR%%/barg8.gif
293	www/data/images/barg8.png	295	%%IMGDIR%%/barg8.png
294	www/data/images/barh1.gif	296	%%IMGDIR%%/barh1.gif
295	www/data/images/barh1.png	297	%%IMGDIR%%/barh1.png
296	www/data/images/barh16.gif	298	%%IMGDIR%%/barh16.gif
297	www/data/images/barh16.png	299	%%IMGDIR%%/barh16.png
298	www/data/images/barh2.gif	300	%%IMGDIR%%/barh2.gif
299	www/data/images/barh2.png	301	%%IMGDIR%%/barh2.png
300	www/data/images/barh32.gif	302	%%IMGDIR%%/barh32.gif
301	www/data/images/barh32.png	303	%%IMGDIR%%/barh32.png
302	www/data/images/barh4.gif	304	%%IMGDIR%%/barh4.gif
303	www/data/images/barh4.png	305	%%IMGDIR%%/barh4.png
304	www/data/images/barh8.gif	306	%%IMGDIR%%/barh8.gif
305	www/data/images/barh8.png	307	%%IMGDIR%%/barh8.png
306	www/data/images/html2.gif	308	%%IMGDIR%%/html2.gif
307	www/data/images/html2.png	309	%%IMGDIR%%/html2.png
308	www/data/images/sq0.png	310	%%IMGDIR%%/sq0.png
309	www/data/images/sq1.png	311	%%IMGDIR%%/sq1.png
310	www/data/images/sq2.png	312	%%IMGDIR%%/sq2.png
311	www/data/images/sq3.png	313	%%IMGDIR%%/sq3.png
312	www/data/images/sq4.png	314	%%IMGDIR%%/sq4.png
313	www/data/images/sq5.png	315	%%IMGDIR%%/sq5.png
314	www/data/images/sq6.png	316	%%IMGDIR%%/sq6.png
315	www/data/images/sq7.png	317	%%IMGDIR%%/sq7.png
316	www/data/images/sq8.png	318	%%IMGDIR%%/sq8.png
317	www/data/images/sq9.png	319	%%IMGDIR%%/sq9.png
318	www/data/images/sqg.png	320	%%IMGDIR%%/sqg.png
319	@dirrm share/analog/lang	321	@dirrm share/analog/lang
320	@dirrm share/analog	322	@dirrm share/analog
321	%%PORTDOCS%%@dirrm share/doc/analog	323	%%PORTDOCS%%@dirrm share/doc/analog
322	@unexec rmdir %D/www/data/images 2>/dev/null \|\| true	324	@unexec rmdir %D/%%IMGDIR%% 2>/dev/null \|\| true
323	@unexec rmdir %D/www/data 2>/dev/null \|\| true	325
324	@unexec rmdir %D/www 2>/dev/null \|\| true

Lines 1-45 Link Here

(-)/usr/ports/www/analog/files/patch-aa (-21 / +15 lines)
1	--- src/Makefile.orig Tue May 1 03:38:33 2001	1	--- src/Makefile.orig Wed Jan 9 21:16:22 2002
2	+++ src/Makefile Fri May 4 05:15:57 2001	2	+++ src/Makefile Wed Jan 9 21:18:38 2002
3	@@ -1,12 +1,14 @@	3	@@ -1,14 +1,20 @@
4	# Makefile for analog 5.0	4	# Makefile for analog 5.1
5	# Please read docs/Readme.html, or http://www.analog.cx/	5	# Please read docs/Readme.html, or http://www.analog.cx/
6	-CC = gcc # which compiler to use: eg cc, acc, gcc. NB Different	6	-CC = gcc # which compiler to use: eg cc, acc, gcc. NB Different
7	+CC ?= gcc # which compiler to use: eg cc, acc, gcc. NB Different	7	+CC ?= gcc # which compiler to use: eg cc, acc, gcc. NB Different
8	# compilers need different CFLAGS, e.g., -O instead of -O2.	8	# compilers need different CFLAGS, e.g., -O instead of -O2.
		9	MAKE = make # which "make" to use
9	-CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation.	10	-CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation.
10	+LOCALBASE?=/usr/local
11	+CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/gd	11	+CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/gd
12	+#CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation.	12	+#CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation.
13	# HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10)	13	# HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10)
		14	# BeOS needs CFLAGS = -O2 -Wl,-L/boot/home/config/lib
14	# BS2000/OSD needs CFLAGS = -XLLML -XLLMK	15	# BS2000/OSD needs CFLAGS = -XLLML -XLLMK
15	# NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp	16	# NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp
16	-DEFS = # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...	17	-DEFS = # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
		18	+DEFS = -DLOGFILE=\"/var/log/httpd-access.log\" \
		19	+ -DIMAGEDIR=\"/images/\" \
		20	+ -DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\" \
		21	+ -DLANGDIR=\"${PREFIX}/share/analog/lang/\" \
		22	+ -DCONFIGDIR=\"$(PREFIX)/share/analog/\"
17	+#DEFS = # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...	23	+#DEFS = # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
18	# ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...	24	# ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
19	# ... -DEBCDIC -DUSE_PLAIN_SETJMP -DHAVE_GD -DHAVE_PCRE ...	25	# ... -DEBCDIC -DUSE_PLAIN_SETJMP -DHAVE_GD -DHAVE_PCRE ...
20	# ... -DNEED_STRCMP -DNEED_MEMMOVE -DNEED_STRTOUL ...	26	# ... -DNEED_STRCMP -DNEED_MEMMOVE -DNEED_STRTOUL ...
21	@@ -19,10 +21,23 @@	27	@@ -25,6 +31,12 @@
22	# 64-bit Solaris needs -DHAVE_ADDR_T
23	# DYNIX/ptx needs -D_SOCKET_VERSION=11
24	# MPE/iX needs -D_POSIX_SOURCE -D_SOCKET_SOURCE
25	+DEFS = -DLOGFILE=\"/var/log/httpd-access.log\" \
26	+ -DIMAGEDIR=\"/images/\" \
27	+ -DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\" \
28	+ -DLANGDIR=\"${PREFIX}/share/analog/lang/\" \
29	+ -DCONFIGDIR=\"$(PREFIX)/share/analog/\"
30	+
31	#
32	OS = UNIX # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS	28	OS = UNIX # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS
33	# RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390	29	# RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390
34	-LIBS = -lm # extra libraries needed; almost all platforms (but not OS X)	30	LIBS = -lm # extra libraries needed; most platforms (but not OS X or BeOS)
35	+LIBS = -lm
36	+	31	+
37	+.if !defined(WITHOUT_GD)	32	+.if !defined(WITHOUT_GD)
38	+DEFS+= -DHAVE_GD	33	+DEFS+= -DHAVE_GD
39	+LIBS+= -L${LOCALBASE}/lib -lgd -lpng -ljpeg -lz	34	+LIBS+= -L${LOCALBASE}/lib -lgd -lpng -ljpeg -lz
40	+.endif	35	+.endif
41	+	36	+
42	+# extra libraries needed; almost all platforms (but not OS X)
43	# need -lm LAST	37	# need -lm LAST
44	# if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz	38	# if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz
45	# if you defined HAVE_PCRE above you also need -lpcre	39	# if you defined HAVE_PCRE above you also need -lpcre