diff options
| author | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch) | |
| tree | f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /java/eclipse-devel | |
| parent | 2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff) | |
| download | FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz | |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Diffstat (limited to 'java/eclipse-devel')
| -rw-r--r-- | java/eclipse-devel/Makefile | 5 | ||||
| -rw-r--r-- | java/eclipse-devel/files/post-patch-plugins-swt-gtk-make_freebsd.mak | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile index 6bd855a..a89fa8a 100644 --- a/java/eclipse-devel/Makefile +++ b/java/eclipse-devel/Makefile @@ -26,8 +26,7 @@ ECLIPSE= ${PORTNAME} ONLY_FOR_ARCHS= i386 amd64 USE_GMAKE= yes USE_ZIP= yes -USE_GCC= 3.4+ -USE_GL= yes +USE_GL= glu .if !defined(WITHOUT_MOZILLA) USE_GECKO= xulrunner firefox mozilla seamonkey @@ -127,7 +126,7 @@ 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+%%LOCALBASE%%+${LOCALBASE}+g" \ -e "s+%%BROWSER%%+${BROWSER}+g" \ -e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \ diff --git a/java/eclipse-devel/files/post-patch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse-devel/files/post-patch-plugins-swt-gtk-make_freebsd.mak index 075a1c7..d57dcd7 100644 --- a/java/eclipse-devel/files/post-patch-plugins-swt-gtk-make_freebsd.mak +++ b/java/eclipse-devel/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 @@ -26,7 +26,7 @@ -Wno-non-virtual-dtor \ -fPIC \ -I. \ -+ -I$(X11BASE)/include \ ++ -I$(LOCALBASE)/include \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/freebsd \ + -I$(LOCALBASE)/include/xulrunner \ @@ -53,7 +53,7 @@ $(NATIVE_STATS) \ - -DLINUX -DGTK \ + -DFREEBSD -DGTK \ -+ -I$(X11BASE)/include \ ++ -I$(LOCALBASE)/include \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/freebsd \ -fPIC \ |
