From owner-svn-ports-head@freebsd.org Sun May 6 11:09:01 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21696FB622E; Sun, 6 May 2018 11:09:01 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C493B77E62; Sun, 6 May 2018 11:09:00 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDC253EB7; Sun, 6 May 2018 11:09:00 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w46B90JH095748; Sun, 6 May 2018 11:09:00 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w46B90dm095747; Sun, 6 May 2018 11:09:00 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201805061109.w46B90dm095747@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Sun, 6 May 2018 11:09:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469191 - head/www/webalizer X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: head/www/webalizer X-SVN-Commit-Revision: 469191 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2018 11:09:01 -0000 Author: dinoex Date: Sun May 6 11:09:00 2018 New Revision: 469191 URL: https://svnweb.freebsd.org/changeset/ports/469191 Log: - use OPTIONS_SINGLE Modified: head/www/webalizer/Makefile Modified: head/www/webalizer/Makefile ============================================================================== --- head/www/webalizer/Makefile Sun May 6 11:04:30 2018 (r469190) +++ head/www/webalizer/Makefile Sun May 6 11:09:00 2018 (r469191) @@ -31,11 +31,13 @@ CONFLICTS= geolizer-2* WEBALIZER_LANG?=english .endif -OPTIONS_DEFINE= GEOIP GEODB BDB1 BDB WEBALIZER_CONV \ +OPTIONS_DEFINE= GEOIP GEODB WEBALIZER_CONV \ FULL_CGI_REFS CLICKABLE_REFERER \ IP_AS_HOSTNAME LARGE_URL \ DOCS EXAMPLES OPTIONS_DEFAULT?= BDB1 +OPTIONS_SINGLE= DB +OPTIONS_SINGLE_DB= BDB1 BDB NO_OPTIONS_SORT=yes OPTIONS_SUB=yes GEODB_DESC=Enable Webalizers IP-Database support @@ -49,9 +51,7 @@ GEOIP_CONFIGURE_ON= --enable-geoip \ --with-geoip-lib=${LOCALBASE}/lib \ --with-geoip-inc=${LOCALBASE}/include GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP -BDB1_PREVENTS= BDB BDB1_CFLAGS= -DUSE_DB185 -BDB_PREVENTS= BDB1 BDB_USES= bdb BDB_LDFLAGS= -L${BDB_LIB_DIR} BDB_CFLAGS= -I${BDB_INCLUDE_DIR} @@ -64,10 +64,6 @@ CLICKABLE_REFERER_CFLAGS= -DUSE_CLICKABLE_REFERER IP_AS_HOSTNAME_CFLAGS= -DUSE_IP_AS_HOSTNAME .include - -.if empty(PORT_OPTIONS:MBDB) && empty(PORT_OPTIONS:MBDB1) -OPTIONS_WRONG_RADIO= BDB BDB1 -.endif .if ${PORT_OPTIONS:MGEODB} || ${PORT_OPTIONS:MGEOIP} || make(makesum) || defined(FETCH_ALL) DISTFILES+= webalizer-flags.tgz:main