diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
| commit | 29747f458a1eb2ce23b4594b09d0256dd62760b8 (patch) | |
| tree | 1b71ba5d9ffdd308b6c18130f7c116f5bab5dc12 /java/jdk16 | |
| parent | 7aad84f808b93baa6a7077ce0b47573b9c4c79a0 (diff) | |
| download | ports-29747f458a1eb2ce23b4594b09d0256dd62760b8.tar.gz ports-29747f458a1eb2ce23b4594b09d0256dd62760b8.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)
Notes
Notes:
svn path=/head/; revision=175261
Diffstat (limited to 'java/jdk16')
| -rw-r--r-- | java/jdk16/Makefile | 4 | ||||
| -rw-r--r-- | java/jdk16/files/pkg-deinstall.in | 2 | ||||
| -rw-r--r-- | java/jdk16/files/pkg-install.in | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index feb89cff29c6..948ad8bf8a3d 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/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/jdk16/files/pkg-deinstall.in b/java/jdk16/files/pkg-deinstall.in index 85c89b9d0a51..167d5bd28893 100644 --- a/java/jdk16/files/pkg-deinstall.in +++ b/java/jdk16/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/jdk16/files/pkg-install.in b/java/jdk16/files/pkg-install.in index 5868aca50c32..c5f4a70db1df 100644 --- a/java/jdk16/files/pkg-install.in +++ b/java/jdk16/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 |