[csw-devel] SF.net SVN: gar:[21832] csw/mgar/pkg/mod_geoip/trunk

[wilbury at users.sourceforge.net]

Revision: 21832
          http://gar.svn.sourceforge.net/gar/?rev=21832&view=rev
Author:   wilbury
Date:     2013-08-26 19:39:58 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
mod_geoip/trunk: Upgrade to geoip2

Modified Paths:
--------------
    csw/mgar/pkg/mod_geoip/trunk/Makefile
    csw/mgar/pkg/mod_geoip/trunk/checksums

Modified: csw/mgar/pkg/mod_geoip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_geoip/trunk/Makefile	2013-08-26 18:08:50 UTC (rev 21831)
+++ csw/mgar/pkg/mod_geoip/trunk/Makefile	2013-08-26 19:39:58 UTC (rev 21832)
@@ -1,43 +1,39 @@
-NAME = ap2_modgeoip
-SPKG_NAME = mod_geoip
-VERSION = 1.2.5
-GARTYPE = v1
+NAME = mod_geoip2
+VERSION = 1.2.8
+GARTYPE = v2
 
-DESCRIPTION = Apache 2.x GeoIP module
+DESCRIPTION = GeoIP Apache module
 define BLURB
-  mod_geoip2 is an Apache 2.x module for finding the country and city
-  that a web request originated from.  It uses the GeoIP library and
-  database to perform the lookup.  It is free software, licensed under
-  the Apache license.  It requires the C API, version 1.4.3 and above, see:
-  http://www.maxmind.com/app/c
+  The mod_geoip2 module embeds GeoIP database lookups into the Apache web server.
+  It is only capable of looking up the IP of a client that connects to the web server,
+  as opposed to looking up arbitrary addresses.
 endef
 
+PACKAGES = CSWap2modgeoip2
+
 MASTER_SITES = http://www.maxmind.com/download/geoip/api/mod_geoip2/
-DISTFILES  = $(SPKG_NAME)2_$(VERSION).tar.gz
-DISTFILES += $(call admfiles,CSWap2modgeoip,depend postinstall preremove)
+DISTFILES  = mod_geoip2-latest.tar.gz
+#WORKSRC = $(WORKDIR)/$(DISTNAME)-src/native
+#PATCHDIR = $(WORKDIR)/$(DISTNAME)-src
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(SPKG_NAME)2-(\d+(?:\.\d+)*).tar.gz
+# Apache paths
+AP2_ROOT      = $(prefix)/apache2
+AP2_LIBEXEC   = $(DESTDIR)$(AP2_ROOT)/libexec
+AP2_APXS      = $(AP2_ROOT)/sbin/apxs
+AP2_MODS = 1
+AP2_MODFILES += mod_geoip2.so
 
-CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS = custom
-INSTALL_SCRIPTS = custom
-TEST_SCRIPTS =
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --libexecdir=$(AP2_ROOT)/libexec
+CONFIGURE_ARGS += --with-apxs=$(AP2_ROOT)/sbin/apxs
 
-include gar/category.mk
-include ../apache2/files/extensionbuild.mk
+BUILD_DEP_PKGS_CSWap2modgeoip2 += CSWapache2-dev
+RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWapache2
 
-WORKSRC := $(WORKDIR)/$(SPKG_NAME)2_$(VERSION)
-SPKG_SOURCEURL = http://www.maxmind.com/app/mod_geoip/
+LICENSE_TEXT = Apache
 
-build-custom:
-	@( cd $(WORKSRC) ; $(APXS2_BUILD) -L$(libdir) -Wl,"-R $(libdir)" -lGeoIP $(SPKG_NAME).c )
-	@$(MAKECOOKIE)
+# No test suite available
+TEST_SCRIPTS =
 
-install-custom:
-	@mkdir -p $(DESTDIR)$(docdir)/$(NAME)
-	@( cd $(WORKSRC) ; \
-		$(APXS2_INSTALL) $(SPKG_NAME).la ; \
-		cp Changes README* INSTALL $(DESTDIR)$(docdir)/$(NAME) )
-	@cp $(FILEDIR)/CSWap2modgeoip.copyright $(DESTDIR)$(docdir)/$(NAME)/copyright
-	@$(MAKECOOKIE)
+include gar/category.mk
+

Modified: csw/mgar/pkg/mod_geoip/trunk/checksums
===================================================================
--- csw/mgar/pkg/mod_geoip/trunk/checksums	2013-08-26 18:08:50 UTC (rev 21831)
+++ csw/mgar/pkg/mod_geoip/trunk/checksums	2013-08-26 19:39:58 UTC (rev 21832)
@@ -1,5 +1 @@
-5d35c9a9cbf47c2cb636bed26cd5fa19  download/mod_geoip2_1.2.5.tar.gz
-3c890c2b8db8b7366fc36eddfaaaefb8  download/CSWap2modgeoip.gspec
-3794fa588d42ec4ba824a145666a813e  download/CSWap2modgeoip.depend
-a4bc5e76c41a6e2e468b45b3d938bac8  download/CSWap2modgeoip.postinstall
-8dc70925d3bd5e484cd453d9b8401f03  download/CSWap2modgeoip.preremove
+adab5ca32be41980155e07c8c8bcfc87  mod_geoip2-latest.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.