aboutsummaryrefslogtreecommitdiff
path: root/java/eclipse
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
commit3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch)
treed573ea09b2bf6be67cb497df199932da9e2707c4 /java/eclipse
parent40049f4af2200d0dcf33596508688623fc75f764 (diff)
downloadports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz
ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip
Notes
Diffstat (limited to 'java/eclipse')
-rw-r--r--java/eclipse/Makefile1
-rw-r--r--java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak6
2 files changed, 3 insertions, 4 deletions
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 679b5cd1563e..55f958dde935 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -124,7 +124,6 @@ do-install:
@${SED} \
-e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
-e "s+%%PREFIX%%+${PREFIX}+g" \
- -e "s+%%X11BASE%%+${X11BASE}+g" \
-e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
-e "s+%%BROWSER%%+${BROWSER}+g" \
-e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \
diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak
index b9e4b6e9bae7..b08943add954 100644
--- a/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak
+++ b/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak
@@ -5,7 +5,7 @@
# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
-GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst
-+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(X11BASE)/lib $(XLIB64) -lXtst
++GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst
CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
@@ -14,7 +14,7 @@
GLXCFLAGS =
-GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm
-+GLXLIBS = -shared -fPIC -L$(X11BASE)/lib -lGL -lGLU -lm
++GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm
# Uncomment for Native Stats tool
#NATIVE_STATS = -DNATIVE_STATS
@@ -37,7 +37,7 @@
+ -DFREEBSD -DGTK \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/freebsd \
-+ -I$(X11BASE)/include \
++ -I$(LOCALBASE)/include \
-fPIC \
${SWT_PTR_CFLAGS}
LIBS = -shared -fPIC -s