[Midnightbsd-cvs] mports [17356] trunk/net/GeoIP/pkg-plist: geo ip 1.6.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Sep 16 18:51:47 EDT 2014 

Revision: 17356
          http://svnweb.midnightbsd.org/mports/?rev=17356
Author:   laffer1
Date:     2014-09-16 18:51:46 -0400 (Tue, 16 Sep 2014)
Log Message:
-----------
geo ip 1.6.0

Modified Paths:
--------------
    trunk/net/GeoIP/Makefile
    trunk/net/GeoIP/distinfo
    trunk/net/GeoIP/pkg-descr
    trunk/net/GeoIP/pkg-plist

Added Paths:
-----------
    trunk/net/GeoIP/files/geoipupdate.sh.in
    trunk/net/GeoIP/files/patch-man__Makefile.am
    trunk/net/GeoIP/files/pkg-message.in

Removed Paths:
-------------
    trunk/net/GeoIP/files/geoipupdate.sh

Property Changed:
----------------
    trunk/net/GeoIP/pkg-descr

Modified: trunk/net/GeoIP/Makefile
===================================================================
--- trunk/net/GeoIP/Makefile	2014-09-16 22:48:23 UTC (rev 17355)
+++ trunk/net/GeoIP/Makefile	2014-09-16 22:51:46 UTC (rev 17356)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	GeoIP
-PORTVERSION=	1.4.8
+PORTVERSION=	1.6.0
 PORTREVISION=	0
 CATEGORIES=	net geography
 MASTER_SITES=	http://geolite.maxmind.com/download/geoip/api/c/
@@ -13,22 +13,23 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Find the country that any IP address or hostname originates from
-LICENSE=	gpl2
-# lgpl 2.1 but has a few gpl2 files
 
-CONFIGURE_ARGS=	CC="${CC}" PATH="${PATH}" \
-			CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+LICENSE=	gpl2 lgpl2.1
+LICENSE_COMB=	multi
 
-USE_AUTOTOOLS=	libtool
+USES=		libtool pathfix
+USE_AUTOTOOLS=	aclocal automake libtoolize autoconf
+AUTOMAKE_ARGS=	--add-missing
+PATHFIX_MAKEFILEIN=	Makefile.am
+
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 
-MAN1=		geoiplookup.1 geoipupdate.1 geoiplookup6.1
+SUB_FILES=	geoipupdate.sh pkg-message
 
-run-autotools:
-	@${REINPLACE_CMD} -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	${WRKSRC}/aclocal.m4
-
 post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/geoipupdate.sh ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKDIR}/geoipupdate.sh ${STAGEDIR}${PREFIX}/bin
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libGeoIP.so.*
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>

Modified: trunk/net/GeoIP/distinfo
===================================================================
--- trunk/net/GeoIP/distinfo	2014-09-16 22:48:23 UTC (rev 17355)
+++ trunk/net/GeoIP/distinfo	2014-09-16 22:51:46 UTC (rev 17356)
@@ -1,3 +1,2 @@
-SHA256 (GeoIP-1.4.8.tar.gz) = cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4
-RMD160 (GeoIP-1.4.8.tar.gz) = 51388ff9c738c9e4d60fff790b7d7599a7133bf5
-SIZE (GeoIP-1.4.8.tar.gz) = 1074829
+SHA256 (GeoIP-1.6.0.tar.gz) = 075a0c2815cd099e9ec35c9569db716a3fefcdbb6a10dbfa1ce7c6cd48d4a635
+SIZE (GeoIP-1.6.0.tar.gz) = 722173

Deleted: trunk/net/GeoIP/files/geoipupdate.sh
===================================================================
--- trunk/net/GeoIP/files/geoipupdate.sh	2014-09-16 22:48:23 UTC (rev 17355)
+++ trunk/net/GeoIP/files/geoipupdate.sh	2014-09-16 22:51:46 UTC (rev 17356)
@@ -1,5 +0,0 @@
-#!/bin/sh
-cd /tmp
-fetch http://64.246.48.99/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
-gunzip GeoIP.dat.gz
-mv -f GeoIP.dat /usr/local/share/GeoIP

