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

- Unlink jdk/1.6 and make jdk/1.7 the default jdk for all java ports

Browse Source 
- Adjust java.port.mk and cmake to use 1.7
- Adjust jdk/1.7 for pkg_add upgrades
okay sthen@, jasper@, ajacoutot@
This commit is contained in:
kurt 2014-05-07 15:42:15 +00:00
parent 5b3630e3ae
commit 46f312eaef
49 changed files with 127 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/architect/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2013/08/07 21:31:21 naddy Exp $
# $OpenBSD: Makefile,v 1.19 2014/05/07 15:42:15 kurt Exp $
PKG_ARCH= *
@ -11,7 +11,7 @@ PKGNAME= architect-${V}
CATEGORIES= databases
WRKDIST= ${WRKDIR}/architect-${V}/
REVISION= 2
REVISION= 3
HOMEPAGE= http://www.sqlpower.ca/page/architect

4
databases/db/v4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.61 2013/07/05 12:03:52 espie Exp $
# $OpenBSD: Makefile,v 1.62 2014/05/07 15:42:15 kurt Exp $
COMMENT-java= Java bindings for Berkeley DB, revision ${REV}
@ -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

4
databases/jxplorer/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.13 2013/03/11 02:52:05 espie Exp $
# $OpenBSD: Makefile,v 1.14 2014/05/07 15:42:15 kurt Exp $
COMMENT= standards compliant LDAP browser
V= 3.2
DISTNAME= JXv${V}deploy
PKGNAME= jxplorer-${V}
REVISION= 8
REVISION= 9
EXTRACT_SUFX= .zip
CATEGORIES= databases net

4
databases/postgresql-jdbc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2013/07/02 10:36:35 espie Exp $
# $OpenBSD: Makefile,v 1.21 2014/05/07 15:42:15 kurt Exp $
COMMENT-main= JDBC Driver for PostgreSQL
COMMENT-docs= API docs for PostgreSQL JDBC Driver
@ -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

7
databases/postgresql-jdbc/pkg/PLIST-docs
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.2 2011/09/06 19:28:36 kili Exp $
@comment $OpenBSD: PLIST-docs,v 1.3 2014/05/07 15:42:15 kurt Exp $
share/doc/postgresql-jdbc/
share/doc/postgresql-jdbc/allclasses-frame.html
share/doc/postgresql-jdbc/allclasses-noframe.html
@ -89,6 +89,9 @@ share/doc/postgresql-jdbc/overview-summary.html
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

3
devel/apache-ant/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.34 2014/03/31 17:24:49 jasper Exp $
# $OpenBSD: Makefile,v 1.35 2014/05/07 15:42:15 kurt Exp $
COMMENT= build tool for java applications
DISTNAME= apache-ant-1.9.3
CATEGORIES= devel
REVISION= 0
HOMEPAGE= http://ant.apache.org/

4
devel/cmake/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.98 2014/04/14 14:02:44 dcoppa Exp $
# $OpenBSD: Makefile,v 1.99 2014/05/07 15:42:15 kurt Exp $
DPB_PROPERTIES =parallel
@ -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 <dcoppa@openbsd.org>

15
devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake
View File

@ -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
$OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.9 2014/05/07 15:42:15 kurt Exp $
--- 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_CMakeDetermineJavaCompiler_cmake,v 1.8 2013/08/16 10:37:
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_CMakeDetermineJavaCompiler_cmake,v 1.8 2013/08/16 10:37:
- /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_CMakeDetermineJavaCompiler_cmake,v 1.8 2013/08/16 10:37:
+ /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

40
devel/cmake/patches/patch-Modules_FindJNI_cmake
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Modules_FindJNI_cmake,v 1.10 2013/08/12 16:09:50 zhuk Exp $
$OpenBSD: patch-Modules_FindJNI_cmake,v 1.11 2014/05/07 15:42:15 kurt 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()

3
devel/commons-io/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2013/04/28 16:34:53 jasper Exp $
# $OpenBSD: Makefile,v 1.8 2014/05/07 15:42:15 kurt Exp $
COMMENT= Java library to assist with developing IO functionality
@ -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/

4
devel/eclipse/sdk/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.75 2013/12/08 08:01:00 landry Exp $
# $OpenBSD: Makefile,v 1.76 2014/05/07 15:42:15 kurt Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= amd64 i386
@ -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}

