svn commit: r383765 - in head/www: geolizer webalizer

[Mathieu Arnold]

Author: mat
Date: Fri Apr 10 21:12:00 2015
New Revision: 383765
URL: https://svnweb.freebsd.org/changeset/ports/383765

Log:
  Don't let webalizer change name when GEOIP is enabled.
  
  With hat:	portmgr
  Sponsored by:	Absolight

Modified:
  head/www/geolizer/Makefile
  head/www/webalizer/Makefile

Modified: head/www/geolizer/Makefile
==============================================================================
--- head/www/geolizer/Makefile	Fri Apr 10 21:09:18 2015	(r383764)
+++ head/www/geolizer/Makefile	Fri Apr 10 21:12:00 2015	(r383765)
@@ -9,6 +9,8 @@ MASTERDIR?=	${.CURDIR}/../webalizer
 
 OPTIONS_DEFAULT=GEOIP
 
+WEBALIZER_SUFFIX=	-geoip
+
 .if exists(${.CURDIR}/Makefile.local)
 .include "${.CURDIR}/Makefile.local"
 .endif

Modified: head/www/webalizer/Makefile
==============================================================================
--- head/www/webalizer/Makefile	Fri Apr 10 21:09:18 2015	(r383764)
+++ head/www/webalizer/Makefile	Fri Apr 10 21:12:00 2015	(r383765)
@@ -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 \