freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete java/openjdk6 and java/openjdk6-jre ports

Browse Source 
* Both of these ports are EoL upstream.  Remove them per the DEPRECATED
  and EXPIRATION_DATE entries added previously
* Note that bootstrap-openjdk6 is left solely to be able to bootstrap
  java/openjdk7
This commit is contained in:
Greg Lewis
2019-09-23 18:26:43 +00:00
parent e0d67b113c
commit 2b31ab00a2
23 changed files with 2 additions and 19320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MOVED
View File

@@ -12955,3 +12955,5 @@ databases/tablelog||2019-09-19|Has expired: Abandonware
databases/skytools||2019-09-19|Has expired: Abandonware
devel/xfce4-vala||2019-09-20|Deprecated, functionality moved to xfce libraries with option VAPI on (default)
irc/iroffer-lamm||2019-09-23|obsolete
java/openjdk6|java/openjdk8|2019-09-23|Has expired: EOLed upstream since December 2018
java/openjdk6-jre|java/openjdk8-jre|2019-09-23|Has expired: EOLed upstream since December 2018

2
java/Makefile
View File

@@ -109,8 +109,6 @@
SUBDIR += openjdk11
SUBDIR += openjdk12
SUBDIR += openjdk13
SUBDIR += openjdk6
SUBDIR += openjdk6-jre
SUBDIR += openjdk7
SUBDIR += openjdk7-jre
SUBDIR += openjdk8

11
java/openjdk6-jre/Makefile
View File

@@ -1,11 +0,0 @@
# $FreeBSD$
CATEGORIES= java devel
PKGNAMESUFFIX= -jre
COMMENT= Oracle's Java 6 Runtime Environment under the GPL v2
BUILD_JRE= yes
MASTERDIR= ${.CURDIR}/../openjdk6
.include "${MASTERDIR}/Makefile"

355
java/openjdk6/Makefile
View File

