Date: Thu, 12 Jun 2014 21:37:02 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357637 - head/net/GeoIP Message-ID: <201406122137.s5CLb22n074167@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Thu Jun 12 21:37:01 2014 New Revision: 357637 URL: http://svnweb.freebsd.org/changeset/ports/357637 QAT: https://qat.redports.org/buildarchive/r357637/ Log: General cleanups and simplification. Because the port includes scripts to update the data file, turn use @sample on the data file included in the port. PORTREVISION bump for this change. Modified: head/net/GeoIP/Makefile head/net/GeoIP/pkg-descr head/net/GeoIP/pkg-plist Modified: head/net/GeoIP/Makefile ============================================================================== --- head/net/GeoIP/Makefile Thu Jun 12 21:20:34 2014 (r357636) +++ head/net/GeoIP/Makefile Thu Jun 12 21:37:01 2014 (r357637) @@ -1,29 +1,27 @@ # Created by: Yen-Ming Lee <leeym@leeym.com> # $FreeBSD$ -PORTNAME= GeoIP +PORTNAME= GeoIP PORTVERSION= 1.4.8 -PORTREVISION= 4 -CATEGORIES= net geography +PORTREVISION= 5 +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 - -CONFIGURE_ARGS= CC="${CC}" PATH="${PATH}" \ - CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +MAINTAINER= adamw@FreeBSD.org +COMMENT= Find the country that any IP address or hostname originates from GNU_CONFIGURE= yes -USES= libtool:oldver +USES= libtool:oldver USE_LDCONFIG= yes -SUB_FILES= geoipupdate.sh - -run-autotools: - @${REINPLACE_CMD} -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ - ${WRKSRC}/aclocal.m4 +SUB_FILES= geoipupdate.sh post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/geoipupdate.sh ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKDIR}/geoipupdate.sh ${STAGEDIR}${PREFIX}/bin + ${MV} ${STAGEDIR}${DATADIR}/GeoIP.dat \ + ${STAGEDIR}${DATADIR}/GeoIP.dat.sample + ${MV} ${STAGEDIR}${PREFIX}/etc/GeoIP.conf.default \ + ${STAGEDIR}${PREFIX}/etc/GeoIP.conf.sample + ${RM} ${STAGEDIR}${PREFIX}/etc/GeoIP.conf .include <bsd.port.mk> Modified: head/net/GeoIP/pkg-descr ============================================================================== --- head/net/GeoIP/pkg-descr Thu Jun 12 21:20:34 2014 (r357636) +++ head/net/GeoIP/pkg-descr Thu Jun 12 21:37:01 2014 (r357637) @@ -8,4 +8,7 @@ This module can be used to automatically mirror, to analyze your web server logs to determine the countries of your visitors, for credit card fraud detection, and for software export controls. +This port includes a helper script, geoipupdate.sh, to help you keep the +library up-to-date. + WWW: http://www.maxmind.com/geoip/ Modified: head/net/GeoIP/pkg-plist ============================================================================== --- head/net/GeoIP/pkg-plist Thu Jun 12 21:20:34 2014 (r357636) +++ head/net/GeoIP/pkg-plist Thu Jun 12 21:37:01 2014 (r357637) @@ -2,9 +2,7 @@ bin/geoiplookup bin/geoiplookup6 bin/geoipupdate bin/geoipupdate.sh -@unexec if cmp -s %D/etc/GeoIP.conf %D/etc/GeoIP.conf.default; then rm -f %D/etc/GeoIP.conf; fi -etc/GeoIP.conf.default -@exec if [ ! -f %D/etc/GeoIP.conf ]; then cp -p %D/%F %B/GeoIP.conf; fi +@sample etc/GeoIP.conf.sample include/GeoIP.h include/GeoIPCity.h include/GeoIPUpdate.h @@ -16,7 +14,7 @@ lib/libGeoIPUpdate.a lib/libGeoIPUpdate.la lib/libGeoIPUpdate.so lib/libGeoIPUpdate.so.0 -%%DATADIR%%/GeoIP.dat +@sample %%DATADIR%%/GeoIP.dat.sample man/man1/geoiplookup.1.gz man/man1/geoiplookup6.1.gz man/man1/geoipupdate.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406122137.s5CLb22n074167>