1.6 has been EOL since 2013-04-16 and isn't stable on i386. Time for it
to go to the attic. Attached is the diff to adjust java.port.mk and
cmake to remove jdk/1.6 as well as REVISION bumps for all java ports
with MODJAVA_VER <= 1.6.
-Kurt
Index: databases/architect/Makefile
===================================================================
RCS file: /cvs/ports/databases/architect/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- databases/architect/Makefile 7 Aug 2013 21:31:21 -0000 1.18
+++ databases/architect/Makefile 2 May 2014 11:37:03 -0000
@@ -11,7 +11,7 @@ PKGNAME= architect-${V}
CATEGORIES= databases
WRKDIST= ${WRKDIR}/architect-${V}/
-REVISION= 2
+REVISION= 3
HOMEPAGE= http://www.sqlpower.ca/page/architect
Index: databases/db/v4/Makefile
===================================================================
RCS file: /cvs/ports/databases/db/v4/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- databases/db/v4/Makefile 5 Jul 2013 12:03:52 -0000 1.61
+++ databases/db/v4/Makefile 2 May 2014 11:37:03 -0000
@@ -15,7 +15,7 @@ EPOCH-main= 0
REVISION-main = 0
EPOCH-java= 0
EPOCH-tcl= 0
-REVISION-java = 1
+REVISION-java = 2
REVISION-tcl = 0
DBLIBDIR= lib/db4
Index: databases/jxplorer/Makefile
===================================================================
RCS file: /cvs/ports/databases/jxplorer/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- databases/jxplorer/Makefile 11 Mar 2013 02:52:05 -0000 1.13
+++ databases/jxplorer/Makefile 2 May 2014 11:37:03 -0000
@@ -5,7 +5,7 @@ COMMENT= standards compliant LDAP browse
V= 3.2
DISTNAME= JXv${V}deploy
PKGNAME= jxplorer-${V}
-REVISION= 8
+REVISION= 9
EXTRACT_SUFX= .zip
CATEGORIES= databases net
Index: databases/postgresql-jdbc/Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql-jdbc/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- databases/postgresql-jdbc/Makefile 2 Jul 2013 10:36:35 -0000 1.20
+++ databases/postgresql-jdbc/Makefile 2 May 2014 11:37:04 -0000
@@ -9,7 +9,7 @@ PKGNAME-main= postgresql-jdbc-${V:S/-/.
PKGNAME-docs= postgresql-jdbc-docs-${V:S/-/./}
PKG_ARCH-docs= *
CATEGORIES= databases
-REVISION-main = 2
+REVISION-main = 3
MULTI_PACKAGES= -main -docs
Index: databases/postgresql-jdbc/pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/databases/postgresql-jdbc/pkg/PLIST-docs,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-docs
--- databases/postgresql-jdbc/pkg/PLIST-docs 6 Sep 2011 19:28:36 -0000 1.2
+++ databases/postgresql-jdbc/pkg/PLIST-docs 2 May 2014 11:37:04 -0000
@@ -89,6 +89,9 @@ share/doc/postgresql-jdbc/overview-summa
share/doc/postgresql-jdbc/overview-tree.html
share/doc/postgresql-jdbc/package-list
share/doc/postgresql-jdbc/resources/
-share/doc/postgresql-jdbc/resources/inherit.gif
+share/doc/postgresql-jdbc/resources/background.gif
+share/doc/postgresql-jdbc/resources/tab.gif
+share/doc/postgresql-jdbc/resources/titlebar.gif
+share/doc/postgresql-jdbc/resources/titlebar_end.gif
share/doc/postgresql-jdbc/serialized-form.html
share/doc/postgresql-jdbc/stylesheet.css
Index: devel/apache-ant/Makefile
===================================================================
RCS file: /cvs/ports/devel/apache-ant/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- devel/apache-ant/Makefile 31 Mar 2014 17:24:49 -0000 1.34
+++ devel/apache-ant/Makefile 2 May 2014 11:37:07 -0000
@@ -4,6 +4,7 @@ COMMENT= build tool for java appl
DISTNAME= apache-ant-1.9.3
CATEGORIES= devel
+REVISION= 0
HOMEPAGE= http://ant.apache.org/
Index: devel/cmake/Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- devel/cmake/Makefile 14 Apr 2014 14:02:44 -0000 1.98
+++ devel/cmake/Makefile 2 May 2014 11:37:07 -0000
@@ -11,7 +11,7 @@ HOMEPAGE = http://www.cmake.org/
CATEGORIES = devel
COMMENT = portable build system
DISTNAME = cmake-2.8.12.2
-REVISION = 0
+REVISION = 1
MASTER_SITES = ${HOMEPAGE}files/v2.8/
MAINTAINER = David Coppa <dco...@openbsd.org>
Index: devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake,v
retrieving revision 1.8
diff -u -p -r1.8 patch-Modules_CMakeDetermineJavaCompiler_cmake
--- devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake 16 Aug 2013 10:37:22 -0000 1.8
+++ devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake 2 May 2014 11:37:07 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.8 2013/08/16 10:37:22 dcoppa Exp $
---- Modules/CMakeDetermineJavaCompiler.cmake.orig Tue Jul 2 15:41:39 2013
-+++ Modules/CMakeDetermineJavaCompiler.cmake Fri Aug 16 11:53:55 2013
+--- Modules/CMakeDetermineJavaCompiler.cmake.orig Thu Jan 16 12:15:08 2014
++++ Modules/CMakeDetermineJavaCompiler.cmake Thu May 1 13:16:46 2014
@@ -16,6 +16,8 @@
# NOTE, a generator may set CMAKE_Java_COMPILER before
# loading this file to force a compiler.
@@ -10,7 +10,7 @@ $OpenBSD: patch-Modules_CMakeDetermineJa
if(NOT CMAKE_Java_COMPILER)
# prefer the environment variable CC
if($ENV{JAVA_COMPILER} MATCHES ".+")
-@@ -42,30 +44,38 @@ if(NOT CMAKE_Java_COMPILER)
+@@ -42,30 +44,33 @@ if(NOT CMAKE_Java_COMPILER)
endif()
endif()
@@ -39,11 +39,7 @@ $OpenBSD: patch-Modules_CMakeDetermineJa
- /usr/local/jdk-1.6.0/bin
- )
+ if(MODJAVA_VER)
-+ if(MODJAVA_VER MATCHES "^1\\.6\\+?$")
-+ set(Java_BIN_PATH ${LOCALBASE}/jdk-1.6.0/bin)
-+ else()
-+ set(Java_BIN_PATH ${LOCALBASE}/jdk-1.7.0/bin)
-+ endif()
++ set(Java_BIN_PATH ${LOCALBASE}/jdk-1.7.0/bin)
+ else(MODJAVA_VER)
+ set(Java_BIN_PATH
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
@@ -67,7 +63,6 @@ $OpenBSD: patch-Modules_CMakeDetermineJa
+ /usr/lib/j2sdk1.5-sun/bin
+ /opt/sun-jdk-1.5.0.04/bin
+ ${LOCALBASE}/jdk-1.7.0/bin
-+ ${LOCALBASE}/jdk-1.6.0/bin
+ )
+ endif(MODJAVA_VER)
# if no compiler has been specified yet, then look for one
Index: devel/cmake/patches/patch-Modules_FindJNI_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJNI_cmake,v
retrieving revision 1.10
diff -u -p -r1.10 patch-Modules_FindJNI_cmake
--- devel/cmake/patches/patch-Modules_FindJNI_cmake 12 Aug 2013 16:09:50 -0000 1.10
+++ devel/cmake/patches/patch-Modules_FindJNI_cmake 2 May 2014 11:37:07 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-Modules_FindJNI_cmake,v 1.10 2013/08/12 16:09:50 zhuk Exp $
Note: we always build with Java 1.6 even when 1.6+ requested; "+" is meaningful
for run-time only.
---- Modules/FindJNI.cmake.orig Fri Jun 7 19:21:34 2013
-+++ Modules/FindJNI.cmake Sat Jul 27 21:46:41 2013
+--- Modules/FindJNI.cmake.orig Thu Jan 16 12:15:08 2014
++++ Modules/FindJNI.cmake Fri May 2 07:27:01 2014
@@ -26,6 +26,8 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
@@ -25,7 +25,7 @@ for run-time only.
endif()
# Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
-@@ -88,44 +92,57 @@ endmacro()
+@@ -88,44 +92,48 @@ endmacro()
get_filename_component(java_install_version
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
@@ -68,17 +68,10 @@ for run-time only.
- /usr/local/jre-1.6.0/lib/{libarch}
- )
+if(MODJAVA_VER)
-+ if(MODJAVA_VER MATCHES "^1\\.6\\+?$")
-+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
-+ ${LOCALBASE}/jdk-1.6.0/jre/lib/{libarch}
-+ ${LOCALBASE}/jre-1.6.0/lib/{libarch}
-+ )
-+ else()
-+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
-+ ${LOCALBASE}/jdk-1.7.0/jre/lib/{libarch}
-+ ${LOCALBASE}/jre-1.7.0/lib/{libarch}
-+ )
-+ endif()
++ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
++ ${LOCALBASE}/jdk-1.7.0/jre/lib/{libarch}
++ ${LOCALBASE}/jre-1.7.0/lib/{libarch}
++ )
+else()
+ set(JAVA_AWT_LIBRARY_DIRECTORIES
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
@@ -112,14 +105,12 @@ for run-time only.
+ # OpenBSD specific paths for default JVM
+ ${LOCALBASE}/jdk-1.7.0/jre/lib/{libarch}
+ ${LOCALBASE}/jre-1.7.0/lib/{libarch}
-+ ${LOCALBASE}/jdk-1.6.0/jre/lib/{libarch}
-+ ${LOCALBASE}/jre-1.6.0/lib/{libarch}
+ )
+endif()
set(JAVA_JVM_LIBRARY_DIRECTORIES)
foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
-@@ -137,31 +154,42 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
+@@ -137,31 +145,35 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
)
endforeach()
@@ -149,15 +140,9 @@ for run-time only.
- /usr/local/jdk-1.6.0/include
- )
+if(MODJAVA_VER)
-+ if(MODJAVA_VER MATCHES "^1\\.6\\+?$")
-+ set(JAVA_AWT_INCLUDE_DIRECTORIES
-+ ${LOCALBASE}/jdk-1.6.0/include
-+ )
-+ else()
-+ set(JAVA_AWT_INCLUDE_DIRECTORIES
-+ ${LOCALBASE}/jdk-1.7.0/include
-+ )
-+ endif()
++ set(JAVA_AWT_INCLUDE_DIRECTORIES
++ ${LOCALBASE}/jdk-1.7.0/include
++ )
+else()
+ set(JAVA_AWT_INCLUDE_DIRECTORIES
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
@@ -181,7 +166,6 @@ for run-time only.
+ /usr/lib/jvm/default-java/include
+ # OpenBSD specific path for default JVM
+ ${LOCALBASE}/jdk-1.7.0/include
-+ ${LOCALBASE}/jdk-1.6.0/include
+ )
+endif()
Index: devel/commons-io/Makefile
===================================================================
RCS file: /cvs/ports/devel/commons-io/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- devel/commons-io/Makefile 28 Apr 2013 16:34:53 -0000 1.7
+++ devel/commons-io/Makefile 2 May 2014 11:37:08 -0000
@@ -6,6 +6,7 @@ V= 2.4
DISTNAME= commons-io-$V-src
PKGNAME= ${DISTNAME:S/-src//}
CATEGORIES= devel
+REVISION= 0
HOMEPAGE= http://commons.apache.org/io/
Index: devel/eclipse/sdk/Makefile
===================================================================
RCS file: /cvs/ports/devel/eclipse/sdk/Makefile,v
retrieving revision 1.75
diff -u -p -r1.75 Makefile
--- devel/eclipse/sdk/Makefile 8 Dec 2013 08:01:00 -0000 1.75
+++ devel/eclipse/sdk/Makefile 2 May 2014 11:37:08 -0000
@@ -11,7 +11,7 @@ ECLIPSE_VER= 3.2.2
DISTNAME= eclipse-sourceBuild-srcIncluded-${ECLIPSE_VER}
PKGNAME= eclipse-sdk-${ECLIPSE_VER}
PKGNAME-main= eclipse-sdk-${ECLIPSE_VER}
-REVISION-main= 21
+REVISION-main= 22
PKGNAME-swt= swt-${ECLIPSE_VER}
REVISION-swt= 5
PKGNAME-gnome= swt-gnome-${ECLIPSE_VER}
Index: devel/hudson/Makefile
===================================================================
RCS file: /cvs/ports/devel/hudson/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- devel/hudson/Makefile 11 Mar 2013 10:50:09 -0000 1.14
+++ devel/hudson/Makefile 2 May 2014 11:37:10 -0000
@@ -5,7 +5,7 @@ COMMENT = continuous integration server
VERSION = 1.365
# nonsensical versioning, alas.
DISTNAME = hudson
-REVISION = 3
+REVISION = 4
PKGNAME = hudson-${VERSION}
DIST_SUBDIR = hudson-${VERSION}
Index: devel/intellij/Makefile
===================================================================
RCS file: /cvs/ports/devel/intellij/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- devel/intellij/Makefile 11 Mar 2013 10:50:09 -0000 1.17
+++ devel/intellij/Makefile 2 May 2014 11:37:10 -0000
@@ -9,7 +9,7 @@ DISTNAME= ideaIC-${V}
PKGNAME= intellij-${V}
CATEGORIES= devel
-REVISION= 3
+REVISION= 4
HOMEPAGE= http://www.jetbrains.com/idea/
@@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= http://download.jetbrains.com/idea/
MODULES= java
-MODJAVA_VER= 1.6
+MODJAVA_VER= 1.7
BUILD_DEPENDS= ${MODJAVA_RUN_DEPENDS}
Index: devel/jakarta-servletapi/Makefile
===================================================================
RCS file: /cvs/ports/devel/jakarta-servletapi/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- devel/jakarta-servletapi/Makefile 11 Mar 2013 10:50:09 -0000 1.24
+++ devel/jakarta-servletapi/Makefile 2 May 2014 11:37:10 -0000
@@ -4,7 +4,7 @@ COMMENT= implementation of the JSP and J
V= 3.2.4
DISTNAME= jakarta-servletapi-${V}
-REVISION= 13
+REVISION= 14
CATEGORIES= www devel
MASTER_SITES= http://archive.apache.org/dist/jakarta/tomcat-3/archive/v${V}/bin/
EXTRACT_SUFX= .zip
Index: devel/jdk/Makefile
===================================================================
RCS file: /cvs/ports/devel/jdk/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- devel/jdk/Makefile 7 Oct 2011 13:54:31 -0000 1.24
+++ devel/jdk/Makefile 2 May 2014 11:37:10 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.24 2011/10/07 13:54:31 kurt Exp $
SUBDIR =
-SUBDIR += 1.6
SUBDIR += 1.7
.include <bsd.port.subdir.mk>
Index: devel/jdk/java.port.mk
===================================================================
RCS file: /cvs/ports/devel/jdk/java.port.mk,v
retrieving revision 1.32
diff -u -p -r1.32 java.port.mk
--- devel/jdk/java.port.mk 2 Jul 2013 10:36:35 -0000 1.32
+++ devel/jdk/java.port.mk 2 May 2014 11:37:10 -0000
@@ -33,34 +33,18 @@ MODJAVA_JRERUN?=no
# default JAVA_HOME or JAVACMD vars for a package.
#
-.if ${MODJAVA_VER} == "1.3" || ${MODJAVA_VER} == "1.4" || ${MODJAVA_VER} == "1.5"
+.if ${MODJAVA_VER} == "1.3" || ${MODJAVA_VER} == "1.4" || ${MODJAVA_VER} == "1.5" || ${MODJAVA_VER} == "1.6"
BROKEN=MODJAVA_VER=${MODJAVA_VER} only ports are not supported
-.elif ${MODJAVA_VER} == "1.3+" || ${MODJAVA_VER} == "1.4+" || ${MODJAVA_VER} == "1.5+"
+.elif ${MODJAVA_VER} == "1.3+" || ${MODJAVA_VER} == "1.4+" || ${MODJAVA_VER} == "1.5+" || ${MODJAVA_VER} == "1.6+"
ONLY_FOR_ARCHS?= i386 amd64
. if ${NO_BUILD:L} != "yes"
- JAVA_HOME= ${LOCALBASE}/jdk-1.6.0
- BUILD_DEPENDS+= jdk->=1.6.0,<1.7:devel/jdk/1.6
-. endif
-. if ${MODJAVA_JRERUN:L} == "yes"
- MODJAVA_RUN_DEPENDS= jdk->=1.6.0|jre->=1.6.0|jamvm-*:devel/jdk/1.6
-. else
- MODJAVA_RUN_DEPENDS= jdk->=1.6.0:devel/jdk/1.6
-. endif
-.elif ${MODJAVA_VER:S/+//} == "1.6"
- ONLY_FOR_ARCHS?= i386 amd64
-. if ${NO_BUILD:L} != "yes"
- JAVA_HOME= ${LOCALBASE}/jdk-1.6.0
- BUILD_DEPENDS+= jdk->=1.6.0,<1.7:devel/jdk/1.6
+ JAVA_HOME= ${LOCALBASE}/jdk-1.7.0
+ BUILD_DEPENDS+= jdk->=1.7.0,<1.8v0:devel/jdk/1.7
. endif
. if ${MODJAVA_JRERUN:L} == "yes"
- _MODJAVA_RUNDEP= jdk->=1.6.0,<1.7|jre->=1.6.0,<1.7
-. else
- _MODJAVA_RUNDEP= jdk->=1.6.0,<1.7
-. endif
-. if ${MODJAVA_VER} == "1.6+"
- MODJAVA_RUN_DEPENDS= ${_MODJAVA_RUNDEP:S/,<1.7//g}:devel/jdk/1.6
+ MODJAVA_RUN_DEPENDS= jdk->=1.7.0|jre->=1.7.0:devel/jdk/1.7
. else
- MODJAVA_RUN_DEPENDS= ${_MODJAVA_RUNDEP}:devel/jdk/1.6
+ MODJAVA_RUN_DEPENDS= jdk->=1.7.0:devel/jdk/1.7
. endif
.elif ${MODJAVA_VER:S/+//} == "1.7"
ONLY_FOR_ARCHS?= i386 amd64
Index: devel/jenkins/devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/jenkins/devel/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- devel/jenkins/devel/Makefile 10 Feb 2014 19:26:25 -0000 1.10
+++ devel/jenkins/devel/Makefile 2 May 2014 11:37:11 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.10 2014/02/10 19:26:25 jasper Exp $
VERSION = 1.549
-REVISION = 0
+REVISION = 1
MASTER_SITES = http://mirrors.jenkins-ci.org/war/${VERSION}/
DIST_SUBDIR = jenkins-devel
Index: devel/jenkins/stable/Makefile
===================================================================
RCS file: /cvs/ports/devel/jenkins/stable/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- devel/jenkins/stable/Makefile 10 Feb 2014 19:26:25 -0000 1.8
+++ devel/jenkins/stable/Makefile 2 May 2014 11:37:11 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.8 2014/02/10 19:26:25 jasper Exp $
VERSION = 1.509.4
-REVISION = 2
+REVISION = 3
MASTER_SITES = http://mirrors.jenkins-ci.org/war-stable/${VERSION}/
DIST_SUBDIR = jenkins-stable
Index: devel/maven/Makefile
===================================================================
RCS file: /cvs/ports/devel/maven/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- devel/maven/Makefile 11 Mar 2013 10:50:11 -0000 1.21
+++ devel/maven/Makefile 2 May 2014 11:37:13 -0000
@@ -6,7 +6,7 @@ V= 3.0.5
DISTNAME= apache-maven-$V
PKGNAME= ${DISTNAME:S/apache-//}
CATEGORIES= devel
-REVISION= 0
+REVISION= 1
HOMEPAGE= http://maven.apache.org/
Index: devel/netbeans/Makefile
===================================================================
RCS file: /cvs/ports/devel/netbeans/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- devel/netbeans/Makefile 10 May 2013 20:30:31 -0000 1.25
+++ devel/netbeans/Makefile 2 May 2014 11:37:13 -0000
@@ -7,7 +7,7 @@ COMMENT= NetBeans Java IDE
V= 6.9.1
DISTNAME= netbeans-${V}
CATEGORIES= devel
-REVISION= 4
+REVISION= 5
HOMEPAGE= http://www.netbeans.org/
Index: editors/libreoffice/Makefile
===================================================================
RCS file: /cvs/ports/editors/libreoffice/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- editors/libreoffice/Makefile 26 Mar 2014 07:27:17 -0000 1.106
+++ editors/libreoffice/Makefile 2 May 2014 11:37:28 -0000
@@ -16,6 +16,7 @@ PKGNAME-kde= libreoffice-kde-${VERSION}
PKGNAME-java= libreoffice-java-${VERSION}
CATEGORIES= editors productivity
DPB_PROPERTIES= parallel tag:kde3
+REVISION-java= 0
EPOCH= 0
Index: geo/jeoip/Makefile
===================================================================
RCS file: /cvs/ports/geo/jeoip/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- geo/jeoip/Makefile 2 Jul 2013 10:36:35 -0000 1.23
+++ geo/jeoip/Makefile 2 May 2014 11:37:34 -0000
@@ -2,7 +2,7 @@
COMMENT= Java interface to GeoIP database
DISTNAME= jeoip-0.5
-REVISION= 11
+REVISION= 12
CATEGORIES= geo net
PKG_ARCH= *
Index: geo/josm/Makefile
===================================================================
RCS file: /cvs/ports/geo/josm/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- geo/josm/Makefile 20 Apr 2014 08:04:10 -0000 1.24
+++ geo/josm/Makefile 2 May 2014 11:37:34 -0000
@@ -7,6 +7,7 @@ DISTNAME= josm-snapshot-${SVN_REV}
EXTRACT_SUFX = .jar
EXTRACT_CASES+= *.jar) unzip -qa ${FULLDISTDIR}/$$archive -d ${WRKDIST};;
PKGNAME= josm-${SVN_REV}
+REVISION= 0
PKG_ARCH= *
Index: graphics/opencv/Makefile
===================================================================
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- graphics/opencv/Makefile 25 Nov 2013 14:16:23 -0000 1.23
+++ graphics/opencv/Makefile 2 May 2014 11:37:37 -0000
@@ -16,6 +16,8 @@ PKGNAME-main = ${PKGNAME}
PKGNAME-docs = opencv-docs-$V
PKGNAME-java = opencv-java-$V
+REVISION-java= 0
+
HOMEPAGE = http://www.opencv.org/
MAINTAINER = Rafael Sadowski <raf...@sizeofvoid.org>
Index: java/asm/Makefile
===================================================================
RCS file: /cvs/ports/java/asm/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- java/asm/Makefile 2 Jul 2013 10:36:35 -0000 1.3
+++ java/asm/Makefile 2 May 2014 11:37:39 -0000
@@ -5,6 +5,7 @@ COMMENT= Java bytecode manipulation fram
V= 3.3.1
DISTNAME= asm-$V
CATEGORIES= java devel
+REVISION= 0
HOMEPAGE= http://asm.ow2.org/
Index: java/asm/pkg/PLIST
===================================================================
RCS file: /cvs/ports/java/asm/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- java/asm/pkg/PLIST 21 Sep 2011 13:38:21 -0000 1.1.1.1
+++ java/asm/pkg/PLIST 2 May 2014 11:37:40 -0000
@@ -262,7 +262,10 @@ share/java/asm/doc/javadoc/user/overview
share/java/asm/doc/javadoc/user/overview-tree.html
share/java/asm/doc/javadoc/user/package-list
share/java/asm/doc/javadoc/user/resources/
-share/java/asm/doc/javadoc/user/resources/inherit.gif
+share/java/asm/doc/javadoc/user/resources/background.gif
+share/java/asm/doc/javadoc/user/resources/tab.gif
+share/java/asm/doc/javadoc/user/resources/titlebar.gif
+share/java/asm/doc/javadoc/user/resources/titlebar_end.gif
share/java/asm/doc/javadoc/user/serialized-form.html
share/java/asm/doc/javadoc/user/stylesheet.css
share/java/asm/examples/
Index: java/jBCrypt/Makefile
===================================================================
RCS file: /cvs/ports/java/jBCrypt/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- java/jBCrypt/Makefile 11 Mar 2013 11:12:34 -0000 1.3
+++ java/jBCrypt/Makefile 2 May 2014 11:37:40 -0000
@@ -3,7 +3,7 @@
COMMENT= BCrypt library for Java
DISTNAME= jBCrypt-0.3
-REVISION= 0
+REVISION= 1
CATEGORIES= security
Index: java/java-getopt/Makefile
===================================================================
RCS file: /cvs/ports/java/java-getopt/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- java/java-getopt/Makefile 11 Mar 2013 11:12:34 -0000 1.5
+++ java/java-getopt/Makefile 2 May 2014 11:37:40 -0000
@@ -3,7 +3,7 @@
COMMENT= Java port of GNU getopt family functions
DISTNAME= java-getopt-1.0.13
-REVISION= 2
+REVISION= 3
CATEGORIES= devel
HOMEPAGE= http://www.urbanophile.com/arenn/hacking/download.html
Index: java/java-getopt/pkg/PLIST
===================================================================
RCS file: /cvs/ports/java/java-getopt/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- java/java-getopt/pkg/PLIST 1 Sep 2011 08:06:28 -0000 1.2
+++ java/java-getopt/pkg/PLIST 2 May 2014 11:37:40 -0000
@@ -21,5 +21,8 @@ share/java/doc/getopt/index.html
share/java/doc/getopt/overview-tree.html
share/java/doc/getopt/package-list
share/java/doc/getopt/resources/
-share/java/doc/getopt/resources/inherit.gif
+share/java/doc/getopt/resources/background.gif
+share/java/doc/getopt/resources/tab.gif
+share/java/doc/getopt/resources/titlebar.gif
+share/java/doc/getopt/resources/titlebar_end.gif
share/java/doc/getopt/stylesheet.css
Index: java/jna/Makefile
===================================================================
RCS file: /cvs/ports/java/jna/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- java/jna/Makefile 17 Mar 2013 14:02:11 -0000 1.12
+++ java/jna/Makefile 2 May 2014 11:37:40 -0000
@@ -7,7 +7,7 @@ DISTNAME= jna-$V-a31faf3026
PKGNAME= jna-$V
EXTRACT_SUFX= .zip
CATEGORIES= devel
-REVISION= 0
+REVISION= 1
MAINTAINER= Jasper Lievisse Adriaanse <jas...@openbsd.org>
Index: java/junit/Makefile
===================================================================
RCS file: /cvs/ports/java/junit/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- java/junit/Makefile 11 Mar 2013 11:12:34 -0000 1.27
+++ java/junit/Makefile 2 May 2014 11:37:40 -0000
@@ -4,7 +4,7 @@ COMMENT= regression testing utility for
VERSION= 4.9
DISTNAME= junit${VERSION}
-REVISION= 0
+REVISION= 1
PKGNAME= junit-${VERSION}
CATEGORIES= devel
Index: java/tanukiwrapper/Makefile
===================================================================
RCS file: /cvs/ports/java/tanukiwrapper/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- java/tanukiwrapper/Makefile 8 Dec 2013 16:35:17 -0000 1.2
+++ java/tanukiwrapper/Makefile 2 May 2014 11:37:40 -0000
@@ -7,7 +7,7 @@ COMMENT= Tanuki Java Service Wrapper
SVN_REV= 1780
DISTNAME= wrapper-code-${SVN_REV}-trunk
PKGNAME= java-tanukiwrapper-3.5.19.1
-REVISION= 0
+REVISION= 1
CATEGORIES= java
HOMEPAGE= http://wrapper.tanukisoftware.com/
Index: lang/abcl/Makefile
===================================================================
RCS file: /cvs/ports/lang/abcl/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- lang/abcl/Makefile 9 Mar 2014 19:52:27 -0000 1.3
+++ lang/abcl/Makefile 2 May 2014 11:37:40 -0000
@@ -5,7 +5,7 @@ COMMENT = Common Lisp dialect for the J
V = 1.1.1
DISTNAME = abcl-src-${V}
PKGNAME = abcl-${V}
-REVISION = 0
+REVISION = 1
PKG_ARCH = *
CATEGORIES = lang
Index: lang/clojure/Makefile
===================================================================
RCS file: /cvs/ports/lang/clojure/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- lang/clojure/Makefile 30 Mar 2014 21:08:24 -0000 1.21
+++ lang/clojure/Makefile 2 May 2014 11:37:40 -0000
@@ -4,7 +4,7 @@ COMMENT = Lisp-1 dialect for the Java V
VER = 1.6.0
DISTNAME = clojure-${VER}
-REVISION = 0
+REVISION = 1
PKG_ARCH = *
Index: lang/kawa/Makefile
===================================================================
RCS file: /cvs/ports/lang/kawa/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- lang/kawa/Makefile 25 Nov 2013 14:16:23 -0000 1.6
+++ lang/kawa/Makefile 2 May 2014 11:37:41 -0000
@@ -5,7 +5,7 @@ BROKEN-i386= java
COMMENT= Scheme and language framework for the Java platform
DISTNAME= kawa-1.13
-REVISION= 1
+REVISION= 2
CATEGORIES= lang java
HOMEPAGE= https://www.gnu.org/software/kawa/
Index: lang/processing/Makefile
===================================================================
RCS file: /cvs/ports/lang/processing/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- lang/processing/Makefile 20 Jan 2014 13:17:28 -0000 1.9
+++ lang/processing/Makefile 2 May 2014 11:37:41 -0000
@@ -7,7 +7,7 @@ COMMENT= language/IDE for images, anima
V= 1.5.1
DISTNAME= processing-$V-linux
PKGNAME= ${DISTNAME:S/-linux//}
-REVISION= 4
+REVISION= 5
CATEGORIES= lang graphics
Index: lang/scala/Makefile
===================================================================
RCS file: /cvs/ports/lang/scala/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- lang/scala/Makefile 29 May 2013 16:56:28 -0000 1.7
+++ lang/scala/Makefile 2 May 2014 11:37:42 -0000
@@ -4,6 +4,7 @@ COMMENT= general purpose multi-paradigm
DISTNAME= scala-2.10.1
CATEGORIES= lang
+REVISION= 0
HOMEPAGE= http://www.scala-lang.org/
Index: net/apache-activemq/Makefile
===================================================================
RCS file: /cvs/ports/net/apache-activemq/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- net/apache-activemq/Makefile 24 Dec 2013 22:31:26 -0000 1.12
+++ net/apache-activemq/Makefile 2 May 2014 11:37:53 -0000
@@ -6,6 +6,7 @@ COMMENT= open source message broker impl
V= 5.9.0
DISTNAME= apache-activemq-$V
+REVISION= 0
CATEGORIES= net
Index: net/unifi/Makefile
===================================================================
RCS file: /cvs/ports/net/unifi/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- net/unifi/Makefile 18 Apr 2014 22:01:22 -0000 1.2
+++ net/unifi/Makefile 2 May 2014 11:38:04 -0000
@@ -4,7 +4,7 @@ COMMENT= Ubiquiti uniFi wireless control
DISTFILES= unifi-$V{UniFi.unix}.zip
V= 3.1.10
-REVISION= 0
+REVISION= 1
PKGNAME= unifi-$V
CATEGORIES= net
Index: productivity/projectlibre/Makefile
===================================================================
RCS file: /cvs/ports/productivity/projectlibre/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- productivity/projectlibre/Makefile 6 Dec 2013 20:36:05 -0000 1.3
+++ productivity/projectlibre/Makefile 2 May 2014 11:38:08 -0000
@@ -4,6 +4,7 @@ COMMENT= open source alternative to Mic
DISTNAME= projectlibre-1.5.7
CATEGORIES= productivity
+REVISION= 0
MAINTAINER= Jasper Lievisse Adriaanse <jas...@openbsd.org>
Index: productivity/thinkingrock/Makefile
===================================================================
RCS file: /cvs/ports/productivity/thinkingrock/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- productivity/thinkingrock/Makefile 11 Mar 2013 11:37:55 -0000 1.15
+++ productivity/thinkingrock/Makefile 2 May 2014 11:38:09 -0000
@@ -5,7 +5,7 @@ COMMENT= collecting and processing thoug
V= 2.2.1
DISTNAME= tr-$V
PKGNAME= thinkingrock-${V}
-REVISION= 2
+REVISION= 3
CATEGORIES= productivity
HOMEPAGE= http://www.trgtd.com.au/
Index: textproc/link-grammar/Makefile
===================================================================
RCS file: /cvs/ports/textproc/link-grammar/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- textproc/link-grammar/Makefile 30 Apr 2014 10:54:32 -0000 1.4
+++ textproc/link-grammar/Makefile 2 May 2014 11:38:21 -0000
@@ -7,6 +7,7 @@ VERSION = 5.0.7
DISTNAME = link-grammar-${VERSION}
PKGNAME-main = ${DISTNAME}
PKGNAME-java = link-grammar-java-${VERSION}
+REVISION-java = 0
SHARED_LIBS += link-grammar 1.0 # 5.5
SHARED_LIBS += link-grammar-java 1.0 # 5.5
Index: textproc/stringtemplate/Makefile
===================================================================
RCS file: /cvs/ports/textproc/stringtemplate/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- textproc/stringtemplate/Makefile 11 Mar 2013 11:42:47 -0000 1.5
+++ textproc/stringtemplate/Makefile 2 May 2014 11:38:25 -0000
@@ -4,7 +4,7 @@ COMMENT= Java template engine for genera
V= 4.0.4
DISTNAME= ST-$V
-REVISION= 0
+REVISION= 1
PKGNAME= stringtemplate-$V
CATEGORIES= textproc java
Index: textproc/xerces/Makefile
===================================================================
RCS file: /cvs/ports/textproc/xerces/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- textproc/xerces/Makefile 11 Mar 2013 11:42:47 -0000 1.39
+++ textproc/xerces/Makefile 2 May 2014 11:38:26 -0000
@@ -5,7 +5,7 @@ COMMENT= xml parser for Java
V= 2.9.1
DISTNAME= Xerces-J-bin.${V}
PKGNAME= xerces-${V}
-REVISION = 8
+REVISION = 9
CATEGORIES= textproc
HOMEPAGE= http://xml.apache.org/xerces2-j/index.html
Index: www/tomcat/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/tomcat/Makefile.inc,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.inc
--- www/tomcat/Makefile.inc 30 Oct 2013 15:35:22 -0000 1.5
+++ www/tomcat/Makefile.inc 2 May 2014 11:38:36 -0000
@@ -7,6 +7,7 @@ VER = ${MAJ_VER}.${MIN_VER}.${MICRO_VER
DISTNAME = apache-tomcat-${VER}
PKGNAME-main = tomcat-${VER}
PKGNAME-examples =tomcat-examples-${VER}
+REVISION = 0
CATEGORIES = www
Index: x11/kde4/kross-interpreters/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/kross-interpreters/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- x11/kde4/kross-interpreters/Makefile 20 Apr 2014 16:41:39 -0000 1.6
+++ x11/kde4/kross-interpreters/Makefile 2 May 2014 11:38:47 -0000
@@ -5,6 +5,7 @@ COMMENT-java = KDE Java bindings
DISTNAME = kross-interpreters-${MODKDE4_VERSION}
PKGNAME-main = ${PKGNAME}
PKGNAME-java = ${PKGNAME:C/interpreters/java/}
+REVISION-java = 0
MULTI_PACKAGES = -main -java