@@ -1,355 +0,0 @@
# Created by: Brian Gardner <brian@experts-exchange.com>
# $FreeBSD$
PORTNAME= openjdk6
PORTVERSION= b45
PORTEPOCH= 1
CATEGORIES= java devel
MASTER_SITES= APACHE/ant/binaries/:ant \
https://java.net/downloads/openjdk6/:jdk \
LOCAL/jkim:jdk,jtreg
PATCH_SITES= LOCAL/glewis/openjdk6
DISTFILES= ${ANTFILE}:ant \
${JDK_SRC_DISTFILE}${EXTRACT_SUFX}:jdk
EXTRACT_ONLY= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} ${ANTFILE}
PATCHFILES= patch-6-b42.xz \
patch-6-b43.xz \
patch-6-b44.xz \
patch-6-b45.xz
MAINTAINER= java@FreeBSD.org
COMMENT?= Oracle's Java 6 virtual machine release under the GPL v2
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX}
DEPRECATED= Extended Support ended December 2018, please migrate to openjdk8
EXPIRATION_DATE=2019-09-20
BUILD_DEPENDS= ${LOCALBASE}/bin/zip:archivers/zip \
${LOCALBASE}/bin/unzip:archivers/unzip \
${LOCALBASE}/include/cups/cups.h:print/cups
LIB_DEPENDS= libfreetype.so:print/freetype2
RUN_DEPENDS= javavm:java/javavmwrapper \
dejavu>0:x11-fonts/dejavu
OPENJDK_BUILDDATE= 04_jan_2017
JDK_SRC_DISTFILE= openjdk-6-src-b41-${OPENJDK_BUILDDATE}
OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE
OPTIONS_DEFAULT=ICEDTEA TZUPDATE
ICEDTEA_DESC= Apply additional patches from IcedTea
POLICY_DESC= Install the Unlimited Strength Policy Files
SOUND_DESC= Enable sound support
TZUPDATE_DESC= Update the time zone data
.if !defined(BUILD_JRE)
OPTIONS_DEFINE+=TEST
OPTIONS_RADIO= DEVEL
DEVEL_DESC= Build for OpenJDK development
OPTIONS_RADIO_DEVEL= DEBUG FASTDEBUG
DEBUG_DESC= Enable legacy debugging support
FASTDEBUG_DESC= Include fastdebug build
TEST_DESC= Add support for running regression test
.endif
USES= compiler gmake iconv motif tar:xz
.include <bsd.port.options.mk>
.include "${.CURDIR}/../openjdk6/Makefile.icedtea"
.include "${.CURDIR}/../openjdk6/Makefile.test"
EXTRA_PATCHES+= ${ICEDTEA_PATCHES}
# java extracts directly to the cwd
WRKSRC= ${WRKDIR}
USE_XORG= x11 xext xi xt xtst
# do not depend on devel/apache-ant to avoid circular dependency, but
# use .tar.bz2 distfile to avoid duplicated downloads
ANTVERSION= 1.9.7
ANTFILE= apache-ant-${ANTVERSION}-bin.tar.bz2
JTREG_BUILD= b05_29_nov_2012
JTREGFILE= jtreg-4.1-bin-${JTREG_BUILD}.zip
UPDATE_VERSION= 32
.if ${PORT_OPTIONS:MIPV6}
CATEGORIES+= ipv6
.endif
.if ${PORT_OPTIONS:MTZUPDATE}
RUN_DEPENDS+= java-zoneinfo>0:java/java-zoneinfo
.endif
# avoid ARCH in MAKEFLAGS, breaks build
NOPRECIOUSMAKEVARS= yes
ONLY_FOR_ARCHS= amd64 i386
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk6 \
${LOCALBASE}/bootstrap-openjdk6
# do we have valid native jdk installed?
.for CJDK in ${BOOTSTRAP_JDKS}
. if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK}/bin/javac)
BOOTSTRAPJDKDIR= ${CJDK}
. 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
MAKE_ENV= OS= \
ALT_JDK_IMPORT_PATH=${BOOTSTRAPJDKDIR} \
ALT_BOOTDIR=${BOOTSTRAPJDKDIR} \
ALT_CACERTS_FILE=${FILESDIR}/cacerts \
ALT_CUPS_HEADERS_PATH=${LOCALBASE}/include \
ALT_CUPS_LIB_PATH=${LOCALBASE}/lib \
ALT_FREETYPE_HEADERS_PATH=${LOCALBASE}/include \
ALT_FREETYPE_LIB_PATH=${LOCALBASE}/lib \
ALT_X11_PATH=${LOCALBASE} \
ALT_PACKAGE_PATH=${LOCALBASE} \
ANT_HOME=${WRKDIR}/apache-ant-${ANTVERSION} \
JAVACMD=${BOOTSTRAPJDKDIR}/bin/java \
BUILD_NUMBER=${PORTVERSION} \
NO_DOCS=true \
MILESTONE=fcs \
JDK_UPDATE_VERSION=${UPDATE_VERSION}
# XXX Turn off parallel build by default.
MAKE_JOBS_UNSAFE= yes
MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER}
.if ${PORT_OPTIONS:MDEBUG}
ALL_TARGET= debug_build
OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/}-debug
.else
OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/}
.endif
# disable FASTDEBUG_BUILD by default to improve compile time.
.if ${PORT_OPTIONS:MFASTDEBUG}
MAKE_ENV+= SKIP_FASTDEBUG_BUILD=false
.else
MAKE_ENV+= SKIP_FASTDEBUG_BUILD=true
.endif
.if empty(PORT_OPTIONS:MIPV6)
MAKE_ENV+= DONT_ENABLE_IPV6="YES"
.endif
.if ${PORT_OPTIONS:MPOLICY}
MAKE_ENV+= UNLIMITED_CRYPTO="YES"
.endif
.if ${PORT_OPTIONS:MSOUND}
EXTRA_PATCHES+= ${FILESDIR}/alsa-enable.patch
LIB_DEPENDS+= libasound.so:audio/alsa-lib
RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
.else
EXTRA_PATCHES+= ${FILESDIR}/alsa-disable.patch
.endif
.if ${PORT_OPTIONS:MTEST}
DISTFILES+= ${JTREGFILE}:jtreg
EXTRACT_ONLY+= ${JTREGFILE}
BUILD_DEPENDS+= dejavu>0:x11-fonts/dejavu
USES+= display:test
.else
EXTRA_PATCHES+= ${FILESDIR}/test_gamma-disable.patch
.endif
COPYDIRS= \
jdk/src/linux/doc/man
COPYFILES= \
corba/make/common/Defs-linux.gmk \
corba/make/common/shared/Defs-linux.gmk \
hotspot/src/os/linux/vm/decoder_linux.cpp \
jdk/make/com/sun/tools/attach/mapfile-linux \
jdk/make/common/Defs-linux.gmk \
jdk/make/common/shared/Defs-linux.gmk \
jdk/make/java/nio/mapfile-linux \
jdk/make/netbeans/common/architectures/name-Linux.properties \
jdk/make/sun/awt/mapfile-vers-linux \
jdk/make/tools/sharing/classlist.linux \
jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux \
jdk/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java \
jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java \
jdk/src/solaris/hpi/include/largefile_linux.h \
jdk/src/solaris/native/java/net/linux_close.c \
jdk/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c
.include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang
.if ${COMPILER_VERSION} >= 35
MAKE_ENV+= COMPILER_WARNINGS_FATAL=false
.endif
MAKE_ENV+= USE_CLANG=true
.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
ZLIB_LDFLAGS?= -lz
post-extract:
@for d in ${COPYDIRS}; do \
${MKDIR} `echo ${WRKSRC}/$$d | ${SED} 's/linux/bsd/g;'`; \
cd ${WRKSRC}/$$d; \
for f in *; do \
if [ -f $$f ]; then \
t=`echo ${WRKSRC}/$$d/$$f | ${SED} 's/linux/bsd/g; s/Linux/Bsd/g'`; \
${SED} 's/linux/bsd/g; s/Linux/Bsd/g; s/LINUX/BSD/g' < $$f > $$t; \
fi; \
done; \
done
@for f in ${COPYFILES}; do \
t=`echo $$f | ${SED} 's/linux/bsd/g; s/Linux/Bsd/g'`; \
${SED} 's/linux/bsd/g; s/Linux/Bsd/g' < ${WRKSRC}/$$f > ${WRKSRC}/$$t; \
done
@${SED} 's/solaris/bsd/g; s/Solaris/Bsd/g' \
${WRKSRC}/jdk/src/solaris/hpi/native_threads/src/threads_solaris.c > \
${WRKSRC}/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c
@${SED} "s|/usr/local|${LOCALBASE}|" \
${FILESDIR}/fontconfig.properties > \
${WRKSRC}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|" ${FILESDIR}/Makefile.test.in > \
${WRKSRC}/jdk/test/Makefile
@${FIND} ${WRKSRC}/jdk/test -type f -name \*.sh -exec ${SED} -i "" \
-e s/Linux/FreeBSD/g {} \;
post-patch:
@${REINPLACE_CMD} -e "s|%%CXX_LDFLAGS%%|${CXX_LDFLAGS}|" \
${WRKSRC}/corba/make/common/Defs-bsd.gmk \
${WRKSRC}/jdk/make/common/Defs-bsd.gmk
.if ${COMPILER_TYPE} == "clang"
@${REINPLACE_CMD} -e "s|-fno-omit-frame-pointer|-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer|" \
${WRKSRC}/corba/make/common/Defs-bsd.gmk \
${WRKSRC}/hotspot/make/bsd/makefiles/amd64.make \
${WRKSRC}/jdk/make/common/Defs-bsd.gmk
.endif
@${REINPLACE_CMD} -e "s|%%ICONV_CPPFLAGS%%|${ICONV_CPPFLAGS}|" \
-e "s|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|" \
${WRKSRC}/Makefile ${WRKSRC}/jdk/make/java/instrument/Makefile \
${WRKSRC}/jdk/make/java/npt/Makefile \
${WRKSRC}/jdk/make/sun/splashscreen/Makefile
@${REINPLACE_CMD} -e "s|%%ZLIB_LDFLAGS%%|${ZLIB_LDFLAGS}|" \
${WRKSRC}/jdk/make/com/sun/java/pack/Makefile \
${WRKSRC}/jdk/make/common/Program.gmk \
${WRKSRC}/jdk/make/java/jli/Makefile \
${WRKSRC}/jdk/make/java/zip/Makefile \
${WRKSRC}/jdk/make/tools/freetypecheck/Makefile
@${REINPLACE_CMD} -e "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 \
${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java
.if defined(BUILD_JRE)
@${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${PREFIX}/openjdk6-jre|" \
${WRKSRC}/hotspot/src/os/posix/launcher/java_md.c \
${WRKSRC}/jdk/src/solaris/bin/java_md.c
.else
@${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${PREFIX}/openjdk6|" \
${WRKSRC}/hotspot/src/os/posix/launcher/java_md.c \
${WRKSRC}/jdk/src/solaris/bin/java_md.c
.endif
post-build:
.if ${PORT_OPTIONS:MTZUPDATE}
@# Update time zones
.if defined(BUILD_JRE)
@${RM} -r ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi
@${LN} -s -f ${LOCALBASE}/share/java/zi \
${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib
.else
@${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
.endif
.endif
.if ${PORT_OPTIONS:MTEST}
@${ECHO_MSG} ""
@${ECHO_MSG} "Run \"make test\" to execute regression test (it could take a few hours to complete)."
.if defined(DISPLAY)
@${ECHO_MSG} "Unset the environment DISPLAY variable to run tests in a virtual X server."
.endif
@${ECHO_MSG} ""
.endif
do-install:
.if defined(BUILD_JRE)
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \
${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/openjdk6-jre \
"-not ( -type d -name bin -prune )"
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \
${COPYTREE_BIN} bin ${STAGEDIR}${PREFIX}/openjdk6-jre
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \
${INSTALL_PROGRAM} lib/${ARCH}/jexec \
${STAGEDIR}${PREFIX}/openjdk6-jre/lib/${ARCH}
.else
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \
${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/openjdk6 \
"-not ( -type d -name bin -prune )"
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \
${COPYTREE_BIN} "bin jre/bin" ${STAGEDIR}${PREFIX}/openjdk6
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \
${INSTALL_PROGRAM} jre/lib/${ARCH}/jexec \
${STAGEDIR}${PREFIX}/openjdk6/jre/lib/${ARCH}
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars && \
${INSTALL_DATA} compilefontconfig.jar javazic.jar \
${STAGEDIR}${PREFIX}/openjdk6/jre/lib
.if ${PORT_OPTIONS:MFASTDEBUG}
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}-fastdebug/j2sdk-image && \
${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/openjdk6-fastdebug \
"-not ( -type d -name bin -prune )"
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}-fastdebug/j2sdk-image && \
${COPYTREE_BIN} "bin jre/bin" \
${STAGEDIR}${PREFIX}/openjdk6-fastdebug
@cd ${WRKSRC}/build/${OPENJDK_OSARCH}-fastdebug/j2sdk-image && \
${INSTALL_PROGRAM} jre/lib/${ARCH}/jexec \
${STAGEDIR}${PREFIX}/openjdk6-fastdebug/jre/lib/${ARCH}
.endif
.endif
.if defined(BUILD_JRE)
@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
${FIND} -s . -not -type d | \
${SED} -e 's,^\./,openjdk6-jre/,' >> ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
${FIND} -s . -type d -empty | \
${SED} 's,^\./,@dir openjdk6-jre/,' >> ${TMPPLIST}
@${ECHO_CMD} '@javavm ${PREFIX}/openjdk6-jre/bin/java' >> ${TMPPLIST}
.else
@cd ${STAGEDIR}${PREFIX}/openjdk6 && \
${FIND} -s . -not -type d | \
${SED} -e 's,^\./,openjdk6/,' >> ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}/openjdk6 && \
${FIND} -s . -type d -empty | \
${SED} 's,^\./,@dir openjdk6/,' >> ${TMPPLIST}
@${ECHO_CMD} '@javavm ${PREFIX}/openjdk6/bin/java' >> ${TMPPLIST}
.if ${PORT_OPTIONS:MFASTDEBUG}
@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
${FIND} -s . -not -type d | \
${SED} -e 's,^\./,openjdk6-fastdebug/,' >> ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
${FIND} -s . -type d -empty | \
${SED} 's,^\./,@dir openjdk6-fastdebug/,' >> ${TMPPLIST}
@${ECHO_CMD} "@javavm ${PREFIX}/openjdk6-fastdebug/bin/java" >> ${TMPPLIST}
.endif
.endif
.include <bsd.port.post.mk>

13
java/openjdk6/Makefile.icedtea
View File

@@ -1,13 +0,0 @@
# $FreeBSD$
_PATCHES=
.if ${PORT_OPTIONS:MICEDTEA}
_PATCHES+= \
applet_hole.patch \
jpegclasses.patch
.endif
.for p in ${_PATCHES}
ICEDTEA_PATCHES+= ${FILESDIR}/icedtea/${p}
.endfor

19
java/openjdk6/Makefile.test
View File

@@ -1,19 +0,0 @@
# $FreeBSD$
.if ${PORT_OPTIONS:MTEST}
.if defined(DISPLAY)
_TEST_SEQ= do-test
.else
_TEST_SEQ= pre-test do-test post-test
.ORDER: ${_TEST_SEQ}
.endif
test: ${_TEST_SEQ}
@${ECHO_MSG} ""
@${ECHO_MSG} "You can run \"make test\" again to re-execute only the failed tests."
@${ECHO_MSG} ""
do-test: build-depends build
@-(cd ${WRKSRC}/jdk/test; ${SETENV} PLATFORM=bsd ARCH=${ARCH} \
${MAKE_ENV} ${MAKE_CMD} tests)
.endif

15
java/openjdk6/distinfo
View File

@@ -1,15 +0,0 @@
TIMESTAMP = 1514659989
SHA256 (apache-ant-1.9.7-bin.tar.bz2) = be2ff3026cc655dc002bbcce100bd6724d448c63f702aa82b6d9899b22db7808
SIZE (apache-ant-1.9.7-bin.tar.bz2) = 4392108
SHA256 (openjdk-6-src-b41-04_jan_2017.tar.xz) = 8e34d451cec65fae8b4304651058ed4dc8d07bd45baa2f49780009097afc1a15
SIZE (openjdk-6-src-b41-04_jan_2017.tar.xz) = 34402516
SHA256 (jtreg-4.1-bin-b05_29_nov_2012.zip) = 9291eb4a14501232b35614e88686ff66ad8b69d0098dbd4322b28f97b672653d
SIZE (jtreg-4.1-bin-b05_29_nov_2012.zip) = 5993382
SHA256 (patch-6-b42.xz) = be3cbf875b4731540908e9fe10aae4d3e48777b597787e8adf95c58084dd82eb
SIZE (patch-6-b42.xz) = 113664
SHA256 (patch-6-b43.xz) = e806751c1997d292130eca855ffe6811c6b66e823a877213a74ef9b01596098b
SIZE (patch-6-b43.xz) = 64716
SHA256 (patch-6-b44.xz) = 2221839e92ce363b5f1632219b7fc69a5728e854392e9c72427d8ea299a0e4de
SIZE (patch-6-b44.xz) = 150396
SHA256 (patch-6-b45.xz) = fd7598277ed30bef3369978f380580132e836ec0b7afa9841d780115b22ae0ea
SIZE (patch-6-b45.xz) = 275440

67
java/openjdk6/files/Makefile.test.in
View File

@@ -1,67 +0,0 @@
#
# Makefile to run jtreg
#
ifeq ($(ARCH), i386)
ARCH = i586
endif
# Root of this test area (important to use full paths in some places)
TEST_ROOT := $(shell pwd)
# Default bundle of all test results (passed or not)
JPRT_ARCHIVE_BUNDLE = $(TEST_ROOT)/JPRT_ARCHIVE_BUNDLE.zip
JT_HOME = $(TEST_ROOT)/../../jtreg
JTREG_KEY_OPTION = -k:\!ignore
JTREG_ENV_OPTION = -e:LOCALBASE=%%LOCALBASE%%
JTREG_STATUS_OPTION = -status:notRun,fail,error
# Default JTREG to run
JTREG = $(ALT_JDK_IMPORT_PATH)/bin/java -jar $(JT_HOME)/lib/jtreg.jar
# Default JDK to test
JAVA_HOME = $(TEST_ROOT)/../../build/$(PLATFORM)-$(ARCH)/j2sdk-image
# The test directories to run
TESTDIRS = com demo java javax lib sun tools vm
# Root of all test results
JTREG_OUTPUT_DIR = $(TEST_ROOT)/o_$(PLATFORM)-$(ARCH)
# Default make rule
all: clean check tests $(JPRT_ARCHIVE_BUNDLE)
@echo "Testing completed successfully"
# Chaeck to make sure these directories exist
check: $(JT_HOME) $(JAVA_HOME)
# Run the tests
tests: FRC
@mkdir -p $(JTREG_OUTPUT_DIR)
$(JTREG) -a -v:fail,error \
$(JTREG_KEY_OPTION) \
$(JTREG_ENV_OPTION) \
$(JTREG_STATUS_OPTION) \
-r:$(JTREG_OUTPUT_DIR)/JTreport \
-w:$(JTREG_OUTPUT_DIR)/JTwork \
-jdk:$(JAVA_HOME) \
$(TESTDIRS)
# Bundle up the results
$(JPRT_ARCHIVE_BUNDLE): FRC
@rm -f $@
@mkdir -p $(@D)
( cd $(JTREG_OUTPUT_DIR) && %%LOCALBASE%%/bin/zip -q -r $@ . )
# Cleanup
clean:
rm -f -r $(JTREG_OUTPUT_DIR)
rm -f $(JPRT_ARCHIVE_BUNDLE)
# Used to force a target rules to run
FRC:
# Phony targets (e.g. these are not filenames)
.PHONY: all tests clean check

42
java/openjdk6/files/alsa-disable.patch
View File

@@ -1,42 +0,0 @@
--- jdk/make/javax/sound/Makefile 2011-01-20 18:54:05.000000000 -0500
+++ jdk/make/javax/sound/Makefile 2011-02-01 17:46:55.000000000 -0500
@@ -105,6 +105,19 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
endif # PLATFORM linux
+# XXXBSD: ???
+ifeq ($(PLATFORM), bsd)
+ # build with empty MIDI i/o
+ INCLUDE_MIDI = TRUE
+ # build with empty ports
+ INCLUDE_PORTS = TRUE
+ # build with empty direct audio
+ INCLUDE_DAUDIO = TRUE
+ ifeq ($(OS_VENDOR), OpenBSD)
+ LDFLAGS += -lossaudio
+ endif
+endif # PLATFORM bsd
+
ifeq ($(PLATFORM), solaris)
ifneq ($(ARCH), amd64)
# build with ports and direct audio
--- jdk/src/share/native/com/sun/media/sound/Platform.c 2011-01-20 18:54:37.000000000 -0500
+++ jdk/src/share/native/com/sun/media/sound/Platform.c 2011-02-01 17:46:55.000000000 -0500
@@ -99,5 +99,17 @@
return com_sun_media_sound_Platform_LIB_ALSA;
}
#endif
+#if (X_PLATFORM == X_BSD)
+ switch (feature) {
+ case com_sun_media_sound_Platform_FEATURE_MIDIIO:
+ return com_sun_media_sound_Platform_LIB_MAIN;
+ case com_sun_media_sound_Platform_FEATURE_PORTS:
+ return com_sun_media_sound_Platform_LIB_MAIN;
+ case com_sun_media_sound_Platform_FEATURE_DIRECT_AUDIO:
+ // XXXBSD: When native Direct Audio support is ported change
+ // this back to returning com_sun_media_sound_Platform_LIB_MAIN
+ return 0;
+ }
+#endif
return 0;
}

57
java/openjdk6/files/alsa-enable.patch
View File

@@ -1,57 +0,0 @@
--- jdk/make/javax/sound/Makefile 2011-01-20 18:54:05.000000000 -0500
+++ jdk/make/javax/sound/Makefile 2011-02-11 16:20:52.000000000 -0500
@@ -105,6 +105,15 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
endif # PLATFORM linux
+ifeq ($(PLATFORM), bsd)
+ # build with empty MIDI i/o
+ INCLUDE_MIDI = TRUE
+ # ALSA handles directaudio and ports
+ SUBDIRS += jsoundalsa
+ EXTRA_SOUND_JNI_LIBS += jsoundalsa
+ #MXSPP_ADD = $(PLATFORM)-$(ARCH)/
+endif # PLATFORM bsd
+
ifeq ($(PLATFORM), solaris)
ifneq ($(ARCH), amd64)
# build with ports and direct audio
--- jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c 2012-05-01 17:18:35.000000000 -0400
+++ jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c 2012-09-26 17:35:48.000000000 -0400
@@ -131,6 +131,10 @@
void getALSAVersion(char* buffer, int len) {
if (!hasGottenALSAVersion) {
+#ifdef __FreeBSD__
+ // XXX We do not use ALSA drivers. Just copy the library version.
+ strcpy(ALSAVersionString, SND_LIB_VERSION_STR);
+#else
// get alsa version from proc interface
FILE* file;
int curr, len, totalLen, inVersionString;
@@ -171,6 +175,7 @@
// null terminate
ALSAVersionString[len] = 0;
}
+#endif
hasGottenALSAVersion = TRUE;
}
strncpy(buffer, ALSAVersionString, len);
--- jdk/src/share/native/com/sun/media/sound/Platform.c 2011-01-20 18:54:37.000000000 -0500
+++ jdk/src/share/native/com/sun/media/sound/Platform.c 2011-02-11 16:20:52.000000000 -0500
@@ -99,5 +99,15 @@
return com_sun_media_sound_Platform_LIB_ALSA;
}
#endif
+#if (X_PLATFORM == X_BSD)
+ switch (feature) {
+ case com_sun_media_sound_Platform_FEATURE_MIDIIO:
+ return com_sun_media_sound_Platform_LIB_MAIN;
+ case com_sun_media_sound_Platform_FEATURE_PORTS:
+ return com_sun_media_sound_Platform_LIB_ALSA;
+ case com_sun_media_sound_Platform_FEATURE_DIRECT_AUDIO:
+ return com_sun_media_sound_Platform_LIB_ALSA;
+ }
+#endif
return 0;
}