4
devel/hudson/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.14 2013/03/11 10:50:09 espie Exp $
# $OpenBSD: Makefile,v 1.15 2014/05/07 15:42:15 kurt Exp $
COMMENT = continuous integration server
VERSION = 1.365
# nonsensical versioning, alas.
DISTNAME = hudson
REVISION = 3
REVISION = 4
PKGNAME = hudson-${VERSION}
DIST_SUBDIR = hudson-${VERSION}

6
devel/intellij/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2013/03/11 10:50:09 espie Exp $
# $OpenBSD: Makefile,v 1.18 2014/05/07 15:42:15 kurt Exp $
SHARED_ONLY= Yes
@ -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}

4
devel/jakarta-servletapi/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.24 2013/03/11 10:50:09 espie Exp $
# $OpenBSD: Makefile,v 1.25 2014/05/07 15:42:15 kurt Exp $
COMMENT= implementation of the JSP and Java Servlet APIs
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

6
devel/jdk/1.7/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.69 2014/05/01 00:47:25 kurt Exp $
# $OpenBSD: Makefile,v 1.70 2014/05/07 15:42:15 kurt Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= i386 amd64
@ -11,8 +11,8 @@ B= b13
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}
PKGNAME-jre= jre-${V}
REVISION-main= 0
REVISION-jre= 0
REVISION-main= 1
REVISION-jre= 1
EPOCH= 0
JDK_SRC= openjdk-7u40-fcs-src-b43-26_aug_2013.zip

3
devel/jdk/1.7/pkg/PLIST-jre
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-jre,v 1.12 2014/04/30 13:21:00 kurt Exp $
@comment $OpenBSD: PLIST-jre,v 1.13 2014/05/07 15:42:15 kurt Exp $
@pkgpath devel/jdk/1.6,-jre
@option no-default-conflict
@conflict jre->=1.7,<1.8|jre->=1.7v0,<1.8v0
${JREHOME}/

3
devel/jdk/1.7/pkg/PLIST-main
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.14 2014/04/30 13:21:00 kurt Exp $
@comment $OpenBSD: PLIST-main,v 1.15 2014/05/07 15:42:15 kurt Exp $
@pkgpath devel/jdk/1.6,-jdk
@option no-default-conflict
@conflict jdk->=1.7,<1.8|jdk->=1.7v0,<1.8v0
${JDKHOME}/

3
devel/jdk/Makefile
View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.24 2011/10/07 13:54:31 kurt Exp $
# $OpenBSD: Makefile,v 1.25 2014/05/07 15:42:15 kurt Exp $
SUBDIR =
SUBDIR += 1.6
SUBDIR += 1.7
.include <bsd.port.subdir.mk>

30
devel/jdk/java.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: java.port.mk,v 1.32 2013/07/02 10:36:35 espie Exp $
# $OpenBSD: java.port.mk,v 1.33 2014/05/07 15:42:15 kurt Exp $
# Set MODJAVA_VER to x.y or x.y+ based on the version
# of the jdk needed for the port. x.y means any x.y jdk.
@ -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
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_RUN_DEPENDS= jdk->=1.6.0|jre->=1.6.0|jamvm-*:devel/jdk/1.6
MODJAVA_RUN_DEPENDS= jdk->=1.7.0|jre->=1.7.0:devel/jdk/1.7
. 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
. 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
. 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

4
devel/jenkins/devel/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.10 2014/02/10 19:26:25 jasper Exp $
# $OpenBSD: Makefile,v 1.11 2014/05/07 15:42:15 kurt Exp $
VERSION = 1.549
REVISION = 0
REVISION = 1
MASTER_SITES = http://mirrors.jenkins-ci.org/war/${VERSION}/
DIST_SUBDIR = jenkins-devel

4
devel/jenkins/stable/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.8 2014/02/10 19:26:25 jasper Exp $
# $OpenBSD: Makefile,v 1.9 2014/05/07 15:42:15 kurt Exp $
VERSION = 1.509.4
REVISION = 2
REVISION = 3
MASTER_SITES = http://mirrors.jenkins-ci.org/war-stable/${VERSION}/
DIST_SUBDIR = jenkins-stable

4
devel/maven/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2013/03/11 10:50:11 espie Exp $
# $OpenBSD: Makefile,v 1.22 2014/05/07 15:42:15 kurt Exp $
COMMENT= software project management and comprehension tool
@ -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/

