From c14ced0780ca23109d94cbe77730ae09bf85dcea Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 10 Apr 2015 21:12:00 +0000 Subject: Don't let webalizer change name when GEOIP is enabled. With hat: portmgr Sponsored by: Absolight --- www/geolizer/Makefile | 2 ++ www/webalizer/Makefile | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'www') diff --git a/www/geolizer/Makefile b/www/geolizer/Makefile index fed344d937f0..b35089358317 100644 --- a/www/geolizer/Makefile +++ b/www/geolizer/Makefile @@ -9,6 +9,8 @@ MASTERDIR?= ${.CURDIR}/../webalizer OPTIONS_DEFAULT=GEOIP +WEBALIZER_SUFFIX= -geoip + .if exists(${.CURDIR}/Makefile.local) .include "${.CURDIR}/Makefile.local" .endif diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index 681bebe968e5..aeae5bb1520d 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -68,7 +68,6 @@ PLIST_SUB+= WITH_GEODB="@comment " .endif .if ${PORT_OPTIONS:MGEOIP} -WEBALIZER_SUFFIX= -geoip CONFLICTS+= ${PKGNAMEPREFIX}webalizer-2* CONFIGURE_ARGS+= --enable-geoip \ --with-geoip-lib=${LOCALBASE}/lib \ -- cgit