BIN
java/openjdk6/files/cacerts
View File

Binary file not shown.

192
java/openjdk6/files/fontconfig.properties
View File

@@ -1,192 +0,0 @@
#
# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Sun designates this
# particular file as subject to the "Classpath" exception as provided
# by Sun in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
# CA 95054 USA or visit www.sun.com if you need additional information or
# have any questions.
#
# Version
# Uses FreeBSD ports tree fonts and file paths.
version=1
# Component Font Mappings
dialog.plain.latin-1=DejaVu Sans
dialog.plain.chinese-big5=AR PL UMing
dialog.plain.chinese-gb18030=AR PL UMing
dialog.plain.japanese-x0208=Sazanami Gothic
dialog.plain.korean=NanumGothic
dialog.bold.latin-1=DejaVu Sans Bold
dialog.bold.chinese-big5=AR PL UMing
dialog.bold.chinese-gb18030=AR PL UMing
dialog.bold.japanese-x0208=Sazanami Gothic
dialog.bold.korean=NanumGothicExtraBold
dialog.italic.latin-1=DejaVu Sans Oblique
dialog.italic.chinese-big5=AR PL UMing
dialog.italic.chinese-gb18030=AR PL UMing
dialog.italic.japanese-x0208=Sazanami Gothic
dialog.italic.korean=NanumGothic
dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
dialog.bolditalic.chinese-big5=AR PL UMing
dialog.bolditalic.chinese-gb18030=AR PL UMing
dialog.bolditalic.japanese-x0208=Sazanami Gothic
dialog.bolditalic.korean=NanumGothicExtraBold
sansserif.plain.latin-1=DejaVu Sans
sansserif.plain.chinese-big5=AR PL UMing
sansserif.plain.chinese-gb18030=AR PL UMing
sansserif.plain.japanese-x0208=Sazanami Gothic
sansserif.plain.korean=NanumGothic
sansserif.bold.latin-1=DejaVu Sans Bold
sansserif.bold.chinese-big5=AR PL UMing
sansserif.bold.chinese-gb18030=AR PL UMing
sansserif.bold.japanese-x0208=Sazanami Gothic
sansserif.bold.korean=NanumGothicExtraBold
sansserif.italic.latin-1=DejaVu Sans Oblique
sansserif.italic.chinese-big5=AR PL UMing
sansserif.italic.chinese-gb18030=AR PL UMing
sansserif.italic.japanese-x0208=Sazanami Gothic
sansserif.italic.korean=NanumGothic
sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
sansserif.bolditalic.chinese-big5=AR PL UMing
sansserif.bolditalic.chinese-gb18030=AR PL UMing
sansserif.bolditalic.japanese-x0208=Sazanami Gothic
sansserif.bolditalic.korean=NanumGothicExtraBold
serif.plain.latin-1=DejaVu Serif
serif.plain.chinese-big5=AR PL UKai
serif.plain.chinese-gb18030=AR PL UKai
serif.plain.japanese-x0208=Sazanami Mincho
serif.plain.korean=NanumMyeongjo
serif.bold.latin-1=DejaVu Serif Bold
serif.bold.chinese-big5=AR PL UKai
serif.bold.chinese-gb18030=AR PL UKai
serif.bold.japanese-x0208=Sazanami Mincho
serif.bold.korean=NanumMyeongjoExtraBold
serif.italic.latin-1=DejaVu Serif Italic
serif.italic.chinese-big5=AR PL UKai
serif.italic.chinese-gb18030=AR PL UKai
serif.italic.japanese-x0208=Sazanami Mincho
serif.italic.korean=NanumMyeongjo
serif.bolditalic.latin-1=DejaVu Serif Bold Italic
serif.bolditalic.chinese-big5=AR PL UKai
serif.bolditalic.chinese-gb18030=AR PL UKai
serif.bolditalic.japanese-x0208=Sazanami Mincho
serif.bolditalic.korean=NanumMyeongjoExtraBold
monospaced.plain.latin-1=DejaVu Sans Mono
monospaced.plain.chinese-big5=AR PL UMing
monospaced.plain.chinese-gb18030=AR PL UMing
monospaced.plain.japanese-x0208=Sazanami Gothic
monospaced.plain.korean=NanumGothic
monospaced.bold.latin-1=DejaVu Sans Mono Bold
monospaced.bold.chinese-big5=AR PL UMing
monospaced.bold.chinese-gb18030=AR PL UMing
monospaced.bold.japanese-x0208=Sazanami Gothic
monospaced.bold.korean=NanumGothicExtraBold
monospaced.italic.latin-1=DejaVu Sans Mono Oblique
monospaced.italic.chinese-big5=AR PL UMing
monospaced.italic.chinese-gb18030=AR PL UMing
monospaced.italic.japanese-x0208=Sazanami Gothic
monospaced.italic.korean=NanumGothic
monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
monospaced.bolditalic.chinese-big5=AR PL UMing
monospaced.bolditalic.chinese-gb18030=AR PL UMing
monospaced.bolditalic.japanese-x0208=Sazanami Gothic
monospaced.bolditalic.korean=NanumGothicExtraBold
dialoginput.plain.latin-1=DejaVu Sans Mono
dialoginput.plain.chinese-big5=AR PL UMing
dialoginput.plain.chinese-gb18030=AR PL UMing
dialoginput.plain.japanese-x0208=Sazanami Gothic
dialoginput.plain.korean=NanumGothic
dialoginput.bold.latin-1=DejaVu Sans Mono Bold
dialoginput.bold.chinese-big5=AR PL UMing
dialoginput.bold.chinese-gb18030=AR PL UMing
dialoginput.bold.japanese-x0208=Sazanami Gothic
dialoginput.bold.korean=NanumGothicExtraBold
dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
dialoginput.italic.chinese-big5=AR PL UMing
dialoginput.italic.chinese-gb18030=AR PL UMing
dialoginput.italic.japanese-x0208=Sazanami Gothic
dialoginput.italic.korean=NanumGothic
dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
dialoginput.bolditalic.chinese-big5=AR PL UMing
dialoginput.bolditalic.chinese-gb18030=AR PL UMing
dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
dialoginput.bolditalic.korean=NanumGothicExtraBold
# Search Sequences
sequence.allfonts=latin-1
sequence.allfonts.Big5=chinese-big5,latin-1
sequence.allfonts.EUC-JP=japanese-x0208,latin-1
sequence.allfonts.EUC-KR=korean,latin-1
sequence.allfonts.GB18030=chinese-gb18030,latin-1
sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean
# Font File Names
filename.DejaVu_Sans=/usr/local/share/fonts/dejavu/DejaVuSans.ttf
filename.DejaVu_Sans_Bold=/usr/local/share/fonts/dejavu/DejaVuSans-Bold.ttf
filename.DejaVu_Sans_Oblique=/usr/local/share/fonts/dejavu/DejaVuSans-Oblique.ttf
filename.DejaVu_Sans_Bold_Oblique=/usr/local/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf
filename.DejaVu_Sans_Mono=/usr/local/share/fonts/dejavu/DejaVuSansMono.ttf
filename.DejaVu_Sans_Mono_Bold=/usr/local/share/fonts/dejavu/DejaVuSansMono-Bold.ttf
filename.DejaVu_Sans_Mono_Oblique=/usr/local/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf
filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/local/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
filename.DejaVu_Serif=/usr/local/share/fonts/dejavu/DejaVuSerif.ttf
filename.DejaVu_Serif_Bold=/usr/local/share/fonts/dejavu/DejaVuSerif-Bold.ttf
filename.DejaVu_Serif_Italic=/usr/local/share/fonts/dejavu/DejaVuSerif-Italic.ttf
filename.DejaVu_Serif_Bold_Italic=/usr/local/share/fonts/dejavu/DejaVuSerif-BoldItalic.ttf
filename.AR_PL_UMing=/usr/local/share/fonts/TrueType/uming.ttc
filename.AR_PL_UKai=/usr/local/share/fonts/TrueType/ukai.ttc
filename.Sazanami_Gothic=/usr/local/share/font-sazanami/sazanami-gothic.ttf
filename.Sazanami_Mincho=/usr/local/share/font-sazanami/sazanami-mincho.ttf
filename.NanumGothic=/usr/local/share/fonts/nanum-ttf/NanumGothic.ttf
filename.NanumGothicExtraBold=/usr/local/share/fonts/nanum-ttf/NanumGothicExtraBold.ttf
filename.NanumMyeongjo=/usr/local/share/fonts/nanum-ttf/NanumMyeongjo.ttf
filename.NanumMyeongjoExtraBold=/usr/local/share/fonts/nanum-ttf/NanumMyeongjoExtraBold.ttf

115
java/openjdk6/files/icedtea/applet_hole.patch
View File

@@ -1,115 +0,0 @@
--- jdk/src/share/classes/sun/applet/AppletViewerPanel.java Fri Nov 12 12:08:44 2010 +0000
+++ jdk/src/share/classes/sun/applet/AppletViewerPanel.java Thu Dec 02 01:45:58 2010 +0000
@@ -42,25 +42,25 @@
*
* @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<String,String> atts;
/*
* JDK 1.1 serialVersionUID
@@ -70,7 +70,7 @@
/**
* Construct an applet viewer and start the applet.
*/
- AppletViewerPanel(URL documentURL, Hashtable atts) {
+ protected AppletViewerPanel(URL documentURL, Hashtable<String,String> atts) {
this.documentURL = documentURL;
this.atts = atts;
@@ -106,7 +106,7 @@
* Get an applet parameter.
*/
public String getParameter(String name) {
- return (String)atts.get(name.toLowerCase());
+ return atts.get(name.toLowerCase());
}
/**
@@ -202,12 +202,12 @@
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);
--- jdk/src/share/classes/sun/applet/AppletPanel.java Fri Nov 12 12:08:44 2010 +0000
+++ jdk/src/share/classes/sun/applet/AppletPanel.java Thu Dec 02 01:45:58 2010 +0000
@@ -68,7 +68,7 @@
/**
* The applet (if loaded).
*/
- Applet applet;
+ protected Applet applet;
/**
* Applet will allow initialization. Should be
@@ -117,7 +117,7 @@
/**
* The thread for the applet.
*/
- Thread handler;
+ protected Thread handler;
/**
@@ -162,7 +162,8 @@
* 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();
@@ -306,7 +307,7 @@
/**
* Get an event from the queue.
*/
- synchronized AppletEvent getNextEvent() throws InterruptedException {
+ protected synchronized AppletEvent getNextEvent() throws InterruptedException {
while (queue == null || queue.isEmpty()) {
wait();
}
@@ -695,7 +696,8 @@
* 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;

2667
java/openjdk6/files/icedtea/jpegclasses.patch
View File

File diff suppressed because it is too large Load Diff

12
java/openjdk6/files/patch-ZoneInfoFile.java
View File

@@ -1,12 +0,0 @@
--- jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java.orig 2012-05-01 18:59:17.000000000 -0700
+++ jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2012-05-01 19:02:16.000000000 -0700
@@ -476,7 +476,8 @@
static {
String zi = (String) AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("java.home"))
- + File.separator + "lib" + File.separator + "zi";
+ + File.separator + "lib" + File.separator + "."
+ + File.separator + "zi";
try {
zi = new File(zi).getCanonicalPath();
} catch (Exception e) {

12
java/openjdk6/files/patch-hotspot_make_bsd_makefiles_vm.make
View File

@@ -1,12 +0,0 @@
--- hotspot/make/bsd/makefiles/vm.make.orig 2016-12-30 04:31:06 UTC
+++ hotspot/make/bsd/makefiles/vm.make
@@ -119,6 +119,9 @@ LFLAGS += $(EXTRA_CFLAGS)
# Darwin is non-executable-stack by default
ifneq ($(OS_VENDOR), Darwin)
LFLAGS += -Xlinker -z -Xlinker noexecstack
+ifeq ($(Platform_arch_model), x86_32)
+LFLAGS += -Xlinker -z -Xlinker notext
+endif
endif
LIBS += -lm -pthread

11
java/openjdk6/files/patch-hotspot_src_share_vm_opto_loopPredicate.cpp
View File

@@ -1,11 +0,0 @@
--- hotspot/src/share/vm/opto/loopPredicate.cpp.orig 2017-05-30 15:21:46 UTC
+++ hotspot/src/share/vm/opto/loopPredicate.cpp
@@ -831,7 +831,7 @@ bool PhaseIdealLoop::loop_predication_impl(IdealLoopTr
Node* idx = cmp->in(1);
assert(!invar.is_invariant(idx), "index is variant");
Node* rng = cmp->in(2);
- assert(rng->Opcode() == Op_LoadRange || _igvn.type(rng)->is_int() >= 0, "must be");
+ assert(rng->Opcode() == Op_LoadRange, "must be");
assert(invar.is_invariant(rng), "range must be invariant");
int scale = 1;
Node* offset = zero;

78
java/openjdk6/files/patch-jdk_make_tools_freetypecheck_freetypecheck.c
View File

@@ -1,78 +0,0 @@
--- ./jdk/make/tools/freetypecheck/freetypecheck.c.orig 2016-12-29 23:30:31.000000000 -0500
+++ ./jdk/make/tools/freetypecheck/freetypecheck.c 2019-05-29 18:29:32.876811000 -0400
@@ -32,26 +32,65 @@
#define QUOTEMACRO(x) QUOTEME(x)
#define QUOTEME(x) #x
+int compare_versions(FT_Int req_major, FT_Int req_minor, FT_Int req_patch,
+ FT_Int major, FT_Int minor, FT_Int patch) {
+ if (major > req_major) {
+ printf("Major version %d greater than required major version %d\n",
+ major, req_major);
+ return 0;
+ }
+ if (major < req_major) {
+ printf("Major version %d less than required major version %d\n",
+ major, req_major);
+ return -1;
+ }
+ printf("Major version %d equal to required major version %d\n",
+ major, req_major);
+ if (minor > req_minor) {
+ printf("Minor version %d greater than required minor version %d\n",
+ minor, req_minor);
+ return 0;
+ }
+ if (minor < req_minor) {
+ printf("Minor version %d less than required minor version %d\n",
+ minor, req_minor);
+ return -2;
+ }
+ printf("Minor version %d equal to required minor version %d\n",
+ minor, req_minor);
+ if (patch >= req_patch) {
+ printf("Patch version %d greater than or equal to required patch version %d\n",
+ patch, req_patch);
+ return 0;
+ }
+ printf("Patch version %d less than required patch version %d\n",
+ patch, req_patch);
+ return -3;
+}
+
int main(int argc, char** argv) {
- char v[50];
- FT_Int major, minor, patch;
+ FT_Int major, minor, patch, req_major, req_minor, req_patch;
FT_Library library;
- sprintf(v, "%d.%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
- printf("Required version of freetype: %s\n",
- QUOTEMACRO(REQUIRED_FREETYPE_VERSION));
+ sscanf(QUOTEMACRO(REQUIRED_FREETYPE_VERSION),
+ "%d.%d.%d", &req_major, &req_minor, &req_patch);
+ printf("Required version of freetype: %d.%d.%d\n",
+ req_major, req_minor, req_patch);
- printf("Detected freetype headers: %s\n", v);
- if (strcmp(v, QUOTEMACRO(REQUIRED_FREETYPE_VERSION)) < 0) {
+ printf("Detected freetype headers: %d.%d.%d\n",
+ FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
+ if (compare_versions(req_major, req_minor, req_patch,
+ FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH) < 0) {
printf("Failed: headers are too old.\n");
}
FT_Init_FreeType(&library);
FT_Library_Version(library, &major, &minor, &patch);
- sprintf(v, "%d.%d.%d", major, minor, patch);
- printf("Detected freetype library: %s\n", v);
- if (strcmp(v, QUOTEMACRO(REQUIRED_FREETYPE_VERSION)) < 0) {
+ printf("Detected freetype library: %d.%d.%d\n",
+ major, minor, patch);
+ if (compare_versions(req_major, req_minor, req_patch,
+ major, minor, patch) < 0) {
printf("Failed: too old library.\n");
}

15376
java/openjdk6/files/patch-set
View File

File diff suppressed because it is too large Load Diff

206
java/openjdk6/files/patch-test
View File

@@ -1,206 +0,0 @@
--- jdk/test/TestEnv.java
+++ jdk/test/TestEnv.java
@@ -65,14 +65,14 @@
// Reachable host with the following services running:
// - echo service (port 7)
// - day time port (port 13)
- { "host", "javaweb.sfbay.sun.com" },
+ { "host", "icedtea.classpath.org" },
// Reachable host that refuses connections to port 80
- { "refusing_host", "jano1.sfbay.sun.com" },
+ { "refusing_host", "ns1.gnu.org" },
// Reachable host that is of sufficient hops away that a connection
// takes a while to be established (connect doesn't complete immediatly)
- { "far_host", "irejano.ireland.sun.com" },
+ { "far_host", "developer.classpath.org" },
// Hostname that cannot be resolved by named service
{ "unresovable_host", "blah-blah.blah-blah.blah" },
--- jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh
+++ jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh
@@ -72,6 +72,16 @@
done
}
+freebsd_swap_size()
+{
+ total_swap=0
+ for i in `/usr/sbin/swapinfo -k | awk '{print $2}' | grep -v blocks`
+ do
+ # swapinfo -k returns size in blocks of 1024 bytes.
+ total_swap=`expr $i \* 1024 + $total_swap`
+ done
+}
+
# Test GetTotalSwapSpaceSize if we are running on Unix
total_swap=0
case `uname -s` in
@@ -80,7 +90,7 @@
runOne GetTotalSwapSpaceSize $total_swap
;;
FreeBSD )
- total_swap=`free -b | grep -i swap | awk '{print $2}'`
+ freebsd_swap_size
runOne GetTotalSwapSpaceSize $total_swap
;;
* )
--- jdk/test/java/io/File/GetXSpace.java
+++ jdk/test/java/io/File/GetXSpace.java
@@ -49,7 +49,7 @@
private static final String name = System.getProperty("os.name");
private static final String dfFormat;
static {
- if (name.equals("SunOS") || name.equals("Linux")) {
+ if (name.equals("FreeBSD") || name.equals("SunOS") || name.equals("Linux")) {
// FileSystem Total Used Available Use% MountedOn
dfFormat = "([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s]+)";
} else if (name.startsWith("Windows")) {
--- jdk/test/java/lang/ProcessBuilder/Basic.java
+++ jdk/test/java/lang/ProcessBuilder/Basic.java
@@ -1096,7 +1096,7 @@
String[] cmdp = childArgs.toArray(new String[childArgs.size()]);
String[] envp = {"=ExitValue=3", "=C:=\\"};
Process p = Runtime.getRuntime().exec(cmdp, envp);
- String expected = Windows.is() ? "=C:=\\,=ExitValue=3," : "=C:=\\,";
+ String expected = Windows.is() ? "=C:=\\,=ExitValue=3," : "";
equal(commandOutput(p), expected);
if (Windows.is()) {
ProcessBuilder pb = new ProcessBuilder(childArgs);
--- jdk/test/java/lang/ProcessBuilder/Zombies.java
+++ jdk/test/java/lang/ProcessBuilder/Zombies.java
@@ -49,11 +49,11 @@
} catch (IOException _) {/* OK */}
try {
- rt.exec("/bin/true", null, new File("no-such-dir"));
+ rt.exec("/usr/bin/true", null, new File("no-such-dir"));
throw new Error("expected IOException not thrown");
} catch (IOException _) {/* OK */}
- rt.exec("/bin/true").waitFor();
+ rt.exec("/usr/bin/true").waitFor();
// Count all the zombies that are children of this Java process
final String[] zombieCounter = {
--- jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java
+++ jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java
@@ -79,7 +79,7 @@
System.out.println("Test passed.");
}
- private static String LOAD_AVERAGE_TEXT = "load average:";
+ private static String LOAD_AVERAGE_TEXT = "load averages:";
private static void checkLoadAvg() throws Exception {
// Obtain load average from OS command
ProcessBuilder pb = new ProcessBuilder("/usr/bin/uptime");
--- jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java
+++ jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java
@@ -79,7 +79,7 @@
* on Windows, too.
*/
private static int countOpenFD() {
- File dirOfFD = new File("/proc/self/fd");
+ File dirOfFD = new File("/dev/fd");
File[] fds = dirOfFD.listFiles();
if (fds != null)
--- jdk/test/java/nio/channels/SocketChannel/LocalAddress.java
+++ jdk/test/java/nio/channels/SocketChannel/LocalAddress.java
@@ -40,7 +40,7 @@
InetAddress bogus = InetAddress.getByName("0.0.0.0");
SocketChannel sc = SocketChannel.open();
InetSocketAddress saddr = new InetSocketAddress(
- InetAddress.getByName(TestEnv.getProperty("host")), 23);
+ InetAddress.getByName(TestEnv.getProperty("host")), 7);
//Test1: connect only
sc.connect(saddr);
--- jdk/test/java/nio/channels/SocketChannel/Shutdown.java
+++ jdk/test/java/nio/channels/SocketChannel/Shutdown.java
@@ -35,7 +35,7 @@
public static void main(String args[]) throws Exception {
InetSocketAddress sa = new InetSocketAddress(
- InetAddress.getByName(TestEnv.getProperty("host")), 23);
+ InetAddress.getByName(TestEnv.getProperty("host")), 7);
SocketChannel sc = SocketChannel.open(sa);
boolean before = sc.socket().isInputShutdown();
sc.socket().shutdownInput();
--- jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c
+++ jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c
@@ -135,7 +135,7 @@
}
close(thisFd);
- if ((dp = opendir("/proc/self/fd")) == NULL) {
+ if ((dp = opendir("/dev/fd")) == NULL) {
_exit(-1);
}
--- jdk/test/java/nio/charset/Charset/default.sh
+++ jdk/test/java/nio/charset/Charset/default.sh
@@ -76,22 +76,20 @@
}
-go en_US iso-8859-1
-go ja_JP.utf8 utf-8
-go tr_TR iso-8859-9
-go C us-ascii
+go en_US iso-8859-1
+go ja_JP.UTF-8 utf-8
+go tr_TR.ISO-8859-9 iso-8859-9
+go C iso-8859-1
+# FreeBSD
if [ "$s" = FreeBSD ]; then
- go ja_JP x-euc-jp-linux
- go ja_JP.eucjp x-euc-jp-linux
- go ja_JP.ujis x-euc-jp-linux
- go ja_JP.utf8 utf-8
+ go ja_JP.eucJP euc-jp
+ go ja_JP.SJIS shift_jis
fi
# Solaris
if [ "$s" = SunOS ]; then
- go ja x-eucjp-open
- go ja_JP.eucJP x-eucjp-open
- go ja_JP.PCK x-PCK
- go ja_JP.UTF-8 utf-8
+ go ja x-eucjp-open
+ go ja_JP.eucJP x-eucjp-open
+ go ja_JP.PCK x-PCK
fi
--- jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh
+++ jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh
@@ -33,7 +33,7 @@
# The host that we try to resolve
-HOST=webcache.sfbay.sun.com
+HOST=developer.classpath.org
# fail gracefully if DNS is not configured or there
# isn't a CNAME record.
--- jdk/test/tools/pack200/MemoryAllocatorTest.java
+++ jdk/test/tools/pack200/MemoryAllocatorTest.java
@@ -81,6 +81,7 @@
static final boolean debug = Boolean.getBoolean("MemoryAllocatorTest.Debug");
static final boolean WINDOWS = System.getProperty("os.name").startsWith("Windows");
+ static final boolean FREEBSD = System.getProperty("os.name").startsWith("FreeBSD");
static final boolean LINUX = System.getProperty("os.name").startsWith("Linux");
static final boolean SIXTYFOUR_BIT = System.getProperty("sun.arch.data.model", "32").equals("64");
static final private int NATIVE_EXPECTED_EXIT_CODE = (WINDOWS) ? -1 : 255;
@@ -425,7 +426,7 @@
* the error message is not accurate for us to discern if the test
* passes successfully.
*/
- if (SIXTYFOUR_BIT && (LINUX || WINDOWS)) {
+ if (SIXTYFOUR_BIT && (FREEBSD || LINUX || WINDOWS)) {
System.out.println("Warning: Windows/Linux 64bit tests passes vacuously");
return;
}

45
java/openjdk6/files/test_gamma-disable.patch
View File

@@ -1,45 +0,0 @@
--- hotspot/make/bsd/Makefile
+++ hotspot/make/bsd/Makefile
@@ -287,42 +288,36 @@
$(TARGETS_C2): $(SUBDIRS_C2)
cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
ifdef INSTALL
cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
endif
$(TARGETS_TIERED): $(SUBDIRS_TIERED)
cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
ifdef INSTALL
cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
endif
$(TARGETS_C1): $(SUBDIRS_C1)
cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
ifdef INSTALL
cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
endif
$(TARGETS_CORE): $(SUBDIRS_CORE)
cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
ifdef INSTALL
cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
endif
$(TARGETS_ZERO): $(SUBDIRS_ZERO)
cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
ifdef INSTALL
cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
endif
$(TARGETS_SHARK): $(SUBDIRS_SHARK)
cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
ifdef INSTALL
cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
endif

7
java/openjdk6/pkg-descr
View File

@@ -1,7 +0,0 @@
OpenJDK is an open-source implementation of the Java Platform, Standard Edition.
Much of the OpenJDK code is licensed under the GPL version 2 with the
Classpath exception. The Java Hotspot virtual machine source code is
licensed under the GPL version 2 only.
WWW: https://openjdk.java.net/

18
java/openjdk6/pkg-message
View File

@@ -1,18 +0,0 @@
[
{ type: install
message: <<EOM
This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
procfs(5) mounted on /proc.
If you have not done it yet, please do the following:
mount -t fdescfs fdesc /dev/fd
mount -t procfs proc /proc
To make it permanent, you need the following lines in /etc/fstab:
fdesc /dev/fd fdescfs rw 0 0
proc /proc procfs rw 0 0
EOM
}
]