From owner-svn-ports-all@FreeBSD.ORG  Fri Apr 10 21:12:02 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3D415CBD;
 Fri, 10 Apr 2015 21:12:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 284D481D;
 Fri, 10 Apr 2015 21:12:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3ALC2gD040738;
 Fri, 10 Apr 2015 21:12:02 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3ALC1w8040736;
 Fri, 10 Apr 2015 21:12:01 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201504102112.t3ALC1w8040736@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Fri, 10 Apr 2015 21:12:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r383765 - in head/www: geolizer webalizer
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2015 21:12:02 -0000

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 \