diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2007-01-29 10:14:29 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2007-01-29 10:14:29 +0000 |
commit | cec49cf8f48420d4e91f2d480cf281bd2d79e999 (patch) | |
tree | 26a0b2f13d3c39b0da0fdcdd6f2fdbf06bdc636e /java/jdk16/files | |
parent | - Update to 0.4.9.3.20070117 (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_EOL'.4-eol
Notes
Notes:
svn path=/head/; revision=183609
svn path=/tags/RELEASE_4_EOL/; revision=183610; tag=4-eol
Diffstat (limited to 'java/jdk16/files')
22 files changed, 0 insertions, 390 deletions
diff --git a/java/jdk16/files/cacerts b/java/jdk16/files/cacerts Binary files differdeleted file mode 100644 index dbc3699a9c3a..000000000000 --- a/java/jdk16/files/cacerts +++ /dev/null diff --git a/java/jdk16/files/patch-control::common::Defs-bsd.gmk b/java/jdk16/files/patch-control::common::Defs-bsd.gmk deleted file mode 100644 index e5701664bcbc..000000000000 --- a/java/jdk16/files/patch-control::common::Defs-bsd.gmk +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../control/make/common/Defs-bsd.gmk.orig Thu Jan 13 02:01:40 2005 -+++ ../../control/make/common/Defs-bsd.gmk Thu Jan 13 02:01:54 2005 -@@ -200,7 +200,7 @@ - ifeq ($(TRUE_PLATFORM), NetBSD) - DEVTOOLS_PATH = /usr/pkg/bin/ - else --DEVTOOLS_PATH = /usr/local/bin/ -+DEVTOOLS_PATH = ${LOCALBASE}/bin/ - endif - # Allow the user to override the default value... - ifdef ALT_DEVTOOLS_PATH diff --git a/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk deleted file mode 100644 index c3bd401665a1..000000000000 --- a/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Sun Dec 10 11:49:51 2006 -+++ ../../deploy/make/plugin/common/Defs-bsd.gmk Sun Dec 10 21:44:53 2006 -@@ -29,7 +29,7 @@ - endif - - # Default NSPR_PATH and allow override. --NSPR_PATH = /usr/local -+NSPR_PATH = $(LOCALBASE) - ifdef ALT_NSPR_PATH - NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH)) - endif diff --git a/java/jdk16/files/patch-deploy::common::config.gmk b/java/jdk16/files/patch-deploy::common::config.gmk deleted file mode 100644 index b9592c5b0206..000000000000 --- a/java/jdk16/files/patch-deploy::common::config.gmk +++ /dev/null @@ -1,16 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/make/plugin/common/config.gmk.orig Sun Dec 10 21:40:24 2006 -+++ ../../deploy/make/plugin/common/config.gmk Sun Dec 10 21:40:59 2006 -@@ -44,9 +44,9 @@ - - ifeq ($(LINUX_OR_BSD), true) - PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/solaris -- OTHER_LDFLAGS = -L/usr/X11R6/lib -+ OTHER_LDFLAGS = -L$(X11BASE)/lib - ifeq ($(TRUE_PLATFORM), NetBSD) -- OTHER_LDFLAGS += -Wl,-R/usr/X11R6/lib -+ OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib - endif - endif - diff --git a/java/jdk16/files/patch-deploy::controlpanel::sun_java.desktop b/java/jdk16/files/patch-deploy::controlpanel::sun_java.desktop deleted file mode 100644 index 898893707989..000000000000 --- a/java/jdk16/files/patch-deploy::controlpanel::sun_java.desktop +++ /dev/null @@ -1,13 +0,0 @@ ---- ../../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/files/patch-deploy::jvmnative::Makefile b/java/jdk16/files/patch-deploy::jvmnative::Makefile deleted file mode 100644 index 9ae13e14bff6..000000000000 --- a/java/jdk16/files/patch-deploy::jvmnative::Makefile +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/make/plugin/jvmnative/Makefile.orig Sun Dec 10 21:45:33 2006 -+++ ../../deploy/make/plugin/jvmnative/Makefile Sun Dec 10 21:45:54 2006 -@@ -16,7 +16,7 @@ - - ifeq ($(PLATFORM), bsd) - LDLIBS = -lm -lX11 --X11HDRDIR = /usr/X11R6/include -+X11HDRDIR = $(X11BASE)/include - else - X11HDRDIR = - ifeq ($(PLATFORM), linux) diff --git a/java/jdk16/files/patch-deploy::make::common::Defs-bsd.gmk b/java/jdk16/files/patch-deploy::make::common::Defs-bsd.gmk deleted file mode 100644 index 9f7709c6cac1..000000000000 --- a/java/jdk16/files/patch-deploy::make::common::Defs-bsd.gmk +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/make/common/Defs-bsd.gmk.orig Sun Dec 10 18:30:50 2006 -+++ ../../deploy/make/common/Defs-bsd.gmk Sun Dec 10 18:31:22 2006 -@@ -13,8 +13,8 @@ - JUMP_EXE = $(BIN_DIR)/javaws$(SUFFIX) - JUMP_EXE_DBG = $(BIN_DIR_DBG)/javaws$(DBG_SUFFIX) - PATH_SEP = / --X11DIR = /usr/X11R6 --LOCALDIR = /usr/local -+X11DIR = $(X11BASE) -+LOCALDIR = $(LOCALBASE) - ifneq ($(TRUE_PLATFORM), NetBSD) - LIBS = -L$(X11DIR)/lib -lX11 -L$(LOCALDIR)/lib -liconv - else diff --git a/java/jdk16/files/patch-deploy::ns7-adapter::Makefile b/java/jdk16/files/patch-deploy::ns7-adapter::Makefile deleted file mode 100644 index 3a53b9077fa7..000000000000 --- a/java/jdk16/files/patch-deploy::ns7-adapter::Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/make/plugin/adapter/ns7-adapter/Makefile.orig Sat Jan 20 12:52:46 2007 -+++ ../../deploy/make/plugin/adapter/ns7-adapter/Makefile Sat Jan 20 12:53:22 2007 -@@ -66,8 +66,8 @@ - COMMONDIR= $(PLUGIN_TOP)/src/plugin/solaris/common - ifeq ($(PLATFORM), bsd) - MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7) --X11HDRDIR = /usr/X11R6/include --ICONVHDRDIR = /usr/local/include -+X11HDRDIR = $(X11BASE)/include -+ICONVHDRDIR = $(LOCALBASE)/include - NSPRHDRDIR = $(NSPR_HEADERS_PATH) - else - MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7) \ diff --git a/java/jdk16/files/patch-deploy::nscore::Makefile b/java/jdk16/files/patch-deploy::nscore::Makefile deleted file mode 100644 index 1ce85cbd831a..000000000000 --- a/java/jdk16/files/patch-deploy::nscore::Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- ../../deploy/make/plugin/nscore/unix/Makefile.orig Sun Dec 10 21:46:45 2006 -+++ ../../deploy/make/plugin/nscore/unix/Makefile Sun Dec 10 21:47:26 2006 -@@ -18,8 +18,8 @@ - - ifeq ($(PLATFORM), bsd) - LDLIBS = -lX11 --X11HDRDIR = /usr/X11R6/include --ICONVHDRDIR = /usr/local/include -+X11HDRDIR = $(X11BASE)/include -+ICONVHDRDIR = $(LOCALBASE)/include - else - X11HDRDIR = - ICONVHDRDIR = diff --git a/java/jdk16/files/patch-j2se::awt::fontpath.c b/java/jdk16/files/patch-j2se::awt::fontpath.c deleted file mode 100644 index 4c941d36bb11..000000000000 --- a/java/jdk16/files/patch-j2se::awt::fontpath.c +++ /dev/null @@ -1,29 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/native/sun/awt/fontpath.c.orig Sun Dec 10 21:57:02 2006 -+++ ../../j2se/src/solaris/native/sun/awt/fontpath.c Sun Dec 10 21:58:43 2006 -@@ -98,18 +98,18 @@ - * various flavors of Linux - */ - static char *fullLinuxFontPath[] = { -- "/usr/X11R6/lib/X11/fonts/TrueType", /* RH 7.1+ */ -- "/usr/X11R6/lib/X11/fonts/truetype", /* SuSE */ -- "/usr/X11R6/lib/X11/fonts/tt", -- "/usr/X11R6/lib/X11/fonts/TTF", -- "/usr/X11R6/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */ -+ "%%X11BASE%%/lib/X11/fonts/TrueType", /* RH 7.1+ */ -+ "%%X11BASE%%/lib/X11/fonts/truetype", /* SuSE */ -+ "%%X11BASE%%/lib/X11/fonts/tt", -+ "%%X11BASE%%/lib/X11/fonts/TTF", -+ "%%X11BASE%%/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */ - "/usr/share/fonts/ja/TrueType", /* RH 7.2+ */ - "/usr/share/fonts/truetype", - "/usr/share/fonts/ko/TrueType", /* RH 9.0 */ - "/usr/share/fonts/zh_CN/TrueType", /* RH 9.0 */ - "/usr/share/fonts/zh_TW/TrueType", /* RH 9.0 */ - "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType", /* Debian */ -- "/usr/X11R6/lib/X11/fonts/Type1", -+ "%%X11BASE%%/lib/X11/fonts/Type1", - "/usr/share/fonts/default/Type1", /* RH 9.0 */ - NULL, /* terminates the list */ - }; diff --git a/java/jdk16/files/patch-j2se::awt::mawt.gmk b/java/jdk16/files/patch-j2se::awt::mawt.gmk deleted file mode 100644 index 703e594c9583..000000000000 --- a/java/jdk16/files/patch-j2se::awt::mawt.gmk +++ /dev/null @@ -1,26 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/sun/awt/mawt.gmk.orig Sun Dec 10 21:49:45 2006 -+++ ../../j2se/make/sun/awt/mawt.gmk Sun Dec 10 21:50:27 2006 -@@ -132,9 +132,9 @@ - ifeq ($(ARCH_DATA_MODEL), 64) - LIBXT = -lXt - else -- LIBXT = /usr/X11R6/lib/libXt.a -- LIBSM = /usr/X11R6/lib/libSM.a -- LIBICE = /usr/X11R6/lib/libICE.a -+ LIBXT = $(X11BASE)/lib/libXt.a -+ LIBSM = $(X11BASE)/lib/libSM.a -+ LIBICE = $(X11BASE)/lib/libICE.a - endif - endif - else -@@ -229,7 +229,7 @@ - $(EVENT_MODEL) - - ifeq ($(LINUX_OR_BSD), true) -- CPPFLAGS += -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions -+ CPPFLAGS += -I$(X11BASE)/include -I$(X11BASE)/include/X11/extensions - endif - - ifeq ($(PLATFORM), solaris) diff --git a/java/jdk16/files/patch-j2se::common::Defs-bsd.gmk b/java/jdk16/files/patch-j2se::common::Defs-bsd.gmk deleted file mode 100644 index cad7b38ea1a0..000000000000 --- a/java/jdk16/files/patch-j2se::common::Defs-bsd.gmk +++ /dev/null @@ -1,22 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/common/Defs-bsd.gmk.orig Sun Dec 10 11:49:52 2006 -+++ ../../j2se/make/common/Defs-bsd.gmk Sun Dec 10 21:48:51 2006 -@@ -180,7 +180,7 @@ - ifeq ($(TRUE_PLATFORM), NetBSD) - DEVTOOLS_PATH = /usr/pkg/bin/ - else --DEVTOOLS_PATH = /usr/local/bin/ -+DEVTOOLS_PATH = $(LOCALBASE)/bin/ - endif - # Allow the user to override the default value... - ifdef ALT_DEVTOOLS_PATH -@@ -434,7 +434,7 @@ - override LIBTHREAD = - override MOOT_PRIORITIES = true - override NO_INTERRUPTIBLE_IO = false --override OPENWIN_HOME = /usr/X11R6 -+override OPENWIN_HOME = $(X11BASE) - override OPENWIN_LIB = $(OPENWIN_HOME)/lib - override OTHER_M4FLAGS = -DGNU_ASSEMBLER - override SUN_CMM_SUBDIR = diff --git a/java/jdk16/files/patch-j2se::font::Makefile b/java/jdk16/files/patch-j2se::font::Makefile deleted file mode 100644 index 92c2e00e4c8b..000000000000 --- a/java/jdk16/files/patch-j2se::font::Makefile +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/sun/font/Makefile.orig Sun Dec 10 21:51:17 2006 -+++ ../../j2se/make/sun/font/Makefile Sun Dec 10 21:51:50 2006 -@@ -125,7 +125,7 @@ - # setup the list of libraries to link in... - ifeq ($(PLATFORM), bsd) - # XXXBSD: why here? --OTHER_INCLUDES += -I/usr/X11R6/include -+OTHER_INCLUDES += -I$(X11BASE)/include - OTHER_LDLIBS += -lawt$(SUFFIX) $(LIBM) $(LIBCXX) - else - ifeq ($(PLATFORM), linux) diff --git a/java/jdk16/files/patch-j2se::gtk::GTKLookAndFeel.java b/java/jdk16/files/patch-j2se::gtk::GTKLookAndFeel.java deleted file mode 100644 index c9ca568af784..000000000000 --- a/java/jdk16/files/patch-j2se::gtk::GTKLookAndFeel.java +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java.orig Sun Dec 10 21:53:38 2006 -+++ ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Sun Dec 10 21:54:16 2006 -@@ -1387,8 +1387,8 @@ - String[] dirs = new String[] { - userHome + "/.themes", - System.getProperty("swing.gtkthemedir"), -- "/usr/X11R6/share/gnome/themes", // FreeBSD -- "/usr/X11R6/share/themes", // FreeBSD -+ "%%X11BASE%%/share/gnome/themes", // FreeBSD -+ "%%X11BASE%%/share/themes", // FreeBSD - "/usr/share/themes" // Debian/Redhat/Solaris/SuSE - }; - diff --git a/java/jdk16/files/patch-j2se::gtk::Metacity.java b/java/jdk16/files/patch-j2se::gtk::Metacity.java deleted file mode 100644 index 1d705f5503b5..000000000000 --- a/java/jdk16/files/patch-j2se::gtk::Metacity.java +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java.orig Sun Dec 10 21:55:26 2006 -+++ ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java Sun Dec 10 21:55:56 2006 -@@ -456,8 +456,8 @@ - String[] dirs = new String[] { - userHome + sep + ".themes", - System.getProperty("swing.metacitythemedir"), -- "/usr/X11R6/share/themes", -- "/usr/X11R6/share/gnome/themes", -+ "%%X11BASE%%/share/themes", -+ "%%X11BASE%%/share/gnome/themes", - "/usr/share/themes", - "/usr/gnome/share/themes", // Debian/Redhat/Solaris - "/opt/gnome2/share/themes" // SuSE diff --git a/java/jdk16/files/patch-j2se::instrument::Makefile b/java/jdk16/files/patch-j2se::instrument::Makefile deleted file mode 100644 index 8934bfc11fe3..000000000000 --- a/java/jdk16/files/patch-j2se::instrument::Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/java/instrument/Makefile.orig Thu Jan 13 02:04:44 2005 -+++ ../../j2se/make/java/instrument/Makefile Thu Jan 13 02:05:03 2005 -@@ -72,8 +72,8 @@ - else - ifeq ($(PLATFORM), bsd) - ifneq ($(TRUE_PLATFORM), NetBSD) -- OTHER_INCLUDES += -I/usr/local/include -- OTHER_LDLIBS += -L/usr/local/lib -liconv -+ OTHER_INCLUDES += -I${LOCALBASE}/include -+ OTHER_LDLIBS += -L${LOCALBASE}/lib -liconv - endif - else - OTHER_LDLIBS = -lnsl -ldl diff --git a/java/jdk16/files/patch-j2se::nio::genCharsetProvider.sh b/java/jdk16/files/patch-j2se::nio::genCharsetProvider.sh deleted file mode 100644 index fd6137cab922..000000000000 --- a/java/jdk16/files/patch-j2se::nio::genCharsetProvider.sh +++ /dev/null @@ -1,17 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/java/nio/genCharsetProvider.sh 8 Nov 2004 22:27:03 -0000 1.1.1.1 -+++ ../../j2se/make/java/nio/genCharsetProvider.sh 24 Mar 2005 16:14:52 -0000 -@@ -94,9 +94,9 @@ - } - ' - --$JAVA -cp $TMPDIR Hasher -i Aliases <$TMPDIR/aliases >>$OUT --$JAVA -cp $TMPDIR Hasher -i Classes <$TMPDIR/classes >>$OUT --$JAVA -cp $TMPDIR Hasher -i -e Cache -t Charset <$TMPDIR/classes >>$OUT -+$JAVA -cp $TMPDIR Hasher -i Aliases <$TMPDIR/aliases | egrep -v '^Java Hotspot' >>$OUT -+$JAVA -cp $TMPDIR Hasher -i Classes <$TMPDIR/classes | egrep -v '^Java Hotspot' >>$OUT -+$JAVA -cp $TMPDIR Hasher -i -e Cache -t Charset <$TMPDIR/classes | egrep -v '^Java Hotspot' >>$OUT - - - # Constructor diff --git a/java/jdk16/files/patch-j2se::xawt::Makefile b/java/jdk16/files/patch-j2se::xawt::Makefile deleted file mode 100644 index 6220ec692520..000000000000 --- a/java/jdk16/files/patch-j2se::xawt::Makefile +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/make/sun/xawt/Makefile.orig Sun Dec 10 21:52:27 2006 -+++ ../../j2se/make/sun/xawt/Makefile Sun Dec 10 21:52:52 2006 -@@ -117,7 +117,7 @@ - endif - - ifeq ($(PLATFORM), bsd) -- CPPFLAGS += -I/usr/X11R6/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include -+ CPPFLAGS += -I$(X11BASE)/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include - endif - - ifeq ($(PLATFORM), solaris) diff --git a/java/jdk16/files/patch-java_Makefile b/java/jdk16/files/patch-java_Makefile deleted file mode 100644 index 60585c522db4..000000000000 --- a/java/jdk16/files/patch-java_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- ../../j2se/make/java/java/Makefile.orig Mon Dec 13 12:38:14 2004 -+++ ../../j2se/make/java/java/Makefile Mon Dec 13 12:42:00 2004 -@@ -284,7 +284,7 @@ - $(RM) -r $(TMPDIR)/GenerateCurrencyData - $(MKDIR) -p $(TMPDIR)/GenerateCurrencyData - $(JAVAC_BOOT) -d $(TMPDIR)/GenerateCurrencyData $(BUILDDIR)/tools/GenerateCurrencyData/GenerateCurrencyData.java -- $(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties > $@ -+ $(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties | egrep -v '^Java HotSpot' > $@ - - clean:: - $(RM) $(GENSRCDIR)/java/util/CurrencyData.java diff --git a/java/jdk16/files/patch-vm::os_bsd.cpp b/java/jdk16/files/patch-vm::os_bsd.cpp deleted file mode 100644 index 25bd71db866c..000000000000 --- a/java/jdk16/files/patch-vm::os_bsd.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- ../../hotspot/src/os/bsd/vm/os_bsd.cpp.orig Tue Jan 27 17:54:28 2004 -+++ ../../hotspot/src/os/bsd/vm/os_bsd.cpp Tue Jan 27 17:55:21 2004 -@@ -333,7 +333,7 @@ - #define malloc(n) (char*)NEW_C_HEAP_ARRAY(char, (n)) - #define getenv(n) ::getenv(n) - --#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */ -+#define DEFAULT_LD_LIBRARY_PATH "/usr/lib:%%LOCALBASE%%/lib" /* See ld.so.1(1) */ - #define EXTENSIONS_DIR "/lib/ext" - #define ENDORSED_DIR "/lib/endorsed" - diff --git a/java/jdk16/files/pkg-deinstall.in b/java/jdk16/files/pkg-deinstall.in deleted file mode 100644 index 167d5bd28893..000000000000 --- a/java/jdk16/files/pkg-deinstall.in +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# Set up a standard path -PATH=/usr/bin:/bin - -# Don't do anything during post-deinstall -if [ "$2" = "POST-DEINSTALL" ]; then - exit 0 -fi - -# Remove the plugin - -# Plugin location variables -BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins" -JAVAPLUGINDIR="%%JRE_HOME%%/plugin/%%ARCH%%/ns7" -PLUGIN=libjavaplugin_oji.so - -# Check if the package includes the plugin -if [ ! -e "${JAVAPLUGINDIR}/${PLUGIN}" ]; then - exit 0 -fi - -# See if the browser plugin is a link to the package plugin and remove it if so. -if [ -e "${BROWSERPLUGINDIR}/${PLUGIN}" -a \ - -L "${BROWSERPLUGINDIR}/${PLUGIN}" -a \ - x`ls -l "${BROWSERPLUGINDIR}/${PLUGIN}" 2>/dev/null | awk '/->/{print $NF;exit 0}END{exit 1}'` = x"${JAVAPLUGINDIR}/${PLUGIN}" ]; then - rm -f "${BROWSERPLUGINDIR}/${PLUGIN}" -fi - -exit 0 diff --git a/java/jdk16/files/pkg-install.in b/java/jdk16/files/pkg-install.in deleted file mode 100644 index c5f4a70db1df..000000000000 --- a/java/jdk16/files/pkg-install.in +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# System preference location -JRE_HOME=%%JRE_HOME%% - -# Post-install actions -if [ "$2" = "POST-INSTALL" ]; then - # Set up system preferences - if [ ! -d "${JRE_HOME}/.systemPrefs" ] ; then - mkdir -m 755 "${JRE_HOME}/.systemPrefs" - fi - if [ ! -f "${JRE_HOME}/.systemPrefs/.system.lock" ] ; then - touch "${JRE_HOME}/.systemPrefs/.system.lock" - chmod 644 "${JRE_HOME}/.systemPrefs/.system.lock" - fi - if [ ! -f "${JRE_HOME}/.systemPrefs/.systemRootModFile" ] ; then - touch "${JRE_HOME}/.systemPrefs/.systemRootModFile" - chmod 644 "${JRE_HOME}/.systemPrefs/.systemRootModFile" - fi - - # Install the plugin - BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins" - JAVAPLUGINDIR="${JRE_HOME}/plugin/%%ARCH%%/ns7" - PLUGIN=libjavaplugin_oji.so - - # Check if the browser plugin exists - if [ ! -e "${JAVAPLUGINDIR}/${PLUGIN}" ]; then - exit 0 - fi - - # Check if the plugin directory exists. - if [ ! -d "${BROWSERPLUGINDIR}" ]; then - exit 0 - fi - - # Check if the browser plugin currently exists - if [ ! -e "${BROWSERPLUGINDIR}/${PLUGIN}" ]; then - # Create symbolic link - ln -sf "${JAVAPLUGINDIR}/${PLUGIN}" \ - "${BROWSERPLUGINDIR}/${PLUGIN}" - exit 0 - fi - - # If the browser plugin exists and is a symlink, but the link - # doesn't exist, then overwrite with our plugin. - if [ -L "${BROWSERPLUGINDIR}/${PLUGIN}" ]; then - # Check if the linked to file exists. - if [ ! -e `ls -l "${BROWSERPLUGINDIR}/${PLUGIN}" 2>/dev/null | awk '/->/{print $NF;exit 0}END{exit 1}'` ]; then - ln -sf "${JAVAPLUGINDIR}/${PLUGIN}" \ - "${BROWSERPLUGINDIR}/${PLUGIN}" - exit 0 - fi - fi - - exit 0 -fi |