diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /java/jdk15/files/patch-j2se::awt::mawt.gmk | |
| parent | Update to version 2.2.6 (diff) | |
- 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)
Notes
Notes:
svn path=/head/; revision=211584
Diffstat (limited to 'java/jdk15/files/patch-j2se::awt::mawt.gmk')
| -rw-r--r-- | java/jdk15/files/patch-j2se::awt::mawt.gmk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/jdk15/files/patch-j2se::awt::mawt.gmk b/java/jdk15/files/patch-j2se::awt::mawt.gmk index 703e594c9583..d14b8044357b 100644 --- a/java/jdk15/files/patch-j2se::awt::mawt.gmk +++ b/java/jdk15/files/patch-j2se::awt::mawt.gmk @@ -9,9 +9,9 @@ $FreeBSD$ - LIBXT = /usr/X11R6/lib/libXt.a - LIBSM = /usr/X11R6/lib/libSM.a - LIBICE = /usr/X11R6/lib/libICE.a -+ LIBXT = $(X11BASE)/lib/libXt.a -+ LIBSM = $(X11BASE)/lib/libSM.a -+ LIBICE = $(X11BASE)/lib/libICE.a ++ LIBXT = $(LOCALBASE)/lib/libXt.a ++ LIBSM = $(LOCALBASE)/lib/libSM.a ++ LIBICE = $(LOCALBASE)/lib/libICE.a endif endif else @@ -20,7 +20,7 @@ $FreeBSD$ ifeq ($(LINUX_OR_BSD), true) - CPPFLAGS += -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions -+ CPPFLAGS += -I$(X11BASE)/include -I$(X11BASE)/include/X11/extensions ++ CPPFLAGS += -I$(LOCALBASE)/include -I$(LOCALBASE)/include/X11/extensions endif ifeq ($(PLATFORM), solaris) |