diff options
| author | marcus <marcus@FreeBSD.org> | 2006-10-14 16:54:54 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2006-10-14 16:54:54 +0800 |
| commit | 0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8 (patch) | |
| tree | 17937489af4c767844fc63b684ae3e7b31948812 /java/jdk15 | |
| parent | e959473966b963953d63d5f00fae8751f2decf0f (diff) | |
| download | freebsd-ports-graphics-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.gz freebsd-ports-graphics-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.zst freebsd-ports-graphics-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.zip | |
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.
Submitted by: mezz, ahze, pav, and many others
Approved by: portmgr (implicit, kris)
Diffstat (limited to 'java/jdk15')
| -rw-r--r-- | java/jdk15/Makefile | 4 | ||||
| -rw-r--r-- | java/jdk15/files/pkg-deinstall.in | 2 | ||||
| -rw-r--r-- | java/jdk15/files/pkg-install.in | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index feb89cff29c..948ad8bf8a3 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk15.html @@ -104,7 +104,7 @@ USE_GECKO= mozilla # firefox and seamonkey do not work .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" MAKE_ENV+= BROWSER=${GECKO} USE_GNOME= desktopfileutils -MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${X11BASE}/include" +MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${LOCALBASE}/include" .endif ONLY_FOR_ARCHS= i386 amd64 diff --git a/java/jdk15/files/pkg-deinstall.in b/java/jdk15/files/pkg-deinstall.in index 85c89b9d0a5..167d5bd2889 100644 --- a/java/jdk15/files/pkg-deinstall.in +++ b/java/jdk15/files/pkg-deinstall.in @@ -12,7 +12,7 @@ fi # Remove the plugin # Plugin location variables -BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins" +BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins" JAVAPLUGINDIR="%%JRE_HOME%%/plugin/%%ARCH%%/ns7" PLUGIN=libjavaplugin_oji.so diff --git a/java/jdk15/files/pkg-install.in b/java/jdk15/files/pkg-install.in index 5868aca50c3..c5f4a70db1d 100644 --- a/java/jdk15/files/pkg-install.in +++ b/java/jdk15/files/pkg-install.in @@ -20,7 +20,7 @@ if [ "$2" = "POST-INSTALL" ]; then fi # Install the plugin - BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins" + BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins" JAVAPLUGINDIR="${JRE_HOME}/plugin/%%ARCH%%/ns7" PLUGIN=libjavaplugin_oji.so |