diff options
| author | glewis <glewis@FreeBSD.org> | 2010-02-23 11:31:03 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2010-02-23 11:31:03 +0800 |
| commit | f536261a2b56bbe2e54721e42f218a1b248e3817 (patch) | |
| tree | 6c90e815f4cdd64cb707ca5dcb1c0c25372011e8 /java | |
| parent | 4eff1e12cd784fb4210a3aafa4c0ef6a67517faf (diff) | |
| download | freebsd-ports-gnome-f536261a2b56bbe2e54721e42f218a1b248e3817.tar.gz freebsd-ports-gnome-f536261a2b56bbe2e54721e42f218a1b248e3817.tar.zst freebsd-ports-gnome-f536261a2b56bbe2e54721e42f218a1b248e3817.zip | |
. Add ${LOCALBASE}/lib to the default library path. [1]
. Add a runtime dependency on javavmwrapper. [2]
PR: 144076 [2]
Submitted by: ale@ [1]
Feature safe: yes
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk7/Makefile | 10 | ||||
| -rw-r--r-- | java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp | 13 |
2 files changed, 20 insertions, 3 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 79f1d9b60228..33fad5b345e8 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -7,6 +7,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_BUILD_NUMBER} +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk7/promoted/b${JDK_BUILD_NUMBER}/ \ ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} @@ -37,9 +38,10 @@ USE_ICONV= YES USE_XORG+= x11 xext xi xrender xt xtst LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 -BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip -BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client +BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ + unzip:${PORTSDIR}/archivers/unzip \ + ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client +RUN_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/} INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION} @@ -112,6 +114,8 @@ post-extract: done post-patch: + @${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \ + ${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp @${REINPLACE_CMD} 's|build-policy install-limited|build-policy install-unlimited|' \ ${WRKSRC}/jdk/make/javax/crypto/Makefile 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 new file mode 100644 index 000000000000..b2f8297af0ed --- /dev/null +++ b/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2010-02-21 20:07:54.000000000 -0800 ++++ hotspot/src/os/bsd/vm/os_bsd.cpp 2010-02-21 20:08:41.000000000 -0800 +@@ -358,7 +358,7 @@ + * 7: The default directories, normally /lib and /usr/lib. + */ + #ifndef DEFAULT_LIBPATH +-#define DEFAULT_LIBPATH "/lib:/usr/lib" ++#define DEFAULT_LIBPATH "/lib:/usr/lib:%%LOCALBASE%%/lib" + #endif + + #define EXTENSIONS_DIR "/lib/ext" |