aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--java/jdk15/Makefile25
-rw-r--r--java/jdk15/files/patch-deploy::controlpanel::sun_java.desktop13
-rw-r--r--java/jdk16/Makefile25
-rw-r--r--java/jdk16/files/patch-deploy::controlpanel::sun_java.desktop13
4 files changed, 70 insertions, 6 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 915f64f0d275..f64a3edc4744 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/communitysource/j2se/java2/download.xml
# http://www.eyesbeyond.com/freebsddom/java/jdk15.html
@@ -29,8 +29,6 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper
WITHOUT_WEB= yes
.endif
-USE_ICONV= yes
-
.if defined(WITHOUT_WEB)
MAKE_ENV+= DONT_BUILD_DEPLOY="YES"
.else
@@ -45,6 +43,7 @@ BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/m
RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/mozilla
MAKE_ENV+= BROWSER=mozilla
.endif
+USE_GNOME= desktopfileutils
MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${X11BASE}/include"
.endif
@@ -104,6 +103,7 @@ EXTRACT_ONLY= ${SCSL_SRCFILE} ${SCSL_BINFILE}
ONLY_FOR_ARCHS= i386 amd64
USE_GMAKE= YES
+USE_ICONV= YES
USE_REINPLACE= YES
RESTRICTED= "Redistribution of pre-compiled binaries is not permitted"
NO_CDROM= "Redistribution of pre-compiled binaries is not permitted"
@@ -125,6 +125,9 @@ ALL_TARGET= all
PLIST_FILES= jdk${JDK_VERSION}/jre/.systemPrefs/.system.lock \
jdk${JDK_VERSION}/jre/.systemPrefs/.systemRootModFile
+.if !defined(WITHOUT_WEB)
+PLIST_FILES+= share/applications/sun_java15.desktop
+.endif
PLIST_DIRS= jdk${JDK_VERSION}/jre/.systemPrefs
.if (${ARCH} == amd64)
@@ -230,6 +233,9 @@ post-patch:
${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \
${WRKSRC}/$${file}; \
done
+ ${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \
+ -e "s:%%JDK_VERSION%%:${JDK_VERSION}:g"\
+ ${WRKSRC}/../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop
.if defined(WITH_LINUX_BOOTSTRAP)
pre-build:
@@ -289,9 +295,16 @@ do-install:
${MKDIR} ${PREFIX}/jdk${JDK_VERSION}
cd ${JDKIMAGEDIR} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
+.if !defined(WITHOUT_WEB)
+ ${INSTALL_DATA} ${JDKIMAGEDIR}/jre/plugin/desktop/sun_java.desktop \
+ ${PREFIX}/share/applications/sun_java15.desktop
+.endif
@${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST}
@${FIND} -s ${JDKIMAGEDIR} -not -type d | \
${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${TMPPLIST}
+.if !defined(WITHOUT_WEB)
+ @${ECHO_MSG} '@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST}
+.endif
.if defined(WITH_DEBUG)
cd ${JDKIMAGEDIR_G} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
@@ -301,10 +314,16 @@ do-install:
@${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \
${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${TMPPLIST}
@${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${TMPPLIST}
+.if !defined(WITHOUT_WEB)
+ @${ECHO_MSG} '@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST}
+.endif
# XXX: put unregistervm into install script ?
post-install:
@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
+.if !defined(WITHOUT_WEB)
+ @-update-desktop-database
+.endif
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.post.mk>
diff --git a/java/jdk15/files/patch-deploy::controlpanel::sun_java.desktop b/java/jdk15/files/patch-deploy::controlpanel::sun_java.desktop
new file mode 100644
index 000000000000..898893707989
--- /dev/null
+++ b/java/jdk15/files/patch-deploy::controlpanel::sun_java.desktop
@@ -0,0 +1,13 @@
+--- ../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop.orig Sat Oct 1 20:14:45 2005
++++ ../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop Sat Oct 1 20:16:12 2005
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Name=Java
+ Comment=Java Control Panel
+-Exec=INSTALL_DIR/JRE_NAME_VERSION/bin/ControlPanel
+-Icon=INSTALL_DIR/JRE_NAME_VERSION/plugin/desktop/sun_java.png
++Exec=%%PREFIX%%/jdk%%JDK_VERSION%%/bin/ControlPanel
++Icon=%%PREFIX%%/jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.png
+ Terminal=0
+ Type=Application
+ Categories=Application;Settings;X-Sun-Supported;X-Red-Hat-Base;
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 915f64f0d275..f64a3edc4744 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/communitysource/j2se/java2/download.xml
# http://www.eyesbeyond.com/freebsddom/java/jdk15.html
@@ -29,8 +29,6 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper
WITHOUT_WEB= yes
.endif
-USE_ICONV= yes
-
.if defined(WITHOUT_WEB)
MAKE_ENV+= DONT_BUILD_DEPLOY="YES"
.else
@@ -45,6 +43,7 @@ BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/m
RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/mozilla
MAKE_ENV+= BROWSER=mozilla
.endif
+USE_GNOME= desktopfileutils
MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${X11BASE}/include"
.endif
@@ -104,6 +103,7 @@ EXTRACT_ONLY= ${SCSL_SRCFILE} ${SCSL_BINFILE}
ONLY_FOR_ARCHS= i386 amd64
USE_GMAKE= YES
+USE_ICONV= YES
USE_REINPLACE= YES
RESTRICTED= "Redistribution of pre-compiled binaries is not permitted"
NO_CDROM= "Redistribution of pre-compiled binaries is not permitted"
@@ -125,6 +125,9 @@ ALL_TARGET= all
PLIST_FILES= jdk${JDK_VERSION}/jre/.systemPrefs/.system.lock \
jdk${JDK_VERSION}/jre/.systemPrefs/.systemRootModFile
+.if !defined(WITHOUT_WEB)
+PLIST_FILES+= share/applications/sun_java15.desktop
+.endif
PLIST_DIRS= jdk${JDK_VERSION}/jre/.systemPrefs
.if (${ARCH} == amd64)
@@ -230,6 +233,9 @@ post-patch:
${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \
${WRKSRC}/$${file}; \
done
+ ${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \
+ -e "s:%%JDK_VERSION%%:${JDK_VERSION}:g"\
+ ${WRKSRC}/../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop
.if defined(WITH_LINUX_BOOTSTRAP)
pre-build:
@@ -289,9 +295,16 @@ do-install:
${MKDIR} ${PREFIX}/jdk${JDK_VERSION}
cd ${JDKIMAGEDIR} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
+.if !defined(WITHOUT_WEB)
+ ${INSTALL_DATA} ${JDKIMAGEDIR}/jre/plugin/desktop/sun_java.desktop \
+ ${PREFIX}/share/applications/sun_java15.desktop
+.endif
@${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST}
@${FIND} -s ${JDKIMAGEDIR} -not -type d | \
${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${TMPPLIST}
+.if !defined(WITHOUT_WEB)
+ @${ECHO_MSG} '@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST}
+.endif
.if defined(WITH_DEBUG)
cd ${JDKIMAGEDIR_G} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
@@ -301,10 +314,16 @@ do-install:
@${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \
${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${TMPPLIST}
@${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${TMPPLIST}
+.if !defined(WITHOUT_WEB)
+ @${ECHO_MSG} '@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST}
+.endif
# XXX: put unregistervm into install script ?
post-install:
@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
+.if !defined(WITHOUT_WEB)
+ @-update-desktop-database
+.endif
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.post.mk>
diff --git a/java/jdk16/files/patch-deploy::controlpanel::sun_java.desktop b/java/jdk16/files/patch-deploy::controlpanel::sun_java.desktop
new file mode 100644
index 000000000000..898893707989
--- /dev/null
+++ b/java/jdk16/files/patch-deploy::controlpanel::sun_java.desktop
@@ -0,0 +1,13 @@
+--- ../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop.orig Sat Oct 1 20:14:45 2005
++++ ../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop Sat Oct 1 20:16:12 2005
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Name=Java
+ Comment=Java Control Panel
+-Exec=INSTALL_DIR/JRE_NAME_VERSION/bin/ControlPanel
+-Icon=INSTALL_DIR/JRE_NAME_VERSION/plugin/desktop/sun_java.png
++Exec=%%PREFIX%%/jdk%%JDK_VERSION%%/bin/ControlPanel
++Icon=%%PREFIX%%/jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.png
+ Terminal=0
+ Type=Application
+ Categories=Application;Settings;X-Sun-Supported;X-Red-Hat-Base;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-20 21:49:48 +0000