From owner-svn-ports-all@FreeBSD.ORG Wed Aug 27 15:53:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 351D0E89; Wed, 27 Aug 2014 15:53:26 +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 1FBA63574; Wed, 27 Aug 2014 15:53:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RFrPBs040378; Wed, 27 Aug 2014 15:53:25 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RFrOgP040369; Wed, 27 Aug 2014 15:53:24 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201408271553.s7RFrOgP040369@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Wed, 27 Aug 2014 15:53:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366333 - in head/net: . GeoIP geoipupdate 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 15:53:26 -0000 Author: adamw Date: Wed Aug 27 15:53:24 2014 New Revision: 366333 URL: http://svnweb.freebsd.org/changeset/ports/366333 QAT: https://qat.redports.org/buildarchive/r366333/ Log: - Update GeoIP to 1.6.2 and switch to its new github location. - Add net/geoipupdate, the formal tool to fetch updates. It is for paid subscribers. People using the free version should continue using the geoipupdate.sh script in net/GeoIP. This program is used to fetch the GeoIP2 and GeoIP databases. It requires an active GeoIP subscription. Please see https://www.maxmind.com/en/geolocation_landing for details about obtaining a subscription. If you wish to install the free versions of the GeoIP databases, please use the geoipudate.sh script provided in net/GeoIP. WWW: https://github.com/maxmind/geoipupdate Added: head/net/geoipupdate/ head/net/geoipupdate/Makefile (contents, props changed) head/net/geoipupdate/distinfo (contents, props changed) head/net/geoipupdate/pkg-descr (contents, props changed) head/net/geoipupdate/pkg-plist (contents, props changed) Modified: head/net/GeoIP/Makefile head/net/GeoIP/distinfo head/net/GeoIP/pkg-plist head/net/Makefile Modified: head/net/GeoIP/Makefile ============================================================================== --- head/net/GeoIP/Makefile Wed Aug 27 15:16:42 2014 (r366332) +++ head/net/GeoIP/Makefile Wed Aug 27 15:53:24 2014 (r366333) @@ -2,14 +2,18 @@ # $FreeBSD$ PORTNAME= GeoIP -PORTVERSION= 1.6.0 -PORTREVISION= 2 +PORTVERSION= 1.6.2 CATEGORIES= net geography -MASTER_SITES= http://geolite.maxmind.com/download/geoip/api/c/ MAINTAINER= adamw@FreeBSD.org COMMENT= Find the country that any IP address or hostname originates from +USE_GITHUB= yes +GH_ACCOUNT= maxmind +GH_PROJECT= geoip-api-c +GH_TAGNAME= v${PORTVERSION} +GH_COMMIT= 2e9100a + USES= libtool pathfix USE_AUTOTOOLS= aclocal automake libtoolize autoconf AUTOMAKE_ARGS= --add-missing @@ -20,9 +24,15 @@ GNU_CONFIGURE= yes SUB_FILES= geoipupdate.sh pkg-message +OPTIONS_DEFINE= DOCS +PORTDOCS= COPYING ChangeLog LICENSE README.md + post-install: ${INSTALL_SCRIPT} ${WRKDIR}/geoipupdate.sh ${STAGEDIR}${PREFIX}/bin ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libGeoIP.so.* @${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + .include Modified: head/net/GeoIP/distinfo ============================================================================== --- head/net/GeoIP/distinfo Wed Aug 27 15:16:42 2014 (r366332) +++ head/net/GeoIP/distinfo Wed Aug 27 15:53:24 2014 (r366333) @@ -1,2 +1,2 @@ -SHA256 (GeoIP-1.6.0.tar.gz) = 075a0c2815cd099e9ec35c9569db716a3fefcdbb6a10dbfa1ce7c6cd48d4a635 -SIZE (GeoIP-1.6.0.tar.gz) = 722173 +SHA256 (GeoIP-1.6.2.tar.gz) = 7f57a87823e202e18dec0e2cb78c59d23114be9b8a599a5cefdbde058816ec44 +SIZE (GeoIP-1.6.2.tar.gz) = 162951 Modified: head/net/GeoIP/pkg-plist ============================================================================== --- head/net/GeoIP/pkg-plist Wed Aug 27 15:16:42 2014 (r366332) +++ head/net/GeoIP/pkg-plist Wed Aug 27 15:53:24 2014 (r366333) @@ -6,7 +6,7 @@ include/GeoIPCity.h lib/libGeoIP.a lib/libGeoIP.so lib/libGeoIP.so.1 -lib/libGeoIP.so.1.6.0 +lib/libGeoIP.so.1.6.2 libdata/pkgconfig/geoip.pc man/man1/geoiplookup.1.gz man/man1/geoiplookup6.1.gz Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Wed Aug 27 15:16:42 2014 (r366332) +++ head/net/Makefile Wed Aug 27 15:53:24 2014 (r366333) @@ -151,6 +151,7 @@ SUBDIR += fspd SUBDIR += fsplib SUBDIR += g2ipmsg + SUBDIR += geoipupdate SUBDIR += get_iplayer SUBDIR += gini SUBDIR += gkrellmwireless2 Added: head/net/geoipupdate/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/geoipupdate/Makefile Wed Aug 27 15:53:24 2014 (r366333) @@ -0,0 +1,37 @@ +# Created by: adamw +# $FreeBSD$ + +PORTNAME= geoipupdate +PORTVERSION= 2.0.2 +CATEGORIES= net geography + +MAINTAINER= adamw@FreeBSD.org +COMMENT= Fetch the latest copies of the paid GeoIP database + +LICENSE= GPLv2 + +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl + +USE_GITHUB= yes +GH_ACCOUNT= maxmind +GH_TAGNAME= v${PORTVERSION} +GH_COMMIT= 929d6a7 + +USES= libtool pathfix +USE_AUTOTOOLS= aclocal automake autoconf libtoolize +AUTOMAKE_ARGS= --add-missing +PATHFIX_MAKEFILEIN= Makefile.am +GNU_CONFIGURE= yes + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +post-extract: + @${MV} ${WRKSRC}/conf/GeoIP.conf.default ${WRKSRC}/conf/GeoIP.conf.sample + +post-patch: + @${REINPLACE_CMD} -e '/^DEFAULT_CONFIG_FILE =/s/$$/.sample/' \ + -e 's/.default/.sample/' \ + ${WRKSRC}/conf/Makefile.am + +.include Added: head/net/geoipupdate/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/geoipupdate/distinfo Wed Aug 27 15:53:24 2014 (r366333) @@ -0,0 +1,2 @@ +SHA256 (geoipupdate-2.0.2.tar.gz) = c4e86c7fb813e5937b6e87ec9a7c2489445dd4382813fbde38105a926181c548 +SIZE (geoipupdate-2.0.2.tar.gz) = 30709 Added: head/net/geoipupdate/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/geoipupdate/pkg-descr Wed Aug 27 15:53:24 2014 (r366333) @@ -0,0 +1,10 @@ +This program is used to fetch the GeoIP2 and GeoIP databases. It requires +an active GeoIP subscription. + +Please see https://www.maxmind.com/en/geolocation_landing for details about +obtaining a subscription. + +If you wish to install the free versions of the GeoIP databases, please +use the geoipudate.sh script provided in net/GeoIP. + +WWW: https://github.com/maxmind/geoipupdate Added: head/net/geoipupdate/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/geoipupdate/pkg-plist Wed Aug 27 15:53:24 2014 (r366333) @@ -0,0 +1,4 @@ +bin/geoipupdate +@sample etc/GeoIP.conf.sample +man/man1/geoipupdate.1.gz +man/man5/GeoIP.conf.5.gz