From 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sat, 19 Apr 2008 17:56:05 +0000 Subject: - 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) --- java/jdk14/files/patch-plugin::common::config.gmk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'java/jdk14/files/patch-plugin::common::config.gmk') diff --git a/java/jdk14/files/patch-plugin::common::config.gmk b/java/jdk14/files/patch-plugin::common::config.gmk index d8a025a8d336..95e1c36717aa 100644 --- a/java/jdk14/files/patch-plugin::common::config.gmk +++ b/java/jdk14/files/patch-plugin::common::config.gmk @@ -6,16 +6,16 @@ $FreeBSD$ ifeq ($(PLATFORM), bsd) PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/src/solaris -- X11BASE = /usr/X11R6 - OTHER_LDFLAGS = -L$(X11BASE)/lib +- LOCALBASE = /usr/X11R6 + OTHER_LDFLAGS = -L$(LOCALBASE)/lib ifeq (,$(filter-out DragonFly NetBSD,$(TRUE_PLATFORM))) - OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib + OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib @@ -61,7 +60,7 @@ # include search paths # XXXBSD: these should be defined in other place -- CPPFLAGS1 += -I$(X11BASE)/include -I/usr/local/include -+ CPPFLAGS1 += -I$(X11BASE)/include -I${LOCALBASE}/include +- CPPFLAGS1 += -I$(LOCALBASE)/include -I/usr/local/include ++ CPPFLAGS1 += -I$(LOCALBASE)/include -I${LOCALBASE}/include ifeq ($(TRUE_PLATFORM), FreeBSD) LDFLAGS_COMMON += -pthread -- cgit v1.2.3