Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 May 2020 10:58:59 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r533913 - head/www/webalizer
Message-ID:  <202005041058.044Awxp1095996@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dinoex
Date: Mon May  4 10:58:59 2020
New Revision: 533913
URL: https://svnweb.freebsd.org/changeset/ports/533913

Log:
  - use new port net/webalizer-geodb

Modified:
  head/www/webalizer/Makefile
  head/www/webalizer/distinfo

Modified: head/www/webalizer/Makefile
==============================================================================
--- head/www/webalizer/Makefile	Mon May  4 10:15:22 2020	(r533912)
+++ head/www/webalizer/Makefile	Mon May  4 10:58:59 2020	(r533913)
@@ -2,10 +2,9 @@
 
 PORTNAME=	webalizer
 PORTVERSION=	2.23.8
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES+=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/:main \
-		ftp://ftp.mrunix.net/pub/webalizer/geodb/:geodb \
 		ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/:main \
 		http://flags.blogpotato.de/zip/:flags
 PKGNAMESUFFIX?=	${WEBALIZER_SUFFIX}${PKGNAMESUFFIX2}
@@ -49,6 +48,7 @@ LARGE_URL_DESC=Enable URLs longer 512 bytes
 
 GEODB_IMPLIES=		BDB
 GEODB_PREVENTS=		BDB1
+GEODB_RUN_DEPENDS=	${LOCALBASE}/share/geolizer/GeoDB.dat:net/webalizer-geodb
 GEOIP_CONFIGURE_ON=	--enable-geoip \
 			--with-geoip-lib=${LOCALBASE}/lib \
 			--with-geoip-inc=${LOCALBASE}/include
@@ -71,9 +71,6 @@ IP_AS_HOSTNAME_CFLAGS=		-DUSE_IP_AS_HOSTNAME
 .if ${PORT_OPTIONS:MGEODB} || ${PORT_OPTIONS:MGEOIP} || make(makesum) || defined(FETCH_ALL)
 DISTFILES+=	webalizer-flags.tgz:main
 .endif
-.if ${PORT_OPTIONS:MGEODB} || make(makesum) || defined(FETCH_ALL)
-DISTFILES+=	webalizer-geodb-20190501.tgz:geodb
-.endif
 
 # slave ports override with languages specific gd
 .if empty(LIB_DEPENDS:Mlibgd*)
@@ -94,7 +91,7 @@ PLIST_SUB+=	WITH_ICONS="@comment "
 
 CONFIGURE_ARGS+=	--enable-dns \
 			--enable-bz2 \
-			--with-geodb=${PREFIX}/share/webalizer \
+			--with-geodb=${PREFIX}/share/geolizer \
 			--sysconfdir=${PREFIX}/etc \
 			--with-gdlib=${LOCALBASE}/lib \
 			--with-gd=${LOCALBASE}/include
@@ -175,9 +172,6 @@ do-install:
 .if ${PORT_OPTIONS:MGEODB} || ${PORT_OPTIONS:MGEOIP}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/geolizer
 	${INSTALL_DATA} ${WRKDIR}/flags/* ${STAGEDIR}${PREFIX}/share/geolizer/
-.endif
-.if ${PORT_OPTIONS:MGEODB}
-	${INSTALL_DATA} ${WRKDIR}/GeoDB.dat ${STAGEDIR}${PREFIX}/share/geolizer/
 .endif
 
 do-install-DOCS-on:

Modified: head/www/webalizer/distinfo
==============================================================================
--- head/www/webalizer/distinfo	Mon May  4 10:15:22 2020	(r533912)
+++ head/www/webalizer/distinfo	Mon May  4 10:58:59 2020	(r533913)
@@ -1,7 +1,5 @@
-TIMESTAMP = 1557465650
+TIMESTAMP = 1588587167
 SHA256 (webalizer-2.23-08-src.tgz) = edaddb5aa41cc4a081a1500e3fa96615d4b41bc12086bcedf9938018ce79ed8d
 SIZE (webalizer-2.23-08-src.tgz) = 537037
 SHA256 (webalizer-flags.tgz) = df9961fec7da2c16ed3faefb763f912c2db5ddce6a24e4f46647d7e64b8ab29a
 SIZE (webalizer-flags.tgz) = 146658
-SHA256 (webalizer-geodb-20190501.tgz) = 9acf7a36a30d7421b753ebf3302bff62bca1de9e8d226530f7b5e1c6277a45db
-SIZE (webalizer-geodb-20190501.tgz) = 1403229



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005041058.044Awxp1095996>