Added: trunk/net/GeoIP/files/geoipupdate.sh.in
===================================================================
--- trunk/net/GeoIP/files/geoipupdate.sh.in	                        (rev 0)
+++ trunk/net/GeoIP/files/geoipupdate.sh.in	2014-09-16 22:51:46 UTC (rev 17356)
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -eu
+echo Fetching GeoIP.dat and GeoIPv6.dat...
+
+# arguments:
+# $1 URL
+# $2 output file name
+_fetch() {
+    url="$1"
+    out="$2"
+    TEMPFILE="$(mktemp "%%DATADIR%%"/GeoIP.dat-XXXXXX)"
+    trap 'rc=$? ; set +e ; rm -f "'"$TEMPFILE"'" ; exit $rc' 0
+    if fetch -o - "$url" | gunzip >> "$TEMPFILE" ; then
+	chmod 444 "$TEMPFILE"
+	if ! mv -f "$TEMPFILE" "%%DATADIR%%"/"$2" ; then
+	    echo "Unable to replace %%DATADIR%%/$2"
+	    return 2
+	fi
+    else
+	echo "$2 download failed"
+	return 1
+    fi
+    rm -f "$TEMPFILE"
+    trap - 0
+    return 0
+}
+
+_fetch "http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz" GeoIP.dat
+
+_fetch "http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz" GeoIPv6.dat

Added: trunk/net/GeoIP/files/patch-man__Makefile.am
===================================================================
--- trunk/net/GeoIP/files/patch-man__Makefile.am	                        (rev 0)
+++ trunk/net/GeoIP/files/patch-man__Makefile.am	2014-09-16 22:51:46 UTC (rev 17356)
@@ -0,0 +1,17 @@
+--- ./man/Makefile.am.orig	2014-08-11 20:36:57.000000000 +0200
++++ ./man/Makefile.am	2014-08-11 20:38:56.000000000 +0200
+@@ -1,4 +1,4 @@
+-man_MANS = geoiplookup6.1 geoiplookup.1
++NOINST_man_MANS = geoiplookup6.1 geoiplookup.1
+ 
+ EXTRA_DIST = geoiplookup6.1.in geoiplookup.1.in
+ 
+@@ -20,7 +20,7 @@
+ LOOKUP_MAN = $(mandir)/man1/geoiplookup.1
+ LOOKUP6_MAN = $(mandir)/man1/geoiplookup6.1
+ 
+-install-data-hook:
++install-data-hook: $(NOINST_man_MANS)
+ 	cat geoiplookup.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP_MAN)
+ 	cat geoiplookup6.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP6_MAN)
+ 

Added: trunk/net/GeoIP/files/pkg-message.in
===================================================================
--- trunk/net/GeoIP/files/pkg-message.in	                        (rev 0)
+++ trunk/net/GeoIP/files/pkg-message.in	2014-09-16 22:51:46 UTC (rev 17356)
@@ -0,0 +1,3 @@
+GeoIP does not ship with the actual data files. You must download
+them yourself! Please run:
+# %%PREFIX%%/bin/geoipupdate.sh

Modified: trunk/net/GeoIP/pkg-descr
===================================================================
--- trunk/net/GeoIP/pkg-descr	2014-09-16 22:48:23 UTC (rev 17355)
+++ trunk/net/GeoIP/pkg-descr	2014-09-16 22:51:46 UTC (rev 17356)
@@ -8,4 +8,7 @@
 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/


Property changes on: trunk/net/GeoIP/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/net/GeoIP/pkg-plist
===================================================================
--- trunk/net/GeoIP/pkg-plist	2014-09-16 22:48:23 UTC (rev 17355)
+++ trunk/net/GeoIP/pkg-plist	2014-09-16 22:51:46 UTC (rev 17356)
@@ -1,19 +1,12 @@
 bin/geoiplookup
 bin/geoiplookup6
-bin/geoipupdate
 bin/geoipupdate.sh
- at 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
 include/GeoIP.h
 include/GeoIPCity.h
-include/GeoIPUpdate.h
 lib/libGeoIP.a
-lib/libGeoIP.la
 lib/libGeoIP.so
-lib/libGeoIP.so.5
-lib/libGeoIPUpdate.a
-lib/libGeoIPUpdate.la
-lib/libGeoIPUpdate.so
-lib/libGeoIPUpdate.so.0
-%%DATADIR%%/GeoIP.dat
+lib/libGeoIP.so.7
+libdata/pkgconfig/geoip.pc
+man/man1/geoiplookup.1.gz
+man/man1/geoiplookup6.1.gz
 @dirrmtry %%DATADIR%%

More information about the Midnightbsd-cvs mailing list