5 files changed, 28 insertions, 51 deletions

diff --git a/www/http-analyze/Makefile b/www/http-analyze/Makefile
index a13e80a6ec8b..a3497a9b97f2 100644
--- a/www/http-analyze/Makefile
+++ b/www/http-analyze/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	http-analyze
 PORTVERSION=	2.01
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.rent-a-guru.de/pub/http-analyze2.01/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -15,8 +15,6 @@ EXTRACT_SUFX=	-src.tar.gz
 MAINTAINER=	todd@thisisa.com
 COMMENT=	A fast Log-Analyzer for web servers
 
-BROKEN=		Broken gd dependency
-
 BUILD_DEPENDS=	gif2png:${PORTSDIR}/graphics/gif2png
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 
diff --git a/www/http-analyze/files/patch-aa b/www/http-analyze/files/patch-Makefile
index e6939941c6af..6eed0c1e5f9d 100644
--- a/www/http-analyze/files/patch-aa
+++ b/www/http-analyze/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun May 31 06:06:53 1998
-+++ Makefile	Fri Sep  6 20:00:06 2002
+--- Makefile.orig	Sun Aug 17 23:30:01 2003
++++ Makefile	Sun Aug 17 23:35:09 2003
 @@ -28,9 +28,9 @@
  #	SVR4	/usr/share/man/cat1	-		1
  #	Linux	/usr/local/man/man1	-		man
@@ -9,7 +9,7 @@
 -LOCALMAN = /usr/local/man/cat1
 +LOCALLIB = $(PREFIX)/lib
 +LOCALBIN = $(PREFIX)/bin
-+LOCALMAN = $(PREFIX)/man/man1
++LOCALMAN = $(PREFIX)/man/cat1
  
  # Program to use for compressing the manpage.
  # If set to 'true', no compression is applied.
@@ -25,41 +25,48 @@
  # Location of the GD library and include files.
 -GDLIB	= /usr/local/lib/libgd.a
 -GDINC	= /usr/local/include
-+GDLIB	= $(PREFIX)/lib/libgd.a
-+GDINC	= $(PREFIX)/include/gd
++GDLIB	= ${LOCALBASE}/lib/libgd.a
++GDINC	= ${LOCALBASE}/include
  
  #
  # Platform selection
-@@ -76,7 +76,7 @@
+@@ -74,9 +74,9 @@
+ #	If you prefer optimization of the generated code, uncomment the
+ #	next line and comment out the -g definition.
  #
- #CC = cc
+-#CC = cc
++CC ?= cc
  #OPTIM = -O2
 -OPTIM = -g
 +#OPTIM = -g
  
  # Remove NDEBUG to include various assertion checks in the program.
  #COMDEFS = -DTIME_STATS -DNDEBUG
-@@ -108,6 +108,10 @@
- #PLATFORM = -ansi -Dunix
- #CC = gcc
+@@ -88,6 +88,10 @@
+ # for the NETWARE platform.
+ #
  
 +# FreeBSD
 +DEFINES = -DBSD -DHA_LIBDIR="$(LOCALLIB)/http-analyze"
 +PLATFORM =
 +
- # HP/UX
+ # IRIX
  #
- # Lacks definition of the 'unix' macro in it's compiler, so we
-@@ -139,7 +143,7 @@
+ #DEFINES = -DIRIX $(COMDEFS)
+@@ -139,10 +143,10 @@
  #DEFINES = -DNETWARE $(COMDEFS)
  #PLATFORM = 
  
 -CFLAGS  = $(OPTIM) $(PLATFORM) $(DEFINES)
-+CFLAGS  += $(PLATFORM) $(DEFINES)
++CFLAGS  += $(OPTIM) $(PLATFORM) $(DEFINES)
  LDFLAGS	=  
  LINT	= lint -Dunix -Xa -u
- LIBS	= -lm
-@@ -212,14 +216,15 @@
+-LIBS	= -lm
++LIBS	= -lm -L/usr/local/lib -lpng
+ NROFF	= nroff
+ NRFLAGS	= -u1 -man
+ 
+@@ -212,10 +216,12 @@
  	cp http-analyze.$(EXTENSION) $(LOCALMAN)/http-analyze.1
  	chmod 755 $(LOCALBIN)/http-analyze $(LOCALBIN)/ha-setup
  	chmod 444 $(LOCALMAN)/http-analyze.1
@@ -75,12 +82,3 @@
  	cp files/btn/* $(LOCALLIB)/http-analyze/btn/
  	@echo "\nNow run 'ha-setup' to configure http-analyze for your server (Unix only).\n"
  
--
- clean:
- 	-rm -f $(HA_OBJ) $(3D_OBJ) lint.out
- 
-@@ -228,4 +233,3 @@
- 
- clobber::	realclean
- 	-rm -f index.html stats*.html stats*.hist sites*.html files*.html agents*.html *.gif
--
diff --git a/www/http-analyze/files/patch-ac b/www/http-analyze/files/patch-ac
index 8a95f0813d6e..4b22d37eb7ec 100644
--- a/www/http-analyze/files/patch-ac
+++ b/www/http-analyze/files/patch-ac
@@ -1,22 +1,3 @@
-*** Makefile.orig	Thu Jan  6 13:03:58 2000
---- Makefile	Thu Jan  6 11:50:42 2000
-***************
-*** 146,152 ****
-  CFLAGS  += $(PLATFORM) $(DEFINES)
-  LDFLAGS	=  
-  LINT	= lint -Dunix -Xa -u
-! LIBS	= -lm
-  NROFF	= nroff
-  NRFLAGS	= -u1 -man
-  
---- 146,152 ----
-  CFLAGS  += $(PLATFORM) $(DEFINES)
-  LDFLAGS	=  
-  LINT	= lint -Dunix -Xa -u
-! LIBS	= -lm -L/usr/local/lib -lpng
-  NROFF	= nroff
-  NRFLAGS	= -u1 -man
-  
 *** images.c.orig	Sun May 31 08:06:53 1998
 --- images.c	Thu Jan  6 11:30:16 2000
 ***************
diff --git a/www/http-analyze/pkg-descr b/www/http-analyze/pkg-descr
index c890575a5043..c48101c93256 100644
--- a/www/http-analyze/pkg-descr
+++ b/www/http-analyze/pkg-descr
@@ -10,4 +10,4 @@ http-analyze recognizes logfiles in Common Logfile Format and has
 been highly optimized for processing huge logfiles in short
 update-intervals. 
 
-WWW: http://www.netstore.de/Supply/http-analyze/
+WWW: http://www.http-analyze.org
diff --git a/www/http-analyze/pkg-plist b/www/http-analyze/pkg-plist
index 65be8fb9ebdd..04d6a88ad341 100644
--- a/www/http-analyze/pkg-plist
+++ b/www/http-analyze/pkg-plist
@@ -43,8 +43,8 @@ lib/http-analyze/btn/year_on.png
 lib/http-analyze/bugreport.html
 lib/http-analyze/rotate-httpd
 lib/http-analyze/sample.conf
-share/doc/http-analyze/http-analyze.pdf
-share/doc/http-analyze/http-analyze.ps
+%%PORTDOCS%%%%DOCSDIR%%/http-analyze.pdf
+%%PORTDOCS%%%%DOCSDIR%%/http-analyze.ps
 @dirrm lib/http-analyze/btn
 @dirrm lib/http-analyze
-@dirrm share/doc/http-analyze
+%%PORTDOCS%%@dirrm %%DOCSDIR%%