From ca16b80b20bf45d7c3b4924d37d735a5d782770e Mon Sep 17 00:00:00 2001
From: ian <ian@openbsd.org>
Date: Sat, 16 Dec 2006 21:16:21 +0000
Subject: [PATCH] Unbreak systrace build; add GeoIP as REGRESS_DEPENDS and
 RUN_DEPENDS; split out program's regress from its implicit use inside build
 to an explicit regress target. Bump pkg.  Prodded by steven@, help from him &
 kurt@, "go ahead" steven@.

---
 geo/jeoip/Makefile                | 13 ++++++++-----
 geo/jeoip/patches/patch-build_xml | 12 ++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 geo/jeoip/patches/patch-build_xml

diff --git a/geo/jeoip/Makefile b/geo/jeoip/Makefile
index 868a41216a8..909d6a4482e 100644
--- a/geo/jeoip/Makefile
+++ b/geo/jeoip/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2006/11/17 19:20:34 ian Exp $
+# $OpenBSD: Makefile,v 1.2 2006/12/16 21:16:21 ian Exp $
 COMMENT=		"Java interface to GeoIP database"
 DISTNAME=		jeoip-0.5
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		geo net
 PKG_ARCH=		*
 
@@ -21,13 +22,12 @@ MODJAVA_VER=		1.5+
 MODJAVA_JRERUN=		Yes
 BUILD_DEPENDS=		:apache-ant->=1.6.1:devel/apache-ant:\
 			:junit->=3.8.1:java/junit
-RUN_DEPENDS=		:GeoIP-*:net/GeoIP\
-			:javaPathHelper-*:java/javaPathHelper
+REGRESS_DEPENDS=	::net/GeoIP
+RUN_DEPENDS=		::net/GeoIP\
+ 			:javaPathHelper-*:java/javaPathHelper
 MAKE_ENV=		JAVA_HOME=${JAVA_HOME} \
 			CLASSPATH=${LOCALBASE}/share/java/classes/junit-3.8.1/junit.jar
 
-NO_REGRESS=		Yes
-
 WRKDIST=		${WRKDIR}/jeoip
 
 INSTALLDIR=		jeoip
@@ -40,4 +40,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIST}/jeoip.jar ${PREFIX}/share/java/${INSTALLDIR}
 	${INSTALL_SCRIPT} ${WRKDIST}/unix/jeoip ${PREFIX}/bin
 
+do-regress:
+	@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ant regress
+
 .include <bsd.port.mk>
diff --git a/geo/jeoip/patches/patch-build_xml b/geo/jeoip/patches/patch-build_xml
new file mode 100644
index 00000000000..77c788ac17d
--- /dev/null
+++ b/geo/jeoip/patches/patch-build_xml
@@ -0,0 +1,12 @@
+$OpenBSD: patch-build_xml,v 1.1 2006/12/16 21:16:21 ian Exp $
+--- build.xml.orig	Sat Dec 16 13:14:25 2006
++++ build.xml	Sat Dec 16 13:14:48 2006
+@@ -61,7 +61,7 @@
+ 	<!-- - - - - - - - - - - - - - - - - -
+ 	  target: docs: format API docs
+ 	 - - - - - - - - - - - - - - - - - -->
+-	<target name="docs" depends="regress"
++	<target name="docs" depends="compile"
+ 		description="Format API docs">
+ 		<javadoc sourcepath="${src}" destdir="${build}/docs"
+ 			windowtitle="JeoIP - Lookup IPV4 by country"