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/jdk16/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)
Diffstat (limited to 'java/jdk16/files/patch-j2se-awt-mawt.gmk')
| -rw-r--r-- | java/jdk16/files/patch-j2se-awt-mawt.gmk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/jdk16/files/patch-j2se-awt-mawt.gmk b/java/jdk16/files/patch-j2se-awt-mawt.gmk index ddbab7154b35..ff56d99d0e55 100644 --- a/java/jdk16/files/patch-j2se-awt-mawt.gmk +++ b/java/jdk16/files/patch-j2se-awt-mawt.gmk @@ -7,13 +7,13 @@ $FreeBSD$ else # Allows for builds on Debian GNU Linux, X11 is in a different place - LIBXT = $(firstword $(wildcard /usr/X11R6/lib/libXt.a) \ -+ LIBXT = $(firstword $(wildcard ${X11BASE}/lib/libXt.a) \ ++ LIBXT = $(firstword $(wildcard ${LOCALBASE}/lib/libXt.a) \ $(wildcard /usr/lib/libXt.a)) - LIBSM = $(firstword $(wildcard /usr/X11R6/lib/libSM.a) \ -+ LIBSM = $(firstword $(wildcard ${X11BASE}/lib/libSM.a) \ ++ LIBSM = $(firstword $(wildcard ${LOCALBASE}/lib/libSM.a) \ $(wildcard /usr/lib/libSM.a)) - LIBICE = $(firstword $(wildcard /usr/X11R6/lib/libICE.a) \ -+ LIBICE = $(firstword $(wildcard ${X11BASE}/lib/libICE.a) \ ++ LIBICE = $(firstword $(wildcard ${LOCALBASE}/lib/libICE.a) \ $(wildcard /usr/lib/libICE.a)) endif endif @@ -23,8 +23,8 @@ $FreeBSD$ ifeq ($(PLATFORM), bsd) - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ - -I/usr/X11R6/include -+ CPPFLAGS += -I${X11BASE}/include/X11/extensions \ -+ -I${X11BASE}/include ++ CPPFLAGS += -I${LOCALBASE}/include/X11/extensions \ ++ -I${LOCALBASE}/include endif LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ |