From 898158d06ad74f538c707447443f3884641ca4e0 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Mon, 24 Jul 2000 08:05:49 +0000 Subject: Define int_t and uint_t on CURRENT too. This should fix tya and shujit on -current systems. --- java/jdk/Makefile | 1 + java/jdk/files/patch-aa | 11 +++++++++++ java/jdk11/Makefile | 1 + java/jdk11/files/patch-aa | 11 +++++++++++ 4 files changed, 24 insertions(+) create mode 100644 java/jdk/files/patch-aa create mode 100644 java/jdk11/files/patch-aa diff --git a/java/jdk/Makefile b/java/jdk/Makefile index fd3b8d241530..107201742b76 100644 --- a/java/jdk/Makefile +++ b/java/jdk/Makefile @@ -33,6 +33,7 @@ DISTFILES= jdk${JDK_VERSION}_ELF.V1999-11-9.tar.gz .endif do-install: + @${RM} -f ${WRKSRC}/include/freebsd/typedefs_md.h.orig ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} (cd ${WRKSRC} && ${TAR} -c -f - .) \ | (cd ${PREFIX}/jdk${JDK_VERSION} && ${TAR} --unlink -x -f -) diff --git a/java/jdk/files/patch-aa b/java/jdk/files/patch-aa new file mode 100644 index 000000000000..2b0cbaab8aae --- /dev/null +++ b/java/jdk/files/patch-aa @@ -0,0 +1,11 @@ +--- include/freebsd/typedefs_md.h 2000/07/24 07:46:26 1.1 ++++ include/freebsd/typedefs_md.h 2000/07/24 07:46:46 +@@ -33,7 +33,7 @@ + */ + #define _ILP32 + +-#if (__FreeBSD__ <= 4) ++#if (__FreeBSD__ <= 5) + typedef unsigned int uint_t; + typedef int int_t; + #endif diff --git a/java/jdk11/Makefile b/java/jdk11/Makefile index fd3b8d241530..107201742b76 100644 --- a/java/jdk11/Makefile +++ b/java/jdk11/Makefile @@ -33,6 +33,7 @@ DISTFILES= jdk${JDK_VERSION}_ELF.V1999-11-9.tar.gz .endif do-install: + @${RM} -f ${WRKSRC}/include/freebsd/typedefs_md.h.orig ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} (cd ${WRKSRC} && ${TAR} -c -f - .) \ | (cd ${PREFIX}/jdk${JDK_VERSION} && ${TAR} --unlink -x -f -) diff --git a/java/jdk11/files/patch-aa b/java/jdk11/files/patch-aa new file mode 100644 index 000000000000..2b0cbaab8aae --- /dev/null +++ b/java/jdk11/files/patch-aa @@ -0,0 +1,11 @@ +--- include/freebsd/typedefs_md.h 2000/07/24 07:46:26 1.1 ++++ include/freebsd/typedefs_md.h 2000/07/24 07:46:46 +@@ -33,7 +33,7 @@ + */ + #define _ILP32 + +-#if (__FreeBSD__ <= 4) ++#if (__FreeBSD__ <= 5) + typedef unsigned int uint_t; + typedef int int_t; + #endif -- cgit v1.2.3