mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

. Update to 7u45.

Browse Source
This commit is contained in:
Greg Lewis 2013-12-08 04:11:54 +00:00
parent 665c8c2480
commit c010f08a58
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=335863
5 changed files with 44395 additions and 149527 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
java/openjdk7/Makefile
View File

@ -3,7 +3,6 @@
PORTNAME= openjdk PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
PORTREVISION= 2
CATEGORIES= java devel CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
http://download.java.net/jaxp/1.4.5/:jaxp \ http://download.java.net/jaxp/1.4.5/:jaxp \
@ -38,12 +37,12 @@ DEBUG_DESC= Enable extra debugging info
POLICY_DESC= Install the Unlimited Strength Policy Files POLICY_DESC= Install the Unlimited Strength Policy Files
TZUPDATE_DESC= Update the time zone data TZUPDATE_DESC= Update the time zone data
PORT_MINOR_VERSION= 25 PORT_MINOR_VERSION= 45
PORT_BUILD_NUMBER= 15 PORT_BUILD_NUMBER= 18
JDK_MAJOR_VERSION= 7 JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 6 JDK_MINOR_VERSION= 40
JDK_BUILD_NUMBER= 24 JDK_BUILD_NUMBER= 43
JDK_BUILD_DATE= 09_aug_2012 JDK_BUILD_DATE= 26_aug_2013
JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE} JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
# Use our own version of ant to avoid circular dependencies # Use our own version of ant to avoid circular dependencies
@ -104,19 +103,6 @@ BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk7 \
${LOCALBASE}/openjdk6 \ ${LOCALBASE}/openjdk6 \
${LOCALBASE}/bootstrap-openjdk ${LOCALBASE}/bootstrap-openjdk
SECURITY_ICONS= security-icon-bw16.png \
security-icon-bw24.png \
security-icon-bw32.png \
security-icon-bw48.png \
security-icon-interim16.png \
security-icon-interim24.png \
security-icon-interim32.png \
security-icon-interim48.png \
security-icon-yellow16.png \
security-icon-yellow24.png \
security-icon-yellow32.png \
security-icon-yellow48.png
NO_STAGE= yes NO_STAGE= yes
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
@ -146,14 +132,6 @@ PATCH_DEPENDS+= gpatch:${PORTSDIR}/devel/patch
PATCH= gpatch PATCH= gpatch
.endif .endif
post-extract:
# Move icons to their new home.
@${MKDIR} ${WRKSRC}/jdk/src/share/classes/sun/awt/resources
.for icon in ${SECURITY_ICONS}
@${MV} ${WRKSRC}/jdk/src/solaris/classes/sun/awt/X11/${icon} \
${WRKSRC}/jdk/src/share/classes/sun/awt/resources/
.endfor
post-patch: post-patch:
@${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \ @${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \
${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp ${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp

4
java/openjdk7/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = 22aec9bcc660d2e6502c9d24e5fdac97da9c4d251dafd87f708bcf6dabbbb431 SHA256 (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 00f8ea561876cbcad174ba3ca7a9ae10b50df46a782ac64c2ac57ac357b50596
SIZE (openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = 103796914 SIZE (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196
SHA256 (apache-ant-1.8.4-bin.zip) = d49d60bc0468279125e4a0db4d9b6637cab342a4bd736c90c0b71865b26c1479 SHA256 (apache-ant-1.8.4-bin.zip) = d49d60bc0468279125e4a0db4d9b6637cab342a4bd736c90c0b71865b26c1479
SIZE (apache-ant-1.8.4-bin.zip) = 8043520 SIZE (apache-ant-1.8.4-bin.zip) = 8043520

61219
java/openjdk7/files/patch-set
View File

File diff suppressed because it is too large Load Diff

132659
java/openjdk7/files/patch-set-jdk
View File

File diff suppressed because it is too large Load Diff

8
java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp
View File

@ -11,11 +11,3 @@ $FreeBSD$
#endif #endif
#define EXTENSIONS_DIR "/lib/ext" #define EXTENSIONS_DIR "/lib/ext"
@@ -3670,6 +3670,7 @@
return OS_OK;
#elif defined(__FreeBSD__)
int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
+ return (ret == 0) ? OS_OK : OS_ERR;
#elif defined(__APPLE__) || defined(__NetBSD__)
struct sched_param sp;
int policy;