[Midnightbsd-cvs] mports [18797] trunk/www/analog: fix fetchability of analog and update png dependency
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon May 4 19:04:02 EDT 2015
Revision: 18797
http://svnweb.midnightbsd.org/mports/?rev=18797
Author: laffer1
Date: 2015-05-04 19:04:01 -0400 (Mon, 04 May 2015)
Log Message:
-----------
fix fetchability of analog and update png dependency
Modified Paths:
--------------
trunk/www/analog/Makefile
Added Paths:
-----------
trunk/www/analog/files/patch-analog.cfg
trunk/www/analog/files/patch-src__Makefile
Removed Paths:
-------------
trunk/www/analog/files/patch-aa
trunk/www/analog/files/patch-ac
Modified: trunk/www/analog/Makefile
===================================================================
--- trunk/www/analog/Makefile 2015-05-04 22:55:37 UTC (rev 18796)
+++ trunk/www/analog/Makefile 2015-05-04 23:04:01 UTC (rev 18797)
@@ -2,18 +2,13 @@
PORTNAME= analog
PORTVERSION= 6.0
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= http://www.analog.cx/ \
- http://analog.planetmirror.com/ \
http://analog.gsp.com/ \
- http://isr.ath.cx/analog/ \
- http://analog.mirrors.ecodigit.com.br/ \
- http://analog.org/loganalysis/ \
- http://analog.techsell.ru/ \
+ http://fossies.org/unix/www/ \
ftp://ftp.polytechnic.edu.na/pub/analog/ \
- http://analog.netsoc.ucd.ie/ \
http://analog.tzone.it/
MAINTAINER= luke at MidnightBSD.org
@@ -22,8 +17,8 @@
LICENSE= gpl2
LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \
- jpeg.11:${PORTSDIR}/graphics/jpeg \
- png15:${PORTSDIR}/graphics/png
+ libjpeg.so:${PORTSDIR}/graphics/jpeg \
+ libpng.so:${PORTSDIR}/graphics/png
LIMGDIR?= www/data/images
IMGDIR= ${PREFIX}/${LIMGDIR}
Deleted: trunk/www/analog/files/patch-aa
===================================================================
--- trunk/www/analog/files/patch-aa 2015-05-04 22:55:37 UTC (rev 18796)
+++ trunk/www/analog/files/patch-aa 2015-05-04 23:04:01 UTC (rev 18797)
@@ -1,41 +0,0 @@
---- src/Makefile.orig Sun Dec 19 05:51:30 2004
-+++ src/Makefile Sun Jan 9 12:50:26 2005
-@@ -2,16 +2,23 @@
- # Please read docs/Readme.html, or http://www.analog.cx/
- # This is a general Unix-like Makefile: Makefiles for other OS's can be found
- # in the "build" directory.
--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.
-+CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/gd
-+#CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation.
- # Some OS's need -D_FILE_OFFSET_BITS=64 to support files > 2MB.
- # 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/\" \
-+ -DHAVE_ZLIB
- # ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
- # ... -DEBCDIC -DUSE_PLAIN_SETJMP ...
- # ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB -DHAVE_PCRE ...
-@@ -31,6 +38,12 @@
- 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)
-+
-+.if !defined(WITHOUT_GD)
-+DEFS+= -DHAVE_GD
-+LIBS+= -L${LOCALBASE}/lib -lgd -lpng -ljpeg -lz
-+.endif
-+
- # need -lm LAST
- # if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz
- # if you defined HAVE_ZLIB above you also need -lz
Deleted: trunk/www/analog/files/patch-ac
===================================================================
--- trunk/www/analog/files/patch-ac 2015-05-04 22:55:37 UTC (rev 18796)
+++ trunk/www/analog/files/patch-ac 2015-05-04 23:04:01 UTC (rev 18797)
@@ -1,12 +0,0 @@
---- analog.cfg.orig Sun Mar 23 13:56:53 2003
-+++ analog.cfg Sun May 11 09:25:33 2003
-@@ -10,7 +10,8 @@
- #
- # If you need a LOGFORMAT command (most people don't -- try it without first!),
- # it must go here, above the LOGFILE commands.
--LOGFILE logfile.log
-+LOGFORMAT COMBINED
-+LOGFILE /var/log/httpd-access.log
- # LOGFILE /old/logs/access_log.*
- # OUTFILE Report.html
- # HOSTNAME "[my organisation]"
Copied: trunk/www/analog/files/patch-analog.cfg (from rev 18676, trunk/www/analog/files/patch-ac)
===================================================================
--- trunk/www/analog/files/patch-analog.cfg (rev 0)
+++ trunk/www/analog/files/patch-analog.cfg 2015-05-04 23:04:01 UTC (rev 18797)
@@ -0,0 +1,12 @@
+--- analog.cfg.orig Sun Mar 23 13:56:53 2003
++++ analog.cfg Sun May 11 09:25:33 2003
+@@ -10,7 +10,8 @@
+ #
+ # If you need a LOGFORMAT command (most people don't -- try it without first!),
+ # it must go here, above the LOGFILE commands.
+-LOGFILE logfile.log
++LOGFORMAT COMBINED
++LOGFILE /var/log/httpd-access.log
+ # LOGFILE /old/logs/access_log.*
+ # OUTFILE Report.html
+ # HOSTNAME "[my organisation]"
Copied: trunk/www/analog/files/patch-src__Makefile (from rev 18676, trunk/www/analog/files/patch-aa)
===================================================================
--- trunk/www/analog/files/patch-src__Makefile (rev 0)
+++ trunk/www/analog/files/patch-src__Makefile 2015-05-04 23:04:01 UTC (rev 18797)
@@ -0,0 +1,41 @@
+--- src/Makefile.orig Sun Dec 19 05:51:30 2004
++++ src/Makefile Sun Jan 9 12:50:26 2005
+@@ -2,16 +2,23 @@
+ # Please read docs/Readme.html, or http://www.analog.cx/
+ # This is a general Unix-like Makefile: Makefiles for other OS's can be found
+ # in the "build" directory.
+-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.
++CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/gd
++#CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation.
+ # Some OS's need -D_FILE_OFFSET_BITS=64 to support files > 2MB.
+ # 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/\" \
++ -DHAVE_ZLIB
+ # ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
+ # ... -DEBCDIC -DUSE_PLAIN_SETJMP ...
+ # ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB -DHAVE_PCRE ...
+@@ -31,6 +38,12 @@
+ 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)
++
++.if !defined(WITHOUT_GD)
++DEFS+= -DHAVE_GD
++LIBS+= -L${LOCALBASE}/lib -lgd -lpng -ljpeg -lz
++.endif
++
+ # need -lm LAST
+ # if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz
+ # if you defined HAVE_ZLIB above you also need -lz
More information about the Midnightbsd-cvs
mailing list