summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2006-10-14 08:54:54 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2006-10-14 08:54:54 +0000
commit29747f458a1eb2ce23b4594b09d0256dd62760b8 (patch)
tree1b71ba5d9ffdd308b6c18130f7c116f5bab5dc12 /java
parent- Add goocanvas (diff)
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')
-rw-r--r--java/eclipse/Makefile27
-rw-r--r--java/eclipse/files/eclipse.in2
-rw-r--r--java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh6
-rw-r--r--java/jdk13/Makefile6
-rw-r--r--java/jdk15/Makefile4
-rw-r--r--java/jdk15/files/pkg-deinstall.in2
-rw-r--r--java/jdk15/files/pkg-install.in2
-rw-r--r--java/jdk16/Makefile4
-rw-r--r--java/jdk16/files/pkg-deinstall.in2
-rw-r--r--java/jdk16/files/pkg-install.in2
10 files changed, 28 insertions, 29 deletions
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index a1304b686824..3c818b7d0b4f 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -42,19 +42,6 @@ USE_ICONV= yes
USE_MOTIF= yes
.else
ECLIPSE_WS= gtk
-.if !defined(WITHOUT_MOZILLA)
-MAKE_MOZILLA= make_mozilla
-.if defined(WITH_MOZILLA) && ${WITH_MOZILLA} != "mozilla"
-BROWSER= ${WITH_MOZILLA}
-BUILD_DEPENDS+= ${BROWSER}:${PORTSDIR}/www/${BROWSER}
-.else
-BUILD_DEPENDS+= mozilla:${PORTSDIR}/www/mozilla
-BROWSER= mozilla
-.endif
-.else
-BROWSER=
-MAKE_MOZILLA=
-.endif
.if defined(WITHOUT_CAIRO)
MAKE_CAIRO=
.else
@@ -81,6 +68,17 @@ ECLIPSE_ARCH= x86
ECLIPSE_SWT= gtk
.endif
+.if !defined(WITHOUT_MOZILLA)
+MAKE_MOZILLA= make_mozilla
+USE_GECKO= firefox mozilla seamonkey xulrunner
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
+BROWSER= ${GECKO}
+USE_LDCONFIG= yes
+.else
+BROWSER=
+MAKE_MOZILLA=
+.endif
+
MAKE_ENV+= BROWSER=${BROWSER} \
ECLIPSE_ARCH=${ECLIPSE_ARCH} \
ECLIPSE_OS=${ECLIPSE_OS} \
@@ -90,7 +88,8 @@ MAKE_ENV+= BROWSER=${BROWSER} \
MAKE_MOZILLA=${MAKE_MOZILLA} \
MAKE_CAIRO=${MAKE_CAIRO} \
MACHINE_ARCH=${MACHINE_ARCH} \
- MOTIF_HOME=${X11_HOME}
+ MOTIF_HOME=${X11_HOME} \
+ GECKO_CONFIG=${GECKO_CONFIG}
PLIST_FILES= bin/eclipse share/applications/eclipse.desktop
diff --git a/java/eclipse/files/eclipse.in b/java/eclipse/files/eclipse.in
index 251e7a375b20..91873ea14ba1 100644
--- a/java/eclipse/files/eclipse.in
+++ b/java/eclipse/files/eclipse.in
@@ -10,7 +10,7 @@
DEFAULT_JAVA_HOME=%%PREFIX%%
ECLIPSE_HOME=%%ECLIPSE_HOME%%
DEFAULT_JAVA_CMD=java
-export MOZILLA_FIVE_HOME=%%X11BASE%%/lib/%%BROWSER%%
+export MOZILLA_FIVE_HOME=%%LOCALBASE%%/lib/%%BROWSER%%
export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH
diff --git a/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh b/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh
index c618b3f236be..f1829709a0c9 100644
--- a/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh
+++ b/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh
@@ -8,10 +8,10 @@
+ CC=gcc
+ LD=gcc
+ XTEST_LIB_PATH=$X11BASE/lib
-+ GECKO_I=${X11BASE}/include/${BROWSER}
++ GECKO_I=`${GECKO_CONFIG} --cflags gtkmozembed`
+ GECKO_INCLUDES="-I${GECKO_I} -I${LOCALBASE}/include/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring"
-+ GECKO_L=${X11BASE}/lib/${BROWSER}
-+ GECKO_LIBS="-L${GECKO_L} -L${LOCALBASE}/lib -lxpcom -lnspr4 -lplds4 -lplc4 -lgtkembedmoz"
++ GECKO_L=`${GECKO_CONFIG} --libs gtkmozembed`
++ GECKO_LIBS="-L${GECKO_L} -L${LOCALBASE}/lib"
+ case $MODEL in
+ "amd64")
+ AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index 16e49df97887..46459bebf0dd 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/communitysource/j2se/java2/download.xml
# http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@@ -61,7 +61,7 @@ MAKE_ENV= ALT_BOOTDIR="${JDK13DIR}" \
_JAVA_BOOTSTRAP_VERSION="1.3.1"
.if defined(WITH_PLUGIN)
MAKE_ENV += LIBG_HDRS="${LOCALBASE}/include/glib12" \
- GTK_HDRS="${X11BASE}/include/gtk12" \
+ GTK_HDRS="${LOCALBASE}/include/gtk12" \
LIBIDL_HDRS= \
INTL_DIR="${LOCALBASE}"
.endif
@@ -308,7 +308,7 @@ post-install:
@${ECHO_MSG}
@${ECHO_MSG} to your Mozilla plugins directory, which is usually found at
@${ECHO_MSG}
- @${ECHO_MSG} ${X11BASE}/lib/mozilla/plugins
+ @${ECHO_MSG} ${LOCALBASE}/lib/mozilla/plugins
@${ECHO_MSG}
.endif
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index feb89cff29c6..948ad8bf8a3d 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 85c89b9d0a51..167d5bd28893 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 5868aca50c32..c5f4a70db1df 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
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-19 08:28:34 +0000