aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/jdk13/Makefile11
-rw-r--r--java/jdk13/files/patch-..::ext::plugin::build::solaris::GNUmakefile14
-rw-r--r--java/jdk13/pkg-plist2
-rw-r--r--java/jdk14/Makefile11
-rw-r--r--java/jdk14/files/patch-..::ext::plugin::build::solaris::GNUmakefile14
-rw-r--r--java/jdk14/pkg-plist2
-rw-r--r--java/jdk15/Makefile11
-rw-r--r--java/jdk15/files/patch-..::ext::plugin::build::solaris::GNUmakefile14
-rw-r--r--java/jdk15/pkg-plist2
-rw-r--r--java/jdk16/Makefile11
-rw-r--r--java/jdk16/files/patch-..::ext::plugin::build::solaris::GNUmakefile14
-rw-r--r--java/jdk16/pkg-plist2
12 files changed, 92 insertions, 16 deletions
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index 72c253daa0c0..65a475714caa 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@@ -109,6 +109,13 @@ pre-patch:
${MKDIR} -p hotspot1.3.1/src/os_cpu/bsd_i486/vm && \
${PATCH} < ${WRKDIR}/jdk131.patches
+post-build:
+ # Prune empty dirs
+ ${FIND} ${JDKIMAGEDIR} -type d | /usr/bin/sort -r | \
+ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
+ ${FIND} ${JDKIMAGEDIR_G} -type d | /usr/bin/sort -r | \
+ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
+
.if !defined(NODEBUG)
pre-install:
@${ECHO_MSG}
@@ -127,7 +134,7 @@ do-install:
.endif
post-install:
- ${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
+ @${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
.if !defined(WITHOUT_PLUGIN)
@${ECHO_MSG}
@${ECHO_MSG} The use the Java plugin with Mozilla you must create a
diff --git a/java/jdk13/files/patch-..::ext::plugin::build::solaris::GNUmakefile b/java/jdk13/files/patch-..::ext::plugin::build::solaris::GNUmakefile
new file mode 100644
index 000000000000..3f6876b47f3b
--- /dev/null
+++ b/java/jdk13/files/patch-..::ext::plugin::build::solaris::GNUmakefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ../ext/plugin/build/solaris/GNUmakefile 2002/03/13 13:35:23 1.1
++++ ../ext/plugin/build/solaris/GNUmakefile 2002/03/13 13:36:33
+@@ -645,7 +645,7 @@
+ $(PLUGIN_OJI): $(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
+ export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
+ $(GCC) $(GCCPIC) $(GCCLD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) \
+- $(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
++ $(NAVIG5_OFILES) $(COMMON_OFILES_GNU) -L$(X11_LIB) -lXt
+
+ clean clobber::
+ /bin/rm -f -r $(TMP_DIR) $(OUTPUT_DIR)/plugin
diff --git a/java/jdk13/pkg-plist b/java/jdk13/pkg-plist
index 24a647f4622f..9f4e1ea946e3 100644
--- a/java/jdk13/pkg-plist
+++ b/java/jdk13/pkg-plist
@@ -960,10 +960,8 @@ jdk%%JDK_VERSION%%/src.jar
@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/classic
@dirrm jdk%%JDK_VERSION%%/jre/lib/i386
@dirrm jdk%%JDK_VERSION%%/jre/lib/fonts
-@dirrm jdk%%JDK_VERSION%%/jre/lib/ext
@dirrm jdk%%JDK_VERSION%%/jre/lib/cmm
@dirrm jdk%%JDK_VERSION%%/jre/lib/audio
-@dirrm jdk%%JDK_VERSION%%/jre/lib/applet
@dirrm jdk%%JDK_VERSION%%/jre/lib
@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/native_threads
@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/green_threads
diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile
index 72c253daa0c0..65a475714caa 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@@ -109,6 +109,13 @@ pre-patch:
${MKDIR} -p hotspot1.3.1/src/os_cpu/bsd_i486/vm && \
${PATCH} < ${WRKDIR}/jdk131.patches
+post-build:
+ # Prune empty dirs
+ ${FIND} ${JDKIMAGEDIR} -type d | /usr/bin/sort -r | \
+ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
+ ${FIND} ${JDKIMAGEDIR_G} -type d | /usr/bin/sort -r | \
+ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
+
.if !defined(NODEBUG)
pre-install:
@${ECHO_MSG}
@@ -127,7 +134,7 @@ do-install:
.endif
post-install:
- ${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
+ @${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
.if !defined(WITHOUT_PLUGIN)
@${ECHO_MSG}
@${ECHO_MSG} The use the Java plugin with Mozilla you must create a
diff --git a/java/jdk14/files/patch-..::ext::plugin::build::solaris::GNUmakefile b/java/jdk14/files/patch-..::ext::plugin::build::solaris::GNUmakefile
new file mode 100644
index 000000000000..3f6876b47f3b
--- /dev/null
+++ b/java/jdk14/files/patch-..::ext::plugin::build::solaris::GNUmakefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ../ext/plugin/build/solaris/GNUmakefile 2002/03/13 13:35:23 1.1
++++ ../ext/plugin/build/solaris/GNUmakefile 2002/03/13 13:36:33
+@@ -645,7 +645,7 @@
+ $(PLUGIN_OJI): $(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
+ export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
+ $(GCC) $(GCCPIC) $(GCCLD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) \
+- $(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
++ $(NAVIG5_OFILES) $(COMMON_OFILES_GNU) -L$(X11_LIB) -lXt
+
+ clean clobber::
+ /bin/rm -f -r $(TMP_DIR) $(OUTPUT_DIR)/plugin
diff --git a/java/jdk14/pkg-plist b/java/jdk14/pkg-plist
index 24a647f4622f..9f4e1ea946e3 100644
--- a/java/jdk14/pkg-plist
+++ b/java/jdk14/pkg-plist
@@ -960,10 +960,8 @@ jdk%%JDK_VERSION%%/src.jar
@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/classic
@dirrm jdk%%JDK_VERSION%%/jre/lib/i386
@dirrm jdk%%JDK_VERSION%%/jre/lib/fonts
-@dirrm jdk%%JDK_VERSION%%/jre/lib/ext
@dirrm jdk%%JDK_VERSION%%/jre/lib/cmm
@dirrm jdk%%JDK_VERSION%%/jre/lib/audio
-@dirrm jdk%%JDK_VERSION%%/jre/lib/applet
@dirrm jdk%%JDK_VERSION%%/jre/lib
@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/native_threads
@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/green_threads
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 72c253daa0c0..65a475714caa 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@@ -109,6 +109,13 @@ pre-patch:
${MKDIR} -p hotspot1.3.1/src/os_cpu/bsd_i486/vm && \
${PATCH} < ${WRKDIR}/jdk131.patches
+post-build:
+ # Prune empty dirs
+ ${FIND} ${JDKIMAGEDIR} -type d | /usr/bin/sort -r | \
+ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
+ ${FIND} ${JDKIMAGEDIR_G} -type d | /usr/bin/sort -r | \
+ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
+
.if !defined(NODEBUG)
pre-install:
@${ECHO_MSG}
@@ -127,7 +134,7 @@ do-install:
.endif
post-install:
- ${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
+ @${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
.if !defined(WITHOUT_PLUGIN)
@${ECHO_MSG}
@${ECHO_MSG} The use the Java plugin with Mozilla you must create a
diff --git a/java/jdk15/files/patch-..::ext::plugin::build::solaris::GNUmakefile b/java/jdk15/files/patch-..::ext::plugin::build::solaris::GNUmakefile
new file mode 100644
index 000000000000..3f6876b47f3b
--- /dev/null
+++ b/java/jdk15/files/patch-..::ext::plugin::build::solaris::GNUmakefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ../ext/plugin/build/solaris/GNUmakefile 2002/03/13 13:35:23 1.1
++++ ../ext/plugin/build/solaris/GNUmakefile 2002/03/13 13:36:33
+@@ -645,7 +645,7 @@
+ $(PLUGIN_OJI): $(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
+ export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
+ $(GCC) $(GCCPIC) $(GCCLD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) \
+- $(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
++ $(NAVIG5_OFILES) $(COMMON_OFILES_GNU) -L$(X11_LIB) -lXt
+
+ clean clobber::
+ /bin/rm -f -r $(TMP_DIR) $(OUTPUT_DIR)/plugin
diff --git a/java/jdk15/pkg-plist b/java/jdk15/pkg-plist
index 24a647f4622f..9f4e1ea946e3 100644
--- a/java/jdk15/pkg-plist
+++ b/java/jdk15/pkg-plist
@@ -960,10 +960,8 @@ jdk%%JDK_VERSION%%/src.jar
@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/classic
@dirrm jdk%%JDK_VERSION%%/jre/lib/i386
@dirrm jdk%%JDK_VERSION%%/jre/lib/fonts
-@dirrm jdk%%JDK_VERSION%%/jre/lib/ext
@dirrm jdk%%JDK_VERSION%%/jre/lib/cmm
@dirrm jdk%%JDK_VERSION%%/jre/lib/audio
-@dirrm jdk%%JDK_VERSION%%/jre/lib/applet
@dirrm jdk%%JDK_VERSION%%/jre/lib
@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/native_threads
@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/green_threads
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 72c253daa0c0..65a475714caa 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@@ -109,6 +109,13 @@ pre-patch:
${MKDIR} -p hotspot1.3.1/src/os_cpu/bsd_i486/vm && \
${PATCH} < ${WRKDIR}/jdk131.patches
+post-build:
+ # Prune empty dirs
+ ${FIND} ${JDKIMAGEDIR} -type d | /usr/bin/sort -r | \
+ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
+ ${FIND} ${JDKIMAGEDIR_G} -type d | /usr/bin/sort -r | \
+ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
+
.if !defined(NODEBUG)
pre-install:
@${ECHO_MSG}
@@ -127,7 +134,7 @@ do-install:
.endif
post-install:
- ${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
+ @${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
.if !defined(WITHOUT_PLUGIN)
@${ECHO_MSG}
@${ECHO_MSG} The use the Java plugin with Mozilla you must create a
diff --git a/java/jdk16/files/patch-..::ext::plugin::build::solaris::GNUmakefile b/java/jdk16/files/patch-..::ext::plugin::build::solaris::GNUmakefile
new file mode 100644
index 000000000000..3f6876b47f3b
--- /dev/null
+++ b/java/jdk16/files/patch-..::ext::plugin::build::solaris::GNUmakefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ../ext/plugin/build/solaris/GNUmakefile 2002/03/13 13:35:23 1.1
++++ ../ext/plugin/build/solaris/GNUmakefile 2002/03/13 13:36:33
+@@ -645,7 +645,7 @@
+ $(PLUGIN_OJI): $(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
+ export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
+ $(GCC) $(GCCPIC) $(GCCLD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) \
+- $(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
++ $(NAVIG5_OFILES) $(COMMON_OFILES_GNU) -L$(X11_LIB) -lXt
+
+ clean clobber::
+ /bin/rm -f -r $(TMP_DIR) $(OUTPUT_DIR)/plugin
diff --git a/java/jdk16/pkg-plist b/java/jdk16/pkg-plist
index 24a647f4622f..9f4e1ea946e3 100644
--- a/java/jdk16/pkg-plist
+++ b/java/jdk16/pkg-plist
@@ -960,10 +960,8 @@ jdk%%JDK_VERSION%%/src.jar
@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/classic
@dirrm jdk%%JDK_VERSION%%/jre/lib/i386
@dirrm jdk%%JDK_VERSION%%/jre/lib/fonts
-@dirrm jdk%%JDK_VERSION%%/jre/lib/ext
@dirrm jdk%%JDK_VERSION%%/jre/lib/cmm
@dirrm jdk%%JDK_VERSION%%/jre/lib/audio
-@dirrm jdk%%JDK_VERSION%%/jre/lib/applet
@dirrm jdk%%JDK_VERSION%%/jre/lib
@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/native_threads
@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/green_threads
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 19:41:55 +0000