aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErnst de Haan <znerd@FreeBSD.org>2002-04-04 23:41:58 +0000
committerErnst de Haan <znerd@FreeBSD.org>2002-04-04 23:41:58 +0000
commit167198fa5f4be2c96e66ef3edeae339698c05137 (patch)
tree4f3a0d7a3b7a005cd65e60dcfe0b9de0ebac059e
parent0dfa641e8904e8fe8658908b1237dc12e93bf87d (diff)
downloadports-167198fa5f4be2c96e66ef3edeae339698c05137.tar.gz
ports-167198fa5f4be2c96e66ef3edeae339698c05137.zip
Updated mastersite. Added some alternatives.
Now uses USE_JAVA (bsd.java.mk). Changed distinfo. Distfile changed, although the file name did not change (d'oh). Bumped PORTREVISION. PR: 36650 Prompted by: Tilman Linneweh <tilman@arved.de>
Notes
Notes: svn path=/head/; revision=57333
-rw-r--r--textproc/cocoon/Makefile15
-rw-r--r--textproc/cocoon/distinfo2
-rw-r--r--www/cocoon/Makefile15
-rw-r--r--www/cocoon/distinfo2
4 files changed, 18 insertions, 16 deletions
diff --git a/textproc/cocoon/Makefile b/textproc/cocoon/Makefile
index 905fce8617af..468bb6f2821c 100644
--- a/textproc/cocoon/Makefile
+++ b/textproc/cocoon/Makefile
@@ -7,20 +7,21 @@
PORTNAME= cocoon
PORTVERSION= 1.8.2
+PORTREVISION= 1
CATEGORIES= textproc www java
-MASTER_SITES= http://xml.apache.org/cocoon/dist/
+MASTER_SITES= http://xml.apache.org/cocoon/dist/cocoon1/ \
+ http://www.metaverse.nl/~ernst/ \
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= znerd
DISTNAME= Cocoon-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= ${LOCALBASE}/jdk${JDK_VERSION}/bin/javac:${PORTSDIR}/java/jdk
-RUN_DEPENDS= ${LOCALBASE}/libexec/apache/mod_jserv.so:${PORTSDIR}/www/apache-jserv
-
-MAKE_ENV= JAVA_HOME=${LOCALBASE}/jdk${JDK_VERSION} CLASSPATH=${CLASSPATH}
+USE_JAVA= 1.1+
+MAKE_ENV= JAVA_HOME=${JAVA_HOME} CLASSPATH=${CLASSPATH}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-JDK_VERSION= 1.1.8
-CLASSPATH= ${LOCALBASE}/jdk${JDK_VERSION}/lib/classes.zip
+CLASSPATH= ${JAVA_CLASSES}
LIBS= fop_0_15_0.jar xalan_1_2_D02.jar xerces_1_2.jar
JDIR= ${PREFIX}/share/java/classes
CDIR= ${PREFIX}/etc/apache/cocoon
diff --git a/textproc/cocoon/distinfo b/textproc/cocoon/distinfo
index 8aabb61e5f0f..f99ca2143081 100644
--- a/textproc/cocoon/distinfo
+++ b/textproc/cocoon/distinfo
@@ -1 +1 @@
-MD5 (Cocoon-1.8.2.tar.gz) = 86310bec24d5b6b35b6965410c19024c
+MD5 (Cocoon-1.8.2.tar.gz) = 57fc25fcbc96f51cb684741651e94e30
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 905fce8617af..468bb6f2821c 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -7,20 +7,21 @@
PORTNAME= cocoon
PORTVERSION= 1.8.2
+PORTREVISION= 1
CATEGORIES= textproc www java
-MASTER_SITES= http://xml.apache.org/cocoon/dist/
+MASTER_SITES= http://xml.apache.org/cocoon/dist/cocoon1/ \
+ http://www.metaverse.nl/~ernst/ \
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= znerd
DISTNAME= Cocoon-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= ${LOCALBASE}/jdk${JDK_VERSION}/bin/javac:${PORTSDIR}/java/jdk
-RUN_DEPENDS= ${LOCALBASE}/libexec/apache/mod_jserv.so:${PORTSDIR}/www/apache-jserv
-
-MAKE_ENV= JAVA_HOME=${LOCALBASE}/jdk${JDK_VERSION} CLASSPATH=${CLASSPATH}
+USE_JAVA= 1.1+
+MAKE_ENV= JAVA_HOME=${JAVA_HOME} CLASSPATH=${CLASSPATH}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-JDK_VERSION= 1.1.8
-CLASSPATH= ${LOCALBASE}/jdk${JDK_VERSION}/lib/classes.zip
+CLASSPATH= ${JAVA_CLASSES}
LIBS= fop_0_15_0.jar xalan_1_2_D02.jar xerces_1_2.jar
JDIR= ${PREFIX}/share/java/classes
CDIR= ${PREFIX}/etc/apache/cocoon
diff --git a/www/cocoon/distinfo b/www/cocoon/distinfo
index 8aabb61e5f0f..f99ca2143081 100644
--- a/www/cocoon/distinfo
+++ b/www/cocoon/distinfo
@@ -1 +1 @@
-MD5 (Cocoon-1.8.2.tar.gz) = 86310bec24d5b6b35b6965410c19024c
+MD5 (Cocoon-1.8.2.tar.gz) = 57fc25fcbc96f51cb684741651e94e30