cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak systrace build; add GeoIP as REGRESS_DEPENDS and RUN_DEPENDS; split out

Browse Source 
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@.
This commit is contained in:
ian 2006-12-16 21:16:21 +00:00
parent 3bc8a88597
commit ca16b80b20
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
geo/jeoip/Makefile
View File

@ -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" COMMENT= "Java interface to GeoIP database"
DISTNAME= jeoip-0.5 DISTNAME= jeoip-0.5
PKGNAME= ${DISTNAME}p0
CATEGORIES= geo net CATEGORIES= geo net
PKG_ARCH= * PKG_ARCH= *
@ -21,13 +22,12 @@ MODJAVA_VER= 1.5+
MODJAVA_JRERUN= Yes MODJAVA_JRERUN= Yes
BUILD_DEPENDS= :apache-ant->=1.6.1:devel/apache-ant:\ BUILD_DEPENDS= :apache-ant->=1.6.1:devel/apache-ant:\
:junit->=3.8.1:java/junit :junit->=3.8.1:java/junit
RUN_DEPENDS= :GeoIP-*:net/GeoIP\ REGRESS_DEPENDS= ::net/GeoIP
:javaPathHelper-*:java/javaPathHelper RUN_DEPENDS= ::net/GeoIP\
:javaPathHelper-*:java/javaPathHelper
MAKE_ENV= JAVA_HOME=${JAVA_HOME} \ MAKE_ENV= JAVA_HOME=${JAVA_HOME} \
CLASSPATH=${LOCALBASE}/share/java/classes/junit-3.8.1/junit.jar CLASSPATH=${LOCALBASE}/share/java/classes/junit-3.8.1/junit.jar
NO_REGRESS= Yes
WRKDIST= ${WRKDIR}/jeoip WRKDIST= ${WRKDIR}/jeoip
INSTALLDIR= jeoip INSTALLDIR= jeoip
@ -40,4 +40,7 @@ do-install:
${INSTALL_DATA} ${WRKDIST}/jeoip.jar ${PREFIX}/share/java/${INSTALLDIR} ${INSTALL_DATA} ${WRKDIST}/jeoip.jar ${PREFIX}/share/java/${INSTALLDIR}
${INSTALL_SCRIPT} ${WRKDIST}/unix/jeoip ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKDIST}/unix/jeoip ${PREFIX}/bin
do-regress:
@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ant regress
.include <bsd.port.mk> .include <bsd.port.mk>

12
geo/jeoip/patches/patch-build_xml Normal file
View File

@ -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"