sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to patchset 11.

Browse source
This commit is contained in:
Greg Lewis 2002-09-18 10:12:03 +00:00
parent aa4260e863
commit 957134d737
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=66575
4 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
java/jdk12/Makefile
View file

@ -11,7 +11,7 @@ CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk.html # http://www.eyesbeyond.com/freebsddom/java/jdk.html
DISTFILES= ${PORTNAME}${JDK_VERSION:S/./_/g}-src${EXTRACT_SUFX} \ DISTFILES= ${PORTNAME}${JDK_VERSION:S/./_/g}-src${EXTRACT_SUFX} \
freebsd-jdk122-patches-${JDK_PATCHSET_VERSION}.tar.gz bsd-jdk122-patches-${JDK_PATCHSET_VERSION}.tar.gz
MAINTAINER= glewis@FreeBSD.org MAINTAINER= glewis@FreeBSD.org
@ -28,10 +28,10 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \ ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts ${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
WRKSRC= ${WRKDIR}/build/freebsd WRKSRC= ${WRKDIR}/build/bsd
JDK_VERSION= 1.2.2 JDK_VERSION= 1.2.2
JDK_PATCHSET_VERSION= 10 JDK_PATCHSET_VERSION= 11
JDK11DIR?= ${LOCALBASE}/jdk1.1.8 JDK11DIR?= ${LOCALBASE}/jdk1.1.8
JFC11DIR?= ${WRKDIRPREFIX}${.CURDIR}/../../java/jfc/work/swing-1.1.1fcs JFC11DIR?= ${WRKDIRPREFIX}${.CURDIR}/../../java/jfc/work/swing-1.1.1fcs
@ -55,7 +55,7 @@ MAKE_ENV= HAVE_DPS="no" \
CLASSPATH="" \ CLASSPATH="" \
JAVA_COMPILER="" JAVA_COMPILER=""
ALL_TARGET= release-images ALL_TARGET= release-images
PATCH_CMD= ${PATCH} -p1 -s < PATCH_CMD= ${PATCH} -p1 <
PLIST_SUB+= JDK_VERSION=${JDK_VERSION} PLIST_SUB+= JDK_VERSION=${JDK_VERSION}
JDKIMAGEDIR= ${WRKSRC}/jdk-image-i386 JDKIMAGEDIR= ${WRKSRC}/jdk-image-i386
@ -86,11 +86,11 @@ IGNORE=You must manually fetch the source distribution and FreeBSD patches (${DI
pre-patch: pre-patch:
@${MKDIR} ${WRKSRC} @${MKDIR} ${WRKSRC}
.for dir in build src ext/i18n/build ext/i18n/src ext/iiimp/build .for dir in build src ext/i18n/build ext/i18n/src ext/iiimp/build
@cd ${WRKDIR}/${dir} && ${RM} -rf freebsd && ${CP} -R solaris freebsd @cd ${WRKDIR}/${dir} && ${RM} -rf bsd && ${CP} -R solaris bsd
.endfor .endfor
@cd ${WRKSRC} && ${PATCH_CMD} ${WRKDIR}/build.patches && \ @cd ${WRKSRC} && ${PATCH_CMD} ${WRKDIR}/build.patches && \
cd ../share && ${PATCH_CMD} ${WRKDIR}/buildshare.patches && \ cd ../share && ${PATCH_CMD} ${WRKDIR}/buildshare.patches && \
cd ../../src/freebsd && ${PATCH_CMD} ${WRKDIR}/src.patches && \ cd ../../src/bsd && ${PATCH_CMD} ${WRKDIR}/src.patches && \
cd ../share && ${PATCH_CMD} ${WRKDIR}/srcshare.patches && \ cd ../share && ${PATCH_CMD} ${WRKDIR}/srcshare.patches && \
cd ../../ext && ${PATCH_CMD} ${WRKDIR}/ext.patches cd ../../ext && ${PATCH_CMD} ${WRKDIR}/ext.patches
@${MKDIR} ${WRKSRC}/1.1_libs @${MKDIR} ${WRKSRC}/1.1_libs

2
java/jdk12/distinfo
View file

@ -1,2 +1,2 @@
MD5 (jdk1_2_2-src.tar.gz) = 84a81b3e5f56f73bd4cbee57f895dba7 MD5 (jdk1_2_2-src.tar.gz) = 84a81b3e5f56f73bd4cbee57f895dba7
MD5 (freebsd-jdk122-patches-10.tar.gz) = 7c01d281b3ac9d5f5f3036749f79492e MD5 (bsd-jdk122-patches-11.tar.gz) = 7a883419c5193278443d60f67a99a72c

15
java/jdk12/files/patch-aa
View file

@ -1,21 +1,20 @@
--- makefiles/Defs-freebsd.gmk 2000/10/13 00:16:56 1.1 $FreeBSD$
+++ makefiles/Defs-freebsd.gmk 2000/10/13 00:20:36
@@ -59,11 +59,11 @@ --- makefiles/Defs-bsd.gmk 2000/10/13 00:16:56 1.1
+++ makefiles/Defs-bsd.gmk 2000/10/13 00:20:36
@@ -59,10 +59,10 @@
GCC_STYLE = -Wmissing-prototypes -Wmissing-declarations -Wnested-externs GCC_STYLE = -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(GCC_INHIBIT) GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(GCC_INHIBIT)
CFLAGS_COMMON = $(GCC_WARNINGS) -pipe CFLAGS_COMMON = $(GCC_WARNINGS) -pipe
-CFLAGS_OPT = $(POPT) -fomit-frame-pointer # -mcpu=i686 -CFLAGS_OPT = $(POPT) -fomit-frame-pointer # -mcpu=i686
-CFLAGS_DBG = -g
+CFLAGS_OPT = $(POPT) $(SYS_CFLAGS) #-fomit-frame-pointer # -mcpu=i686 +CFLAGS_OPT = $(POPT) $(SYS_CFLAGS) #-fomit-frame-pointer # -mcpu=i686
+CFLAGS_DBG = -g3 CFLAGS_DBG = -g3
CXXFLAGS_COMMON = $(GCC_WARNINGS) -pipe -DFD_SETSIZE=2048 CXXFLAGS_COMMON = $(GCC_WARNINGS) -pipe -DFD_SETSIZE=2048
-CXXFLAGS_OPT = $(POPT) -fomit-frame-pointer # -mcpu=i686 -CXXFLAGS_OPT = $(POPT) -fomit-frame-pointer # -mcpu=i686
-CXXFLAGS_DBG = -g
+CXXFLAGS_OPT = $(POPT) $(SYS_CFLAGS) #-fomit-frame-pointer # -mcpu=i686 +CXXFLAGS_OPT = $(POPT) $(SYS_CFLAGS) #-fomit-frame-pointer # -mcpu=i686
+CXXFLAGS_DBG = -g3 CXXFLAGS_DBG = -g3
endif endif
ifneq ($(CC_VERSION), gcc)
@@ -232,7 +232,7 @@ @@ -232,7 +232,7 @@
_OPT = -xO4 _OPT = -xO4
else else

7
java/jdk12/pkg-plist
View file

@ -708,6 +708,9 @@ jdk%%JDK_VERSION%%/jre/lib/i386/libcmm.so.1.2.2
jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr.so jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr.so
jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr.so.1.2.2 jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr.so.1.2.2
%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdcpr_g.so
jdk%%JDK_VERSION%%/jre/lib/i386/libdt_socket.so
jdk%%JDK_VERSION%%/jre/lib/i386/libdt_socket.so.1.2.2
%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libdt_socket_g.so
jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager.so jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager.so
jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager.so.1.2.2 jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager.so.1.2.2
%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libfontmanager_g.so
@ -717,6 +720,9 @@ jdk%%JDK_VERSION%%/jre/lib/i386/libhprof.so.1.2.2
jdk%%JDK_VERSION%%/jre/lib/i386/libjava.so jdk%%JDK_VERSION%%/jre/lib/i386/libjava.so
jdk%%JDK_VERSION%%/jre/lib/i386/libjava.so.1.2.2 jdk%%JDK_VERSION%%/jre/lib/i386/libjava.so.1.2.2
%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjava_g.so
jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp.so
jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp.so.1.2.2
%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjdwp_g.so
jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg.so jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg.so
jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg.so.1.2.2 jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg.so.1.2.2
%%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg_g.so %%DEBUG:%%jdk%%JDK_VERSION%%/jre/lib/i386/libjpeg_g.so
@ -752,6 +758,7 @@ jdk%%JDK_VERSION%%/jre/lib/security/cacerts
jdk%%JDK_VERSION%%/jre/lib/security/java.policy jdk%%JDK_VERSION%%/jre/lib/security/java.policy
jdk%%JDK_VERSION%%/jre/lib/security/java.security jdk%%JDK_VERSION%%/jre/lib/security/java.security
jdk%%JDK_VERSION%%/lib/dt.jar jdk%%JDK_VERSION%%/lib/dt.jar
jdk%%JDK_VERSION%%/lib/jpda.jar
jdk%%JDK_VERSION%%/lib/tools.jar jdk%%JDK_VERSION%%/lib/tools.jar
jdk%%JDK_VERSION%%/src.jar jdk%%JDK_VERSION%%/src.jar
@exec mkdir -p %D/share/java/classes @exec mkdir -p %D/share/java/classes