From 3910103c542a314796c93844cf1fa04e6fea15bc Mon Sep 17 00:00:00 2001
From: nork <nork@FreeBSD.org>
Date: Mon, 18 Aug 2003 16:15:10 +0000
Subject: o Main modification   graphics/gd(based on 1.8.4)    -> graphics/gd1 
  graphics/gd2(based on 2.0.15)  -> graphics/gd   graphics/p5-GD(based on
 1.41)  -> graphics/p5-GD1   graphics/p5-GD2(based on 2.07) -> graphics/p5-GD 
  japanese/gd                    -> japanese/gd1   japanese/gd2               
    -> japanese/gd o Include some feature   WITH_XPM(w/, w/o WITHOUT_X11) o
 Chase this modification o Fix build error [1]

PR:		ports/54540
Submitted by:	Ports Fury
Approved by:	maintainer (blanket)
Reported by:	bento via kris [1]
---
 www/webalizer/Makefile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'www/webalizer')

diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 2c186dfe72bc..5d0b54fe9aee 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	webalizer
 PORTVERSION=	2.1.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/
@@ -17,17 +17,13 @@ MAINTAINER?=	dinoex@FreeBSD.org
 COMMENT=	A web server log file analysis program
 
 .if !defined(LIB_DEPENDS)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/${GD_PORT}
-.if defined(WEBALIZER_WITH_GD2) 
-GD_PORT?=	graphics/gd2
-.endif
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR?=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-GD_PORT?=	graphics/gd-nox11
 
 .if defined(BATCH)
 # no cosmetique spaces allowed
@@ -39,7 +35,7 @@ WEBALIZER_LANG?=english
 CONFIGURE_ARGS+=	--enable-dns \
 			--with-etcdir=${PREFIX}/etc \
 			--with-gdlib=${PREFIX}/lib \
-			--with-gd=${PREFIX}/include/gd
+			--with-gd=${PREFIX}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${PREFIX}/lib"
 CFLAGS+=	-DLINKLIST_MAX_STRING=256
 MAKE_ARGS+=	CFLAGS="${CFLAGS}"
-- 
cgit