Moved misc/GeoIP and misc/p5-Geo-IP to the more fitting net directory[1].

Fixed build of net/GeoIP on -STABLE[2].

PR:		ports/43807
Submitted by:	Kimura Fuyuki <fuyuki@hadaly.org>  [2]
Submitted by:	seanc [1]

Reviewed by:	knu (mentor/portmgr)

14 files changed, 13 insertions, 130 deletions

diff --git a/misc/GeoIP/Makefile b/misc/GeoIP/Makefile
deleted file mode 100644
index 7e42e06656f0..000000000000
--- a/misc/GeoIP/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:	GeoIP
-# Date created:				10 August 2002
-# Whom:	      				Yen-Ming Lee <leeym@leeym.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	GeoIP
-PORTVERSION=	1.0.8
-CATEGORIES=	misc
-MASTER_SITES=	http://maxmind.com/download/geoip/api/c/
-
-MAINTAINER=	seanc@FreeBSD.org
-
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-gnu-ld=yes
-INSTALLS_SHLIB=	yes
-
-MAN1=		geoiplookup.1 geoipupdate.1
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/misc/GeoIP/distinfo b/misc/GeoIP/distinfo
deleted file mode 100644
index daded00b5982..000000000000
--- a/misc/GeoIP/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (GeoIP-1.0.8.tar.gz) = dcf0a8b924f03674a5b216f0c7e78b7b
diff --git a/misc/GeoIP/files/patch-conf::Makefile.in b/misc/GeoIP/files/patch-conf::Makefile.in
deleted file mode 100644
index eb466dab6ee6..000000000000
--- a/misc/GeoIP/files/patch-conf::Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- conf/Makefile.in.orig	Fri Sep 27 12:21:01 2002
-+++ conf/Makefile.in	Fri Sep 27 12:26:02 2002
-@@ -242,12 +242,12 @@
- 
- 
- install-data-hook: install-sysconfDATA
--	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
--	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
--	else \
--	        echo "$(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
--	        $(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
--	fi
-+	# @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
-+	#        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
-+	# else \
-+	#         echo "$(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
-+	#         $(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
-+	# fi
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/misc/GeoIP/pkg-comment b/misc/GeoIP/pkg-comment
deleted file mode 100644
index 15f274e738a3..000000000000
--- a/misc/GeoIP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Find the country that any IP address or hostname originates from
diff --git a/misc/GeoIP/pkg-descr b/misc/GeoIP/pkg-descr
deleted file mode 100644
index 9dcae6ca2c7c..000000000000
--- a/misc/GeoIP/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-GeoIP is a C library that enables the user to find the country that any
-IP address or hostname originates from.  It uses a file based database
-that is accurate as of March 2002.  This database simply contains IP blocks
-as keys, and countries as values.  This database should be more complete and
-accurate than using reverse DNS lookups.
-
-This module can be used to automatically select the geographically closest
-mirror, to analyze your web server logs to determine the countries of your
-visitors, for credit card fraud detection, and for software export controls.
-
-WWW: http://maxmind.com/geoip/
diff --git a/misc/GeoIP/pkg-message b/misc/GeoIP/pkg-message
deleted file mode 100644
index 81d8cc2f4436..000000000000
--- a/misc/GeoIP/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-***
-*** Please do this after you've ran the installation:
-*** - Copy ${PREFIX}/etc/GeoIP.conf.default to ${PREFIX}/etc/GeoIP.conf
-***
diff --git a/misc/GeoIP/pkg-plist b/misc/GeoIP/pkg-plist
deleted file mode 100644
index 8c71cfb7e213..000000000000
--- a/misc/GeoIP/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/geoiplookup
-bin/geoipupdate
-etc/GeoIP.conf.default
-include/GeoIP.h
-lib/libGeoIP.a
-lib/libGeoIP.la
-lib/libGeoIP.so
-lib/libGeoIP.so.1
-share/GeoIP/GeoIP.dat
-@unexec rmdir %D/share/GeoIP 2>/dev/null || true
diff --git a/misc/p5-Geo-IP/Makefile b/misc/p5-Geo-IP/Makefile
deleted file mode 100644
index 30b30e120752..000000000000
--- a/misc/p5-Geo-IP/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:	p5-Geo-IP
-# Date created:				10 August 2002
-# Whom:	      				Yen-Ming Lee <leeym@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Geo-IP
-PORTVERSION=	0.26
-PORTREVISION=	1
-CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
-		http://maxmind.com/download/geoip/api/perl/
-MASTER_SITE_SUBDIR=	Geo
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	seanc@FreeBSD.org
-
-LIB_DEPENDS=	GeoIP.1:${PORTSDIR}/misc/GeoIP
-
-PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	LIBS='-L${PREFIX}/lib' INC='-I${PREFIX}/include'
-
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		Geo::Mirror.3 Geo::IP.3
-
-.include <bsd.port.mk>
diff --git a/misc/p5-Geo-IP/distinfo b/misc/p5-Geo-IP/distinfo
deleted file mode 100644
index a208d2fa2f4c..000000000000
--- a/misc/p5-Geo-IP/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (Geo-IP-0.26.tar.gz) = 233ee112eec0139e952978c9780bc209
diff --git a/misc/p5-Geo-IP/pkg-comment b/misc/p5-Geo-IP/pkg-comment
deleted file mode 100644
index c0ffc2f8436a..000000000000
--- a/misc/p5-Geo-IP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gets country name by IP or hostname
diff --git a/misc/p5-Geo-IP/pkg-descr b/misc/p5-Geo-IP/pkg-descr
deleted file mode 100644
index 2319f3c4ef94..000000000000
--- a/misc/p5-Geo-IP/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-This module a simple file-based database.  This database simply contains
-IP blocks as keys, and countries as values.  The data contains all
-public IP addresses and should be more
-complete and accurate than reverse DNS lookups.
-
-This module can be used to automatically select the geographically closest
-mirror, or to analyze your web server logs to determine the countries of
-your visiters.
-
-To install, see the INSTALL file.
-
-Copyright (c) 2002, MaxMind.com
-
-All rights reserved.  This package is free software; you can redistribute it
-and/or modify it under the same terms as Perl itself.
-
-WWW: http://maxmind.com/geoip/api/perl.shtml
diff --git a/misc/p5-Geo-IP/pkg-plist b/misc/p5-Geo-IP/pkg-plist
deleted file mode 100644
index 118e68534dd6..000000000000
--- a/misc/p5-Geo-IP/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Geo/IP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Geo/Mirror.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo/IP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo/IP/IP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo/IP/IP.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo/IP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Geo
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 7e42e06656f0..84a4fe673fa8 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -12,8 +12,6 @@ MASTER_SITES=	http://maxmind.com/download/geoip/api/c/
 
 MAINTAINER=	seanc@FreeBSD.org
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-gnu-ld=yes
 INSTALLS_SHLIB=	yes
diff --git a/net/GeoIP/files/patch-libGeoIP::GeoIPUpdate.c b/net/GeoIP/files/patch-libGeoIP::GeoIPUpdate.c
new file mode 100644
index 000000000000..7b1771ff911b
--- /dev/null
+++ b/net/GeoIP/files/patch-libGeoIP::GeoIPUpdate.c
@@ -0,0 +1,13 @@
+--- libGeoIP/GeoIPUpdate.c.orig	Tue Oct  8 11:12:17 2002
++++ libGeoIP/GeoIPUpdate.c	Tue Oct  8 11:12:41 2002
+@@ -21,9 +21,9 @@
+ #include "global.h"
+ #include "md5.h"
+ #include "GeoIP.h"
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-#include <sys/types.h>
+ #include <sys/socket.h>
+ #include "zlib.h"
+ #include "time.h"