From nobody Sat Sep 03 11:10:25 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MKXBT392tz4c2YJ; Sat, 3 Sep 2022 11:10:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MKXBT30X0z45S3; Sat, 3 Sep 2022 11:10:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662203425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OH6LGAABf6aSvY1eEKKFPrXcYEW/DiuGIsq12kjDXRE=; b=pwpj5PISfFzAmjvWO/4iE/gzBTklpiqcjgf6s30Euc8B7hd3wk20kUHdMTd2VVQ5GmNGXJ bxo3QSR/vxRrgwe3QaAatpUAkbLiiiqVMYP84zIlh9NZiI3PMYA4zyxafS5Q3mRpjtwZQA LYO2NZRJuuBXIzhTjqUe+5s8TKVDxX9OAJ5r4GUagalemiuNcajqsyBTCQ+lNOYAsxsIf7 PtnTYWW/JhEDZlImfKFYzQ2MRaaVDWcOmtVCJeWNKFIQVCyIXKgEJuaeA+R18dwMO5eCXH BEP7a+oTbYZSwEbfJ0geD8PF+XIbEbXaup8F1oGRb+om8PO/ZpviHpslO33fUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MKXBT23fFz17Bf; Sat, 3 Sep 2022 11:10:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 283BAPv8032091; Sat, 3 Sep 2022 11:10:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 283BAPfW032090; Sat, 3 Sep 2022 11:10:25 GMT (envelope-from git) Date: Sat, 3 Sep 2022 11:10:25 GMT Message-Id: <202209031110.283BAPfW032090@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: a3bbdd76cd21 - main - cleanup: Remove expired ports: List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3bbdd76cd21a92bd5da95a21c8f279dc380e6ef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662203425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OH6LGAABf6aSvY1eEKKFPrXcYEW/DiuGIsq12kjDXRE=; b=UKQCZdcPJCAgXvfQug1dPZ4b0NzqHLeNLUGsO+MaVGuIkRMyrS+6Ga6ZiewAGDOGTz3xf+ zKJ7asbWjq8U9y3o3LNRgIxMNx/KO2VY5hwT0qlB+fE7s/sCvPIlBDgZzF9rZl+ucexl8Q d94GMUlG9wfJ2Uh9SDWdKbJ8Zdx4Svc8/KMAPf5gkkpdHa2P307rZkyZgmjiXTm/6QTtzt 9FDJDZC9P2TJN3RqGZCK/w3tLU7CVb46CKNcxMq1P+lyGtgUht6fEiwXLarvnjVmq5LAp/ nqak8jYyI0x5AauTxCu8KRvlxjb3PO+yr4HnSI58v3x6N+SvyCZJWzntSRa4aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662203425; a=rsa-sha256; cv=none; b=NgsVjl/WmALAzfUx4tEVwMQe7rmrxzlhy0yc6Ph0v8oSx3kWcZVLZnJos2DI1YHxivG7k/ EKBjhiWfrHaFI4g6ItZq46vfoE0Kh8ns5u7rd4S9Ky7tsOMyCps16oGNopnlBrJSqkxGMr ANvJfTujAwOIiLFguNuKHJ6BcxxrbfZG24L2lQQupF//hIVTRVUJ4B6OhHUeeXSuYyROW9 EIboQktY3B0EtZE53PO4/0mHivM33s6Z0iDXOcIkdXdXe050IOfTq3o1L8Pso7kNRHzL/u JR8yOFwVb+V9JYaQHY710lK6gdn3yjjZtL+qGyGLIYog6z+FAxoFUd3nD0bEaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=a3bbdd76cd21a92bd5da95a21c8f279dc380e6ef commit a3bbdd76cd21a92bd5da95a21c8f279dc380e6ef Author: Rene Ladan AuthorDate: 2022-09-03 11:10:14 +0000 Commit: Rene Ladan CommitDate: 2022-09-03 11:10:14 +0000 cleanup: Remove expired ports: 2022-09-03 java/openjdk7: EOLed since 31 July 2022 2022-09-03 java/openjdk7-jre: EOLed since 31 July 2022 --- MOVED | 2 + java/Makefile | 2 - java/openjdk7-jre/Makefile | 9 - java/openjdk7/Makefile | 207 --------------------- java/openjdk7/distinfo | 5 - java/openjdk7/files/cacerts | Bin 112860 -> 0 bytes java/openjdk7/files/patch-icedtea-web | 106 ----------- .../files/patch-jdk_make_java_instrument_Makefile | 13 -- .../files/patch-jdk_make_java_npt_Makefile | 13 -- .../files/patch-jdk_make_sun_splashscreen_Makefile | 13 -- ...asses_com_sun_java_swing_plaf_gtk_Metacity.java | 15 -- ...ch-jdk_src_solaris_native_java_lang_childproc.c | 10 - ...ch-jdk_src_solaris_native_java_lang_childproc.h | 11 -- ...s_native_sun_security_jgss_wrapper_NativeFunc.c | 12 -- ...s_native_sun_security_jgss_wrapper_NativeFunc.h | 10 - java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp | 11 -- ...s-classes-sun-nio-fs-BsdFileSystemProvider.java | 21 --- ...asses-sun-nio-fs-DefaultFileSystemProvider.java | 37 ---- java/openjdk7/pkg-descr | 3 - java/openjdk7/pkg-message | 18 -- 20 files changed, 2 insertions(+), 516 deletions(-) diff --git a/MOVED b/MOVED index 1183316e9aa0..f9853e0416f4 100644 --- a/MOVED +++ b/MOVED @@ -17543,3 +17543,5 @@ shells/ksh93-devel|shells/ksh-devel|2022-08-28|Development has resumed under a n devel/boehm-gc-redirect||2022-08-29|No consumer in ports tree devel/libthreader|devel/libthreadar|2022-08-29|Fix directory name mail/rainloop-community|mail/rainloop|2022-09-01|Only one edition "legacy" is provided now +java/openjdk7||2022-09-03|Has expired: EOLed since 31 July 2022 +java/openjdk7-jre||2022-09-03|Has expired: EOLed since 31 July 2022 diff --git a/java/Makefile b/java/Makefile index f515b36a4cbb..9e00f56e5a20 100644 --- a/java/Makefile +++ b/java/Makefile @@ -90,8 +90,6 @@ SUBDIR += openjdk17 SUBDIR += openjdk17-jre SUBDIR += openjdk18 - SUBDIR += openjdk7 - SUBDIR += openjdk7-jre SUBDIR += openjdk8 SUBDIR += openjdk8-jre SUBDIR += openjfx14 diff --git a/java/openjdk7-jre/Makefile b/java/openjdk7-jre/Makefile deleted file mode 100644 index ee5309fa4644..000000000000 --- a/java/openjdk7-jre/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -PKGNAMESUFFIX= -jre - -MAINTAINER= java@FreeBSD.org -COMMENT= Java Runtime Environment ${JDK_MAJOR_VERSION} - -BUILD_JRE= yes -MASTERDIR= ${.CURDIR}/../openjdk7 - -.include "${MASTERDIR}/Makefile" diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile deleted file mode 100644 index 9b410f9e8953..000000000000 --- a/java/openjdk7/Makefile +++ /dev/null @@ -1,207 +0,0 @@ -PORTNAME= openjdk -PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} -PORTEPOCH= 1 -CATEGORIES= java devel -MASTER_SITES= https://archive.apache.org/dist/ant/binaries/:ant -DISTFILES= ${ANT_DISTFILE}${EXTRACT_SUFX}:ant - -MAINTAINER= glewis@FreeBSD.org -COMMENT= Java Development Kit 7 - -LICENSE= GPLv2 - -BROKEN_FreeBSD_13= does not link: duplicate symbol: fp_g_free -BROKEN_FreeBSD_14= does not link: duplicate symbol: fp_g_free - -DEPRECATED= EOLed since 31 July 2022 -EXPIRATION_DATE= 2022-09-03 - -CPE_VENDOR= oracle - -USE_GITHUB= yes -GH_ACCOUNT= battleblow -GH_PROJECT= jdk7u -GH_TAGNAME= jdk${JDK_MAJOR_VERSION}u${JDK_UPDATE_VERSION}-b${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} - -USES= compiler cpe dos2unix iconv gmake -# Even when not building with X11 support, openjdk7 requires Xrender, X11, and -# Xt headers. -X11_BUILD_DEPENDS_OFF+= ${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11 -X11_BUILD_DEPENDS_OFF+= ${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext -X11_BUILD_DEPENDS_OFF+= ${LOCALBASE}/libdata/pkgconfig/xrender.pc:x11/libXrender -X11_BUILD_DEPENDS_OFF+= ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt -# Add more X11 build deps and runtime deps when X11 is enabled -X11_LIB_DEPENDS+= libX11.so.6:x11/libX11 -X11_LIB_DEPENDS+= libXext.so.6:x11/libXext -X11_LIB_DEPENDS+= libXi.so.6:x11/libXi -X11_LIB_DEPENDS+= libXrender.so.1:x11/libXrender -X11_LIB_DEPENDS+= libXt.so.6:x11-toolkits/libXt -X11_LIB_DEPENDS+= libXtst.so.6:x11/libXtst -X11_MAKE_ENV_OFF= BUILD_HEADLESS_ONLY=1 - -MAKE_ARGS= CC=${CC:Q} CXX=${CXX:Q} HOST_CC=${CC:Q} - -OPTIONS_DEFINE= POLICY TZUPDATE X11 -OPTIONS_DEFAULT= POLICY TZUPDATE X11 -DEBUG_DESC= Enable extra debugging info -POLICY_DESC= Install the Unlimited Strength Policy Files -TZUPDATE_DESC= Update the time zone data - -JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} - -.if !defined(BUILD_JRE) -OPTIONS_DEFINE+= DEBUG -INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION} -.else -JAVAVMS_COMMENT+= JRE -INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}-jre -.endif - -JDK_MAJOR_VERSION= 7 -JDK_UPDATE_VERSION= 261 -JDK_BUILD_NUMBER= 02 -BSD_JDK_VERSION= 1 - -# Use our own version of ant because -# a) this allows us to avoid circular dependencies -# b) ant 10.x requires jdk 8+ -ANT_VERSION= 1.9.14 -ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin - -LIB_DEPENDS+= libasound.so:audio/alsa-lib \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 -BUILD_DEPENDS+= zip:archivers/zip \ - ${UNZIP_CMD}:archivers/unzip \ - ${LOCALBASE}/include/cups/cups.h:print/cups -RUN_DEPENDS+= javavm:java/javavmwrapper \ - dejavu>0:x11-fonts/dejavu - -DOS2UNIX_FILES= jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties - -OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/} - -NOPRECIOUSMAKEVARS= yes - -ONLY_FOR_ARCHS= i386 amd64 - -_MAKE_JOBS= # -MAKE_ENV+= JAVA_HOME="" \ - CLASSPATH="" \ - LD_LIBRARY_PATH="" \ - MAKEFLAGS="" \ - ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \ - ALT_FREETYPE_HEADERS_PATH="${LOCALBASE}/include" \ - ALT_FREETYPE_LIB_PATH="${LOCALBASE}/lib" \ - ALT_CUPS_HEADERS_PATH="${LOCALBASE}/include" \ - ALT_X11_PATH="${LOCALBASE}" \ - ALT_PKG_PATH="${LOCALBASE}" \ - ALT_PACKAGE_PATH="${LOCALBASE}" \ - ANT_HOME="${WRKDIR}/apache-ant-${ANT_VERSION}" \ - JAVACMD=${BOOTSTRAPJDKDIR}/bin/java \ - X11DIR="${LOCALBASE}" \ - LOCALDIR="${LOCALBASE}" \ - COMPILER_WARNINGS_FATAL="false" \ - NO_DOCS="true" \ - SKIP_COMPARE_IMAGES="true" \ - SKIP_FASTDEBUG_BUILD="true" \ - SKIP_DEBUG_BUILD="true" \ - ZIP_DEBUGINFO_FILES=0 \ - ENABLE_FULL_DEBUG_SYMBOLS=0 \ - PTHREAD_LIBS="-pthread" \ - MILESTONE="fcs" \ - JDK_MICRO_VERSION="0_${JDK_UPDATE_VERSION}" \ - BUILD_NUMBER="b${PORT_BUILD_NUMBER}" - -MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER} - -BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk7 \ - ${LOCALBASE}/bootstrap-openjdk6 - -DEBUG_MAKE_ENV= ALT_OBJCOPY=${NONEXISTENT} -POLICY_MAKE_ENV= UNLIMITED_CRYPTO=1 -TZUPDATE_RUN_DEPENDS= java-zoneinfo>0:java/java-zoneinfo - -.include - -# do we have valid native jdk installed? -.for BJDK in ${BOOTSTRAP_JDKS} -. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) -BOOTSTRAPJDKDIR= ${BJDK} -. endif -.endfor - -# if no valid jdk found, set dependency -.if !defined(BOOTSTRAPJDKDIR) -BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk6 -BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk6 -.endif - -.include - -.if ${ARCH} == i386 -# Fix the build for i386 when WITH_LLD_IS_LD is set -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225741 -MAKE_ENV+= LFLAGS="-Wl,-z,notext" -.endif - -# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html -.if ${COMPILER_TYPE} == gcc -MAKE_ENV+= USE_PRECOMPILED_HEADER=0 -.endif - -.if empty(ICONV_LIB) -ICONV_CPPFLAGS= -DLIBICONV_PLUG -.else -ICONV_CPPFLAGS= -I${LOCALBASE}/include -ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} -.endif - -post-patch: - @${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \ - ${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp \ - ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java - @${REINPLACE_CMD} -e 's|%%ICONV_CPPFLAGS%%|${ICONV_CPPFLAGS}|' \ - -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ - ${WRKSRC}/jdk/make/sun/splashscreen/Makefile \ - ${WRKSRC}/jdk/make/java/npt/Makefile \ - ${WRKSRC}/jdk/make/java/instrument/Makefile - -.if ${PORT_OPTIONS:MTZUPDATE} -pre-install: - @# Update time zones -.if !defined(BUILD_JRE) - @${RM} -r ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi - @${LN} -s -f ${LOCALBASE}/share/java/zi \ - ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib -.else - @${RM} -r ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi - @${LN} -s -f ${LOCALBASE}/share/java/zi \ - ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib -.endif -.endif - -do-install: - @${MKDIR} ${STAGEDIR}${INSTALLDIR} -.if !defined(BUILD_JRE) - cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \ - ${PAX} -rw . ${STAGEDIR}${INSTALLDIR} - ${INSTALL_DATA} \ - ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/compilefontconfig.jar \ - ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/javazic.jar \ - ${STAGEDIR}${INSTALLDIR}/jre/lib/ - ${INSTALL_DATA} ${FILESDIR}/cacerts \ - ${STAGEDIR}${INSTALLDIR}/jre/lib/security/cacerts -.else - cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \ - ${PAX} -rw . ${STAGEDIR}${INSTALLDIR} - ${INSTALL_DATA} ${FILESDIR}/cacerts \ - ${STAGEDIR}${INSTALLDIR}/lib/security/cacerts -.endif - @${ECHO} "@javavm ${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} - -.include diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo deleted file mode 100644 index 556b0170c1e6..000000000000 --- a/java/openjdk7/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1587323053 -SHA256 (apache-ant-1.9.14-bin.tar.gz) = ad6b296a76f0ad433bc6b4ebda41c3275e0dc03f0e9a6c8c299f787a5e4c3fe4 -SIZE (apache-ant-1.9.14-bin.tar.gz) = 5837539 -SHA256 (battleblow-jdk7u-7.261.02.1-jdk7u261-b02.1_GH0.tar.gz) = 708579df5083d52c6ca56ac09425082e0fe1e2c9f986e33a0e131efb3b8733dc -SIZE (battleblow-jdk7u-7.261.02.1-jdk7u261-b02.1_GH0.tar.gz) = 69823650 diff --git a/java/openjdk7/files/cacerts b/java/openjdk7/files/cacerts deleted file mode 100644 index 318a166205d4..000000000000 Binary files a/java/openjdk7/files/cacerts and /dev/null differ diff --git a/java/openjdk7/files/patch-icedtea-web b/java/openjdk7/files/patch-icedtea-web deleted file mode 100644 index 42fff72b89b1..000000000000 --- a/java/openjdk7/files/patch-icedtea-web +++ /dev/null @@ -1,106 +0,0 @@ ---- jdk/src/share/classes/sun/applet/AppletPanel.java Mon Nov 22 21:55:09 2010 +0000 -+++ jdk/src/share/classes/sun/applet/AppletPanel.java Wed Dec 08 23:26:01 2010 +0000 -@@ -67,7 +67,7 @@ abstract class AppletPanel extends Panel - /** - * The applet (if loaded). - */ -- Applet applet; -+ protected Applet applet; - - /** - * Applet will allow initialization. Should be -@@ -161,7 +161,8 @@ abstract class AppletPanel extends Panel - * Creates a thread to run the applet. This method is called - * each time an applet is loaded and reloaded. - */ -- synchronized void createAppletThread() { -+ //Overridden by NetxPanel. -+ protected synchronized void createAppletThread() { - // Create a thread group for the applet, and start a new - // thread to load the applet. - String nm = "applet-" + getCode(); -@@ -305,7 +306,7 @@ abstract class AppletPanel extends Panel - /** - * Get an event from the queue. - */ -- synchronized AppletEvent getNextEvent() throws InterruptedException { -+ protected synchronized AppletEvent getNextEvent() throws InterruptedException { - while (queue == null || queue.isEmpty()) { - wait(); - } -@@ -694,7 +695,8 @@ abstract class AppletPanel extends Panel - * applet event processing so that it can be gracefully interrupted from - * things like HotJava. - */ -- private void runLoader() { -+ //Overridden by NetxPanel. -+ protected void runLoader() { - if (status != APPLET_DISPOSE) { - showAppletStatus("notdisposed"); - return; ---- jdk/src/share/classes/sun/applet/AppletViewerPanel.java Mon Nov 22 21:55:09 2010 +0000 -+++ jdk/src/share/classes/sun/applet/AppletViewerPanel.java Wed Dec 08 23:26:01 2010 +0000 -@@ -42,25 +42,25 @@ import sun.tools.jar.*; - * - * @author Arthur van Hoff - */ --class AppletViewerPanel extends AppletPanel { -+public class AppletViewerPanel extends AppletPanel { - - /* Are we debugging? */ -- static boolean debug = false; -+ protected static boolean debug = false; - - /** - * The document url. - */ -- URL documentURL; -+ protected URL documentURL; - - /** - * The base url. - */ -- URL baseURL; -+ protected URL baseURL; - - /** - * The attributes of the applet. - */ -- Hashtable atts; -+ protected Hashtable atts; - - /* - * JDK 1.1 serialVersionUID -@@ -70,7 +70,7 @@ class AppletViewerPanel extends AppletPa - /** - * Construct an applet viewer and start the applet. - */ -- AppletViewerPanel(URL documentURL, Hashtable atts) { -+ protected AppletViewerPanel(URL documentURL, Hashtable atts) { - this.documentURL = documentURL; - this.atts = atts; - -@@ -106,7 +106,7 @@ class AppletViewerPanel extends AppletPa - * Get an applet parameter. - */ - public String getParameter(String name) { -- return (String)atts.get(name.toLowerCase()); -+ return atts.get(name.toLowerCase()); - } - - /** -@@ -202,12 +202,12 @@ class AppletViewerPanel extends AppletPa - return (AppletContext)getParent(); - } - -- static void debug(String s) { -+ protected static void debug(String s) { - if(debug) - System.err.println("AppletViewerPanel:::" + s); - } - -- static void debug(String s, Throwable t) { -+ protected static void debug(String s, Throwable t) { - if(debug) { - t.printStackTrace(); - debug(s); diff --git a/java/openjdk7/files/patch-jdk_make_java_instrument_Makefile b/java/openjdk7/files/patch-jdk_make_java_instrument_Makefile deleted file mode 100644 index cb938848989d..000000000000 --- a/java/openjdk7/files/patch-jdk_make_java_instrument_Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- jdk/make/java/instrument/Makefile.orig 2020-03-01 17:52:15.797379000 -0800 -+++ jdk/make/java/instrument/Makefile 2020-03-01 18:45:55.324964000 -0800 -@@ -117,8 +117,8 @@ - LDFLAGS += -Wl,--no-whole-archive - ifneq ($(OS_NAME), netbsd) - # Use CPPFLAGS instead of OTHER_INCLUDES to force this last -- CPPFLAGS += -I$(PACKAGE_PATH)/include -- OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv -+ CPPFLAGS += %%ICONV_CPPFLAGS%% -+ OTHER_LDLIBS += %%ICONV_LDFLAGS%% - endif - endif - diff --git a/java/openjdk7/files/patch-jdk_make_java_npt_Makefile b/java/openjdk7/files/patch-jdk_make_java_npt_Makefile deleted file mode 100644 index 1a2771cb5b48..000000000000 --- a/java/openjdk7/files/patch-jdk_make_java_npt_Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- jdk/make/java/npt/Makefile.orig 2020-03-01 18:39:54.449760000 -0800 -+++ jdk/make/java/npt/Makefile 2020-03-01 18:46:01.524983000 -0800 -@@ -77,8 +77,8 @@ - # Add location of iconv headers - ifeq ($(PLATFORM), bsd) - ifneq ($(OS_NAME), netbsd) -- CPPFLAGS += -I$(PACKAGE_PATH)/include -- OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv -+ CPPFLAGS += %%ICONV_CPPFLAGS%% -+ OTHER_LDLIBS += %%ICONV_LDFLAGS%% - endif - endif - diff --git a/java/openjdk7/files/patch-jdk_make_sun_splashscreen_Makefile b/java/openjdk7/files/patch-jdk_make_sun_splashscreen_Makefile deleted file mode 100644 index 001331e64007..000000000000 --- a/java/openjdk7/files/patch-jdk_make_sun_splashscreen_Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- jdk/make/sun/splashscreen/Makefile.orig 2020-03-01 18:41:52.052960000 -0800 -+++ jdk/make/sun/splashscreen/Makefile 2020-03-01 18:46:07.203955000 -0800 -@@ -93,8 +93,8 @@ - ifeq ($(OS_NAME), netbsd) - OTHER_LDLIBS += -Wl,-R$(OPENWIN_LIB) - else -- CPPFLAGS += -I$(PACKAGE_PATH)/include -- OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv -+ CPPFLAGS += %%ICONV_CPPFLAGS%% -+ OTHER_LDLIBS += %%ICONV_LDFLAGS%% - endif - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread diff --git a/java/openjdk7/files/patch-jdk_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity.java b/java/openjdk7/files/patch-jdk_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity.java deleted file mode 100644 index a846cb8af99e..000000000000 --- a/java/openjdk7/files/patch-jdk_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity.java +++ /dev/null @@ -1,15 +0,0 @@ ---- jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java -+++ jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java -@@ -477,10 +477,8 @@ - String[] dirs = new String[] { - userHome + sep + ".themes", - System.getProperty("swing.metacitythemedir"), -- "/usr/X11R6/share/themes", -- "/usr/X11R6/share/gnome/themes", -- "/usr/local/share/themes", -- "/usr/local/share/gnome/themes", -+ "%%LOCALBASE%%/share/themes", -+ "%%LOCALBASE%%/share/gnome/themes", - "/usr/share/themes", - "/usr/gnome/share/themes", // Debian/Redhat/Solaris - "/opt/gnome2/share/themes" // SuSE diff --git a/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.c b/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.c deleted file mode 100644 index 1fb1f50b330c..000000000000 --- a/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.c +++ /dev/null @@ -1,10 +0,0 @@ ---- jdk/src/solaris/native/java/lang/childproc.c -+++ jdk/src/solaris/native/java/lang/childproc.c -@@ -33,6 +33,7 @@ - - #include "childproc.h" - -+const char * const *parentPathv; - - ssize_t - restartableWrite(int fd, const void *buf, size_t count) diff --git a/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.h b/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.h deleted file mode 100644 index d65624d8a234..000000000000 --- a/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.h +++ /dev/null @@ -1,11 +0,0 @@ ---- jdk/src/solaris/native/java/lang/childproc.h -+++ jdk/src/solaris/native/java/lang/childproc.h -@@ -119,7 +119,7 @@ typedef struct _SpawnInfo { - * The cached and split version of the JDK's effective PATH. - * (We don't support putenv("PATH=...") in native code) - */ --const char * const *parentPathv; -+extern const char * const *parentPathv; - - ssize_t restartableWrite(int fd, const void *buf, size_t count); - int restartableDup2(int fd_from, int fd_to); diff --git a/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c b/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c deleted file mode 100644 index be20c35c9d79..000000000000 --- a/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c +++ /dev/null @@ -1,12 +0,0 @@ ---- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c.orig 2020-10-13 23:04:42.602966000 -0700 -+++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2020-10-13 23:05:10.165713000 -0700 -@@ -28,6 +28,9 @@ - #include - #include "NativeFunc.h" - -+/* global GSS function table */ -+GSS_FUNCTION_TABLE_PTR ftab; -+ - /* standard GSS method names (ordering is from mapfile) */ - static const char RELEASE_NAME[] = "gss_release_name"; - static const char IMPORT_NAME[] = "gss_import_name"; diff --git a/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h b/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h deleted file mode 100644 index 0e49a7a35502..000000000000 --- a/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h +++ /dev/null @@ -1,10 +0,0 @@ ---- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h.orig 2020-10-13 23:03:46.002701000 -0700 -+++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h 2020-10-13 23:04:24.830082000 -0700 -@@ -265,6 +265,6 @@ - typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; - - /* global GSS function table */ --GSS_FUNCTION_TABLE_PTR ftab; -+extern GSS_FUNCTION_TABLE_PTR ftab; - - #endif diff --git a/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp b/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp deleted file mode 100644 index a2e4b5601ee0..000000000000 --- a/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2014-10-06 17:10:00.000000000 -0400 -+++ hotspot/src/os/bsd/vm/os_bsd.cpp 2014-10-08 10:23:14.000000000 -0400 -@@ -458,7 +458,7 @@ - * 7: The default directories, normally /lib and /usr/lib. - */ - #ifndef DEFAULT_LIBPATH --#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/local/lib" -+#define DEFAULT_LIBPATH "/lib:/usr/lib:%%LOCALBASE%%/lib" - #endif - - #define EXTENSIONS_DIR "/lib/ext" diff --git a/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-BsdFileSystemProvider.java b/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-BsdFileSystemProvider.java deleted file mode 100644 index 8897cbe56e30..000000000000 --- a/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-BsdFileSystemProvider.java +++ /dev/null @@ -1,21 +0,0 @@ ---- jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java.orig -+++ jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java -@@ -27,6 +27,7 @@ - - import java.nio.file.*; - import java.nio.file.attribute.*; -+import java.nio.file.spi.FileSystemProvider; - import java.io.IOException; - - /** -@@ -38,6 +39,10 @@ - super(); - } - -+ public BsdFileSystemProvider(FileSystemProvider f) { -+ super(); -+ } -+ - @Override - BsdFileSystem newFileSystem(String dir) { - return new BsdFileSystem(this, dir); diff --git a/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-DefaultFileSystemProvider.java b/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-DefaultFileSystemProvider.java deleted file mode 100644 index 879be08c9206..000000000000 --- a/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-DefaultFileSystemProvider.java +++ /dev/null @@ -1,37 +0,0 @@ ---- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sun Mar 10 14:04:37 2013 -0400 -+++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Tue Mar 26 18:25:51 2013 -0700 -@@ -28,6 +28,8 @@ - import java.nio.file.spi.FileSystemProvider; - import java.security.AccessController; - import java.security.PrivilegedAction; -+import java.util.Set; -+import java.util.HashSet; - import sun.security.action.GetPropertyAction; - - /** -@@ -37,6 +39,14 @@ - public class DefaultFileSystemProvider { - private DefaultFileSystemProvider() { } - -+ private static final Set validFileSystemProviders -+ = new HashSet(); -+ static { -+ validFileSystemProviders.add("sun.nio.fs.SolarisFileSystemProvider"); -+ validFileSystemProviders.add("sun.nio.fs.LinuxFileSystemProvider"); -+ validFileSystemProviders.add("sun.nio.fs.BsdFileSystemProvider"); -+ } -+ - @SuppressWarnings("unchecked") - private static FileSystemProvider createProvider(final String cn) { - return AccessController -@@ -64,6 +74,10 @@ - public static FileSystemProvider create() { - String osname = AccessController - .doPrivileged(new GetPropertyAction("os.name")); -+ String fileSystemProvider = System -+ .getProperty("java.nio.file.spi.DefaultFileSystemProvider"); -+ if (validFileSystemProviders.contains(fileSystemProvider)) -+ return createProvider(fileSystemProvider); - if (osname.equals("SunOS")) - return createProvider("sun.nio.fs.SolarisFileSystemProvider"); - if (osname.equals("Linux")) diff --git a/java/openjdk7/pkg-descr b/java/openjdk7/pkg-descr deleted file mode 100644 index 7b9a9faf8549..000000000000 --- a/java/openjdk7/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -An open-source implementation of the Java Platform, Standard Edition, - -WWW: https://openjdk.java.net/ diff --git a/java/openjdk7/pkg-message b/java/openjdk7/pkg-message deleted file mode 100644 index 22b7b0145629..000000000000 --- a/java/openjdk7/pkg-message +++ /dev/null @@ -1,18 +0,0 @@ -[ -{ type: install - message: <