4
devel/netbeans/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2013/05/10 20:30:31 rpe Exp $
# $OpenBSD: Makefile,v 1.26 2014/05/07 15:42:15 kurt Exp $
SHARED_ONLY= Yes
@ -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/

3
editors/libreoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.107 2014/05/07 15:34:08 sthen Exp $
# $OpenBSD: Makefile,v 1.108 2014/05/07 15:42:15 kurt Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -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

4
geo/jeoip/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.23 2013/07/02 10:36:35 espie Exp $
# $OpenBSD: Makefile,v 1.24 2014/05/07 15:42:16 kurt Exp $
COMMENT= Java interface to GeoIP database
DISTNAME= jeoip-0.5
REVISION= 11
REVISION= 12
CATEGORIES= geo net
PKG_ARCH= *

3
geo/josm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2014/04/20 08:04:10 landry Exp $
# $OpenBSD: Makefile,v 1.25 2014/05/07 15:42:16 kurt Exp $
COMMENT= OpenStreetMap map editor
@ -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= *

4
graphics/opencv/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2013/11/25 14:16:23 sthen Exp $
# $OpenBSD: Makefile,v 1.24 2014/05/07 15:42:16 kurt Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
# do not include i386 here until JDK 1.6 issues there are solved
@ -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 <rafael@sizeofvoid.org>

3
java/asm/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.3 2013/07/02 10:36:35 espie Exp $
# $OpenBSD: Makefile,v 1.4 2014/05/07 15:42:16 kurt Exp $
COMMENT= Java bytecode manipulation framework
V= 3.3.1
DISTNAME= asm-$V
CATEGORIES= java devel
REVISION= 0
HOMEPAGE= http://asm.ow2.org/

7
java/asm/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2011/09/21 13:38:21 jasper Exp $
@comment $OpenBSD: PLIST,v 1.2 2014/05/07 15:42:16 kurt Exp $
share/java/
share/java/asm/
share/java/asm/doc/
@ -262,7 +262,10 @@ share/java/asm/doc/javadoc/user/overview-summary.html
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/

4
java/jBCrypt/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2013/03/11 11:12:34 espie Exp $
# $OpenBSD: Makefile,v 1.4 2014/05/07 15:42:16 kurt Exp $
COMMENT= BCrypt library for Java
DISTNAME= jBCrypt-0.3
REVISION= 0
REVISION= 1
CATEGORIES= security

4
java/java-getopt/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2013/03/11 11:12:34 espie Exp $
# $OpenBSD: Makefile,v 1.6 2014/05/07 15:42:16 kurt Exp $
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

7
java/java-getopt/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2011/09/01 08:06:28 jasper Exp $
@comment $OpenBSD: PLIST,v 1.3 2014/05/07 15:42:16 kurt Exp $
share/java/
share/java/classes/
share/java/classes/gnu.getopt.jar
@ -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

4
java/jna/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2013/03/17 14:02:11 kurt Exp $
# $OpenBSD: Makefile,v 1.13 2014/05/07 15:42:16 kurt Exp $
COMMENT= Java Native Access (JNA)
@ -7,7 +7,7 @@ DISTNAME= jna-$V-a31faf3026
PKGNAME= jna-$V
EXTRACT_SUFX= .zip
CATEGORIES= devel
REVISION= 0
REVISION= 1
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>

4
java/junit/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.27 2013/03/11 11:12:34 espie Exp $
# $OpenBSD: Makefile,v 1.28 2014/05/07 15:42:16 kurt Exp $
COMMENT= regression testing utility for use with the Java language
VERSION= 4.9
DISTNAME= junit${VERSION}
REVISION= 0
REVISION= 1
PKGNAME= junit-${VERSION}
CATEGORIES= devel

4
java/tanukiwrapper/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2013/12/08 16:35:17 ian Exp $
# $OpenBSD: Makefile,v 1.3 2014/05/07 15:42:16 kurt Exp $
SHARED_ONLY= Yes
@ -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/

4
lang/abcl/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.3 2014/03/09 19:52:27 jasper Exp $
# $OpenBSD: Makefile,v 1.4 2014/05/07 15:42:16 kurt Exp $
COMMENT = Common Lisp dialect for the Java Virtual Machine
V = 1.1.1
DISTNAME = abcl-src-${V}
PKGNAME = abcl-${V}
REVISION = 0
REVISION = 1
PKG_ARCH = *
CATEGORIES = lang

