Attachment 171537 Details for Bug 210313 – proposed change: @javavm + @sample

[patch] proposed change: @javavm + @sample

java.diff (text/plain), 12.03 KB, created by Baptiste Daroussin on 2016-06-18 08:56:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Baptiste Daroussin

Created: 2016-06-18 08:56:07 UTC

Size: 12.03 KB

patch

obsolete

>Index: Keywords/javavm.ucl
>===================================================================
>--- Keywords/javavm.ucl	(nonexistent)
>+++ Keywords/javavm.ucl	(working copy)
>@@ -0,0 +1,11 @@
>+# $FreeBSD$
>+#
>+# MAINAINER: java@FreeBSD.org
>+
>+actions: []
>+post-install: << EOD
>+    registervm %@
>+EOD
>+pre-deinstall: << EOD
>+    unregistervm %@
>+EOD
>
>Property changes on: Keywords/javavm.ucl
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: Keywords/terminfo.ucl
>===================================================================
>--- Keywords/terminfo.ucl	(revision 417039)
>+++ Keywords/terminfo.ucl	(working copy)
>@@ -3,19 +3,19 @@
> 
> actions: []
> post-install: <<EOD
>-  terminfodir=%D/share/misc
>+  terminfodir=${PKG_ROOTDIR}%D/share/misc
>   terminfodb=${terminfodir}/terminfo.db
>   if [ -e ${terminfodb}.default ] && which -s tic; then
>     cp ${terminfodb}.default ${terminfodb}
>-    find -s ${terminfodir} -name "*.terminfo" -exec tic {} \;
>+    find -s ${terminfodir} -name "*.terminfo" -exec tic -o ${terminfodir} {} \;
>   fi
> EOD
> post-deinstall: <<EOD
>-  terminfodir=%D/share/misc
>+  terminfodir=${PKG_ROOTDIR}%D/share/misc
>   terminfodb=${terminfodir}/terminfo.db
>   if [ -e ${terminfodb}.default ] && which -s tic; then
>     cp ${terminfodb}.default ${terminfodb}
>-    find -s ${terminfodir} -name "*.terminfo" -exec tic {} \;
>+    find -s ${terminfodir} -name "*.terminfo" -exec tic -o ${terminfodir} {} \;
>   else
>     rm -f ${terminfodb}
>   fi
>Index: java/javavmwrapper/Makefile
>===================================================================
>--- java/javavmwrapper/Makefile	(revision 417039)
>+++ java/javavmwrapper/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	javavmwrapper
> PORTVERSION=	2.5
>+PORTREVISION=	1
> CATEGORIES=	java
> MASTER_SITES=	# none
> DISTFILES=	# none
>@@ -13,8 +14,6 @@
> NO_BUILD=	yes
> NO_WRKSUBDIR=	yes
> 
>-PKGINSTALL=	${WRKDIR}/pkg-install
>-
> SRC=		${.CURDIR}/src
> SCRIPTS=	classpath javavmwrapper
> # This is normally defined by bsd.java.mk when USE_JAVA is defined, but
>@@ -27,8 +26,6 @@
> 	       -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|;' \
> 		${SRC}/${_script}.sh >${WRKSRC}/${_script}.sh
> .endfor
>-	${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|;' \
>-		${FILESDIR}/pkg-install.in > ${PKGINSTALL}
> .for _man in checkvms.1 javavm.1 manvm.1 registervm.1 javavm_opts.conf.5 javavms.5
> 	${SED} -e 's|%%PREFIX%%|${PREFIX}|;' \
> 	       -e 's|%%LOCALBASE%%|${LOCALBASE}|;' \
>Index: java/javavmwrapper/files/pkg-install.in
>===================================================================
>--- java/javavmwrapper/files/pkg-install.in	(revision 417039)
>+++ java/javavmwrapper/files/pkg-install.in	(nonexistent)
>@@ -1,36 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: /tmp/pcvs/ports/java/javavmwrapper/files/pkg-install.in,v 1.3 2006-06-03 17:32:24 glewis Exp $
>-
>-LOCALBASE=%%LOCALBASE%%
>-
>-# This script runs during post-install
>-if [ "x${2}" != "xPOST-INSTALL" ]; then
>-    exit 0
>-fi
>-
>-# The option configuration file
>-OPTION_CONF="${PKG_PREFIX}/etc/javavm_opts.conf"
>-
>-# Install default javavm options configuration
>-if [ ! -e "${OPTION_CONF}" ]; then
>-    cp "${OPTION_CONF}.dist" "${OPTION_CONF}"
>-else
>-    echo "${OPTION_CONF} already exists - not installing."
>-    echo "You may need to hand merge changes."
>-fi
>-
>-# Ensure all JDKs and JREs are installed
>-_excl_dirs='bootstrap-openjdk'
>-_find_expr='-depth 2 -regex .*/bin/java'
>-for dir in ${_excl_dirs}; do
>-    _find_expr="${_find_expr} ! -regex ${dir}/bin/java"
>-done
>-for jvm in `cd "${LOCALBASE}" && find *jdk* *jre* ${_find_expr} 2> /dev/null`; do
>-    if [ -x "${LOCALBASE}/${jvm}" ]; then
>-        "${PKG_PREFIX}"/bin/registervm "${LOCALBASE}/${jvm}" > /dev/null 2>&1
>-    fi
>-done
>-
>-# Ensure all VMs are configured correctly
>-"${PKG_PREFIX}"/bin/checkvms
>
>Property changes on: java/javavmwrapper/files/pkg-install.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: java/javavmwrapper/pkg-deinstall
>===================================================================
>--- java/javavmwrapper/pkg-deinstall	(revision 417039)
>+++ java/javavmwrapper/pkg-deinstall	(nonexistent)
>@@ -1,54 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD$
>-
>-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
>-
>-# Run this script at the pre-deinstall stage
>-if [ "x${2}" != "xDEINSTALL" ]; then
>-    exit 0
>-fi
>-
>-# The option configuration file
>-OPTION_CONF="${PKG_PREFIX}/etc/javavm_opts.conf"
>-
>-# Remove the option configuration file if its identical to the
>-# distributed version.
>-if [ -f "${OPTION_CONF}" -a -f "${OPTION_CONF}.dist" ]; then
>-	if [ `sed -e '/^#/d' -e '/^\s*$/d' "${OPTION_CONF}" | sort | md5` = \
>-	     `sed -e '/^#/d' -e '/^\s*$/d' "${OPTION_CONF}.dist" | sort | md5` ]; then
>-		rm -f "${OPTION_CONF}"
>-	fi
>-fi
>-
>-# Destroy the symbolic links that were created for every executable for a VM.
>-_excl_links='checkvms manvm registervm unregistervm'
>-_find_expr='-depth 1 -type l'
>-for i in ${_excl_links}; do
>-	_find_expr="${_find_expr} ! -name ${i}"
>-done
>-_javavm_path=`realpath ${PKG_PREFIX}/bin/javavm`
>-for i in `find ${PKG_PREFIX}/bin ${_find_expr}`; do
>-	if [ "${_javavm_path}" = `realpath ${i}` ]; then
>-		rm -f "${i}"
>-	fi
>-done
>-
>-# The configuration file
>-CONF="${PKG_PREFIX}/etc/javavms"
>-
>-# Ensure the configuration file exists
>-if [ ! -f "${CONF}" ]; then
>-    exit 0
>-fi
>-
>-# Ensure the configuration file has the correct permissions
>-if [ ! -r "${CONF}" ]; then
>-    echo "error: can't read configuration file ${CONF}" 1>&2
>-    exit 1
>-fi
>-
>-# Remove the configuration file.
>-rm -f "${CONF}"
>-
>-exit 0
>
>Property changes on: java/javavmwrapper/pkg-deinstall
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: java/javavmwrapper/pkg-plist
>===================================================================
>--- java/javavmwrapper/pkg-plist	(revision 417039)
>+++ java/javavmwrapper/pkg-plist	(working copy)
>@@ -4,7 +4,7 @@
> bin/manvm
> bin/registervm
> bin/unregistervm
>-etc/javavm_opts.conf.dist
>+@sample etc/javavm_opts.conf.dist etc/javavm_opts.conf
> man/man1/checkvms.1.gz
> man/man1/javavm.1.gz
> man/man1/manvm.1.gz
>Index: java/linux-oracle-jdk18/pkg-plist
>===================================================================
>--- java/linux-oracle-jdk18/pkg-plist	(revision 417039)
>+++ java/linux-oracle-jdk18/pkg-plist	(working copy)
>@@ -10,6 +10,7 @@
> %%T%%/bin/jar
> %%T%%/bin/jarsigner
> %%T%%/bin/java
>+@javavm %%T%%/bin/java
> %%T%%/bin/java-rmi.cgi
> %%T%%/bin/javac
> %%T%%/bin/javadoc
>@@ -3413,7 +3414,5 @@
> %%DEMO%%%%T%%/sample/webservices/EbayServer/src/ebay/server/ImageProvider.java
> %%DEMO%%%%T%%/sample/webservices/EbayServer/src/ebay/server/Main.java
> %%T%%/src.zip
>-@exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Oracle-JDK%%PORTVERSION%%"
>-@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java"
> @dir %%T%%/jre/lib/applet
> @dir %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/.data
>Index: java/linux-oracle-jre18/pkg-plist
>===================================================================
>--- java/linux-oracle-jre18/pkg-plist	(revision 417039)
>+++ java/linux-oracle-jre18/pkg-plist	(working copy)
>@@ -6,6 +6,7 @@
> %%T%%/Welcome.html
> %%T%%/bin/ControlPanel
> %%T%%/bin/java
>+@javavm %%T%%/bin/java
> %%T%%/bin/javaws
> %%T%%/bin/jcontrol
> %%T%%/bin/jjs
>@@ -295,6 +296,4 @@
> %%T%%/plugin/desktop/sun_java.desktop
> %%T%%/plugin/desktop/sun_java.png
> %%T%%/release
>-@exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Oracle-JRE%%PORTVERSION%%"
>-@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java"
> @dir %%T%%/lib/applet
>Index: java/openjdk6/Makefile
>===================================================================
>--- java/openjdk6/Makefile	(revision 417039)
>+++ java/openjdk6/Makefile	(working copy)
>@@ -46,9 +46,6 @@
> TEST_DESC=	Add support for running regression test
> .endif
> 
>-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
>-PKGINSTALL=	${WRKDIR}/pkg-install
>-
> USES=		compiler gmake iconv motif tar:xz
> 
> .include <bsd.port.options.mk>
>@@ -320,8 +317,6 @@
> 	    ${STAGEDIR}${PREFIX}/openjdk6-fastdebug/jre/lib/${ARCH}
> .endif
> .endif
>-	@${ECHO_CMD} "#!/bin/sh" > ${PKGDEINSTALL}
>-	@${ECHO_CMD} "#!/bin/sh" > ${PKGINSTALL}
> .if defined(BUILD_JRE)
> 	@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
> 	    ${FIND} -s . -not -type d | \
>@@ -329,8 +324,7 @@
> 	@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
> 	    ${FIND} -s . -type d -empty | \
> 	    ${SED} 's,^\./,@dir openjdk6-jre/,' >> ${TMPPLIST}
>-	@${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-jre/bin/java' >> ${PKGDEINSTALL}
>-	@${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-jre/bin/java # OpenJDK6 JRE"' >> ${PKGINSTALL}
>+	@${ECHO_CMD} '@javawm ${PREFIX}/openjdk6-jre/bin/java' >> ${TMPPLIST}
> .else
> 	@cd ${STAGEDIR}${PREFIX}/openjdk6 && \
> 	    ${FIND} -s . -not -type d | \
>@@ -338,8 +332,7 @@
> 	@cd ${STAGEDIR}${PREFIX}/openjdk6 && \
> 	    ${FIND} -s . -type d -empty | \
> 	    ${SED} 's,^\./,@dir openjdk6/,' >> ${TMPPLIST}
>-	@${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6/bin/java' >> ${PKGDEINSTALL}
>-	@${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6/bin/java # OpenJDK6"' >> ${PKGINSTALL}
>+	@${ECHO_CMD} '@javawm ${PREFIX}/openjdk6/bin/java' >> ${TMPPLIST}
> .if ${PORT_OPTIONS:MFASTDEBUG}
> 	@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
> 	    ${FIND} -s . -not -type d | \
>@@ -347,11 +340,8 @@
> 	@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
> 	    ${FIND} -s . -type d -empty | \
> 	    ${SED} 's,^\./,@dir openjdk6-fastdebug/,' >> ${TMPPLIST}
>-	@${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-fastdebug/bin/java' >> ${PKGDEINSTALL}
>-	@${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6"' >> ${PKGINSTALL}
>+	@${ECHO_CMD} "@javavm ${PREFIX}/openjdk6-fastdebug/bin/java" >> ${TMPPLIST}
> .endif
> .endif
>-	@${ECHO_CMD} "exit 0" >> ${PKGDEINSTALL}
>-	@${ECHO_CMD} "exit 0" >> ${PKGINSTALL}
> 
> .include <bsd.port.post.mk>
>Index: java/openjdk7/Makefile
>===================================================================
>--- java/openjdk7/Makefile	(revision 417039)
>+++ java/openjdk7/Makefile	(working copy)
>@@ -197,11 +197,10 @@
> 	${INSTALL_DATA} ${FILESDIR}/cacerts \
> 	    ${STAGEDIR}${INSTALLDIR}/lib/security/cacerts
> .endif
>-	@${ECHO} "@unexec ${LOCALBASE}/bin/unregistervm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
>+	@${ECHO} "@javawm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
> 	@${FIND} -s ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \
> 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
> 	@${FIND} ${STAGEDIR}${INSTALLDIR} -type d -empty | ${SORT} -r | \
> 		${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dir ,' >> ${TMPPLIST}
>-	@${ECHO} "@exec ${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # ${JAVAVMS_COMMENT}'" >> ${TMPPLIST}
> 
> .include <bsd.port.post.mk>
>Index: java/openjdk8/Makefile
>===================================================================
>--- java/openjdk8/Makefile	(revision 417039)
>+++ java/openjdk8/Makefile	(working copy)
>@@ -442,9 +442,8 @@
> 	${CHMOD} ${BINMODE} ${JDK_JVMDIR}/jexec ${JDK_JVMDIR}/jspawnhelper
> 	@${ECHO} "@dir ${INSTALLDIR}/lib/applet" >> ${TMPPLIST}
> .endif
>-	@${ECHO} "@unexec ${LOCALBASE}/bin/unregistervm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
>+	@${ECHO} "@javawm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
> 	@${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \
> 	    ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST}
>-	@${ECHO} "@exec ${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # ${JAVAVMS_COMMENT}'" >> ${TMPPLIST}
> 
> .include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 210313: 171475 | 171537