From owner-svn-ports-all@FreeBSD.ORG Sun Sep 16 16:35:20 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B81C106566C; Sun, 16 Sep 2012 16:35:20 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2C7FF8FC08; Sun, 16 Sep 2012 16:35:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8GGZK1o030541; Sun, 16 Sep 2012 16:35:20 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8GGZJp3030537; Sun, 16 Sep 2012 16:35:19 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201209161635.q8GGZJp3030537@svn.freebsd.org> From: Dirk Meyer Date: Sun, 16 Sep 2012 16:35:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304366 - head/www/webalizer X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Sep 2012 16:35:20 -0000 Author: dinoex Date: Sun Sep 16 16:35:19 2012 New Revision: 304366 URL: http://svn.freebsd.org/changeset/ports/304366 Log: - use OPTIONS_DEFINE - option GEODB defaults to bdb4 - update GEODB - extend OPTIONS Modified: head/www/webalizer/Makefile head/www/webalizer/distinfo Modified: head/www/webalizer/Makefile ============================================================================== --- head/www/webalizer/Makefile Sun Sep 16 16:09:34 2012 (r304365) +++ head/www/webalizer/Makefile Sun Sep 16 16:35:19 2012 (r304366) @@ -7,7 +7,7 @@ PORTNAME= webalizer PORTVERSION= 2.23.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES+= www MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/:main \ MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/geodb/:geodb \ @@ -34,29 +34,44 @@ CONFLICTS= geolizer-2* WEBALIZER_LANG?=english .endif -.include +OPTIONS_DEFINE= GEOIP GEODB BDB1 BDB WEBALIZER_CONV \ + FULL_CGI_REFS CLICKABLE_REFERER LARGE_URL +OPTIONS_DEFAULT= +NO_OPTIONS_SORT=yes +GEODB_DESC=Enable Webalizers IP-Database support +WEBALIZER_CONV_DESC=Use character code convert patch +FULL_CGI_REFS_DESC=Show full cgi parameters in referers +CLICKABLE_REFERER_DESC=Make referers clickable +LARGE_URL_DESC=Enable URLs longer 512 bytes -.if defined(WITH_GEODB) || defined(WITH_GEOIP)|| make(makesum) || defined(FETCH_ALL) +.include + +.if ${PORT_OPTIONS:MGEODB} || ${PORT_OPTIONS:MGEOIP} || make(makesum) || defined(FETCH_ALL) DISTFILES+= webalizer-flags.tgz:main .endif -.if defined(WITH_GEODB) || make(makesum) || defined(FETCH_ALL) -DISTFILES+= webalizer-geodb-20120101.tgz:geodb +.if ${PORT_OPTIONS:MGEODB} || make(makesum) || defined(FETCH_ALL) +DISTFILES+= webalizer-geodb-20120901.tgz:geodb .endif +# slave ports override with languages specific gd .if !defined(LIB_DEPENDS) LIB_DEPENDS= gd.4:${PORTSDIR}/${GD_PORT} .endif -.if defined(WITH_GEOIP) + +.if ${PORT_OPTIONS:MGEOIP} LIB_DEPENDS+= GeoIP.5:${PORTSDIR}/net/GeoIP .endif -.if defined(WITH_GEODB) +.if ${PORT_OPTIONS:MGEODB} +.if empty(PORT_OPTIONS:MBDB1) +WITH_BDB= yes +.endif PLIST_SUB+= WITH_GEODB="" .else PLIST_SUB+= WITH_GEODB="@comment " .endif -.if defined(WITH_GEOIP) +.if ${PORT_OPTIONS:MGEOIP} WEBALIZER_SUFFIX= -geoip CONFLICTS+= ${PKGNAMEPREFIX}webalizer-2* CONFIGURE_ARGS+= --enable-geoip \ @@ -66,13 +81,13 @@ CONFIGURE_ARGS+= --enable-geoip \ CONFLICTS+= ${PKGNAMEPREFIX}webalizer-geoip-2* .endif -.if defined(WITH_GEODB) || defined(WITH_GEOIP) +.if ${PORT_OPTIONS:MGEODB} || ${PORT_OPTIONS:MGEOIP} PLIST_SUB+= WITH_GEOIP="" .else PLIST_SUB+= WITH_GEOIP="@comment " .endif -.if defined(WITH_BDB_VER) || defined(WITH_BDB) +.if defined(WITH_BDB_VER) || ${PORT_OPTIONS:MBDB} USE_BDB= yes INVALID_BDB_VER= 2 3 40 LDFLAGS+= -L${BDB_LIB_DIR} @@ -113,7 +128,7 @@ EXTRA_PATCHES+= ${FILESDIR}/ja-webalize .endif .endif -.if defined(WITH_WEBALIZER_CONV) +.if ${PORT_OPTIONS:MWEBALIZER_CONV} USE_ICONV=yes # The patch file is written by URASHIMA Akira # see http://tyche.pu-toyama.ac.jp/~a-urasim/webalizer/ @@ -123,11 +138,11 @@ CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/li CFLAGS+= -I${LOCALBASE}/include .endif -.if !defined(WITHOUT_WEBALIZER_FULL_CGI_REFS) +.if ${PORT_OPTIONS:MFULL_CGI_REFS} CFLAGS+= -DUSE_FULL_CGI_REFS .endif -.if defined(WITH_WEBALIZER_CLICKABLE_REFERER) +.if ${PORT_OPTIONS:MCLICKABLE_REFERER} CFLAGS+= -DUSE_CLICKABLE_REFERER .endif @@ -137,12 +152,12 @@ pre-configure: ${REINPLACE_CMD} \ -e "s|webalizer.conf|${PKGNAMEPREFIX}webalizer.conf|" \ ${WRKSRC}/webalizer.c -.if defined(WITH_MAXURLH) +.if ${PORT_OPTIONS:MLARGE_URL} ${REINPLACE_CMD} \ -e "s|MAXURLH 512 |MAXURLH 2048|" \ ${WRKSRC}/webalizer.h .endif -.if defined(WITH_BDB_VER) || defined(WITH_BDB) +.if defined(WITH_BDB_VER) || ${PORT_OPTIONS:MBDB} ${REINPLACE_CMD} -e "s|-ldb|-l${BDB_LIB_NAME}|" \ ${WRKSRC}/configure .else @@ -171,11 +186,11 @@ post-install: .for i in ${MAN1} ${INSTALL_MAN} ${WRKSRC}/${i:S/^${PKGNAMEPREFIX}//} ${PREFIX}/man/man1/${i} .endfor -.if defined(WITH_GEODB) || defined(WITH_GEOIP) +.if ${PORT_OPTIONS:MGEODB} || ${PORT_OPTIONS:MGEOIP} ${MKDIR} ${PREFIX}/share/geolizer @${INSTALL_DATA} ${WRKDIR}/flags/* ${PREFIX}/share/geolizer/ .endif -.if defined(WITH_GEODB) +.if ${PORT_OPTIONS:MGEODB} @${INSTALL_DATA} ${WRKDIR}/GeoDB.dat ${PREFIX}/share/geolizer/ .endif .if !defined(NOPORTDOCS) @@ -191,4 +206,4 @@ post-install: .endfor .endif -.include +.include Modified: head/www/webalizer/distinfo ============================================================================== --- head/www/webalizer/distinfo Sun Sep 16 16:09:34 2012 (r304365) +++ head/www/webalizer/distinfo Sun Sep 16 16:35:19 2012 (r304366) @@ -2,5 +2,5 @@ SHA256 (webalizer-2.23-05-src.tgz) = 420 SIZE (webalizer-2.23-05-src.tgz) = 537287 SHA256 (webalizer-flags.tgz) = df9961fec7da2c16ed3faefb763f912c2db5ddce6a24e4f46647d7e64b8ab29a SIZE (webalizer-flags.tgz) = 146658 -SHA256 (webalizer-geodb-20120101.tgz) = ba18b2a567f8e9779657f60b28dbdbc03f13dc20aff8a2c945c684eb7bee7617 -SIZE (webalizer-geodb-20120101.tgz) = 448101 +SHA256 (webalizer-geodb-20120901.tgz) = ac29d9a32a31f182da567cd7683651351d27bf8cd48346a8bf5636e5799879b8 +SIZE (webalizer-geodb-20120901.tgz) = 551954