diff options
| author | Michael Haro <mharo@FreeBSD.org> | 2001-05-04 12:23:28 +0000 |
|---|---|---|
| committer | Michael Haro <mharo@FreeBSD.org> | 2001-05-04 12:23:28 +0000 |
| commit | de261dcac7b88676fda7f0dd2419b8695ea2554f (patch) | |
| tree | 5ce0ca96437f78593857c5e8657c045247c17cb5 /www/analog | |
| parent | b2bffb357f3ffc897c9f2d5322ef2314fd68a984 (diff) | |
| download | ports-de261dcac7b88676fda7f0dd2419b8695ea2554f.tar.gz ports-de261dcac7b88676fda7f0dd2419b8695ea2554f.zip | |
Fix directory paths and use shared libraries
Notes
Notes:
svn path=/head/; revision=42248
Diffstat (limited to 'www/analog')
| -rw-r--r-- | www/analog/Makefile | 5 | ||||
| -rw-r--r-- | www/analog/files/patch-aa | 29 |
2 files changed, 27 insertions, 7 deletions
diff --git a/www/analog/Makefile b/www/analog/Makefile index 9dc117ef4ebf..36dc9868d83c 100644 --- a/www/analog/Makefile +++ b/www/analog/Makefile @@ -7,6 +7,7 @@ PORTNAME= analog PORTVERSION= 5.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.analog.cx/ \ http://www.monash.edu.au/mirror/analog/ \ @@ -18,6 +19,10 @@ MASTER_SITES= http://www.analog.cx/ \ MAINTAINER= mharo@FreeBSD.org +LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd \ + jpeg.9:${PORTSDIR}/graphics/jpeg \ + png.4:${PORTSDIR}/graphics/png + ALL_TARGET= analog do-install: diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa index fa7eb10c8505..b5ee1b12ee1b 100644 --- a/www/analog/files/patch-aa +++ b/www/analog/files/patch-aa @@ -1,12 +1,14 @@ ---- src/Makefile.orig Thu May 3 19:22:47 2001 -+++ src/Makefile Thu May 3 19:23:59 2001 -@@ -1,12 +1,12 @@ +--- src/Makefile.orig Tue May 1 03:38:33 2001 ++++ src/Makefile Fri May 4 05:15:57 2001 +@@ -1,12 +1,14 @@ # Makefile for analog 5.0 # 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. -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) # BS2000/OSD needs CFLAGS = -XLLML -XLLMK @@ -16,15 +18,28 @@ # ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ... # ... -DEBCDIC -DUSE_PLAIN_SETJMP -DHAVE_GD -DHAVE_PCRE ... # ... -DNEED_STRCMP -DNEED_MEMMOVE -DNEED_STRTOUL ... -@@ -19,6 +19,11 @@ +@@ -19,10 +21,23 @@ # 64-bit Solaris needs -DHAVE_ADDR_T # DYNIX/ptx needs -D_SOCKET_VERSION=11 # MPE/iX needs -D_POSIX_SOURCE -D_SOCKET_SOURCE -+DEFS = -DANALOGDIR=\"$(PREFIX)/share/analog/\" \ -+ -DLOGFILE=\"/var/log/httpd-access.log\" \ ++DEFS = -DLOGFILE=\"/var/log/httpd-access.log\" \ + -DIMAGEDIR=\"/images/\" \ -+ -DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\" ++ -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; almost all platforms (but not OS X) ++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 |