4
lang/clojure/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.21 2014/03/30 21:08:24 jasper Exp $
# $OpenBSD: Makefile,v 1.22 2014/05/07 15:42:16 kurt Exp $
COMMENT = Lisp-1 dialect for the Java Virtual Machine
VER = 1.6.0
DISTNAME = clojure-${VER}
REVISION = 0
REVISION = 1
PKG_ARCH = *

4
lang/kawa/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.6 2013/11/25 14:16:23 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2014/05/07 15:42:16 kurt Exp $
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/

4
lang/processing/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2014/01/20 13:17:28 jasper Exp $
# $OpenBSD: Makefile,v 1.10 2014/05/07 15:42:16 kurt Exp $
SHARED_ONLY= Yes
@ -7,7 +7,7 @@ COMMENT= language/IDE for images, animations and interactions
V= 1.5.1
DISTNAME= processing-$V-linux
PKGNAME= ${DISTNAME:S/-linux//}
REVISION= 4
REVISION= 5
CATEGORIES= lang graphics

3
lang/scala/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.7 2013/05/29 16:56:28 jasper Exp $
# $OpenBSD: Makefile,v 1.8 2014/05/07 15:42:16 kurt Exp $
COMMENT= general purpose multi-paradigm programming language
DISTNAME= scala-2.10.1
CATEGORIES= lang
REVISION= 0
HOMEPAGE= http://www.scala-lang.org/

3
net/apache-activemq/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2013/12/24 22:31:26 jasper Exp $
# $OpenBSD: Makefile,v 1.13 2014/05/07 15:42:16 kurt Exp $
PKG_ARCH= *
@ -6,6 +6,7 @@ COMMENT= open source message broker implementing JMS 1.1
V= 5.9.0
DISTNAME= apache-activemq-$V
REVISION= 0
CATEGORIES= net

4
net/unifi/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2014/04/18 22:01:22 sthen Exp $
# $OpenBSD: Makefile,v 1.3 2014/05/07 15:42:16 kurt Exp $
COMMENT= Ubiquiti uniFi wireless controller
DISTFILES= unifi-$V{UniFi.unix}.zip
V= 3.1.10
REVISION= 0
REVISION= 1
PKGNAME= unifi-$V
CATEGORIES= net

3
productivity/projectlibre/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.3 2013/12/06 20:36:05 jasper Exp $
# $OpenBSD: Makefile,v 1.4 2014/05/07 15:42:16 kurt Exp $
COMMENT= open source alternative to Microsoft Project
DISTNAME= projectlibre-1.5.7
CATEGORIES= productivity
REVISION= 0
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>

4
productivity/thinkingrock/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.15 2013/03/11 11:37:55 espie Exp $
# $OpenBSD: Makefile,v 1.16 2014/05/07 15:42:16 kurt Exp $
COMMENT= collecting and processing thoughts according to GTD
V= 2.2.1
DISTNAME= tr-$V
PKGNAME= thinkingrock-${V}
REVISION= 2
REVISION= 3
CATEGORIES= productivity
HOMEPAGE= http://www.trgtd.com.au/

3
textproc/link-grammar/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2014/04/30 10:54:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.5 2014/05/07 15:42:16 kurt Exp $
ONLY_FOR_ARCHS-java = i386 amd64
COMMENT-main = syntactic parser of different languages
@ -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

4
textproc/stringtemplate/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2013/03/11 11:42:47 espie Exp $
# $OpenBSD: Makefile,v 1.6 2014/05/07 15:42:16 kurt Exp $
COMMENT= Java template engine for generating source code, etc
V= 4.0.4
DISTNAME= ST-$V
REVISION= 0
REVISION= 1
PKGNAME= stringtemplate-$V
CATEGORIES= textproc java

4
textproc/xerces/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.39 2013/03/11 11:42:47 espie Exp $
# $OpenBSD: Makefile,v 1.40 2014/05/07 15:42:16 kurt Exp $
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

3
www/tomcat/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.5 2013/10/30 15:35:22 dcoppa Exp $
# $OpenBSD: Makefile.inc,v 1.6 2014/05/07 15:42:16 kurt Exp $
COMMENT-main ?= Java servlet and Java server pages server
COMMENT-examples =example applications and full documentation
@ -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

3
x11/kde4/kross-interpreters/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.6 2014/04/20 16:41:39 jasper Exp $
# $OpenBSD: Makefile,v 1.7 2014/05/07 15:42:16 kurt Exp $
COMMENT-main = KDE bindings for running interpreters
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