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/jdk13/files | |
| 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/jdk13/files')
| -rw-r--r-- | java/jdk13/files/patch-common::Defs-bsd.gmk | 4 | ||||
| -rw-r--r-- | java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c | 2 | ||||
| -rw-r--r-- | java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/java/jdk13/files/patch-common::Defs-bsd.gmk b/java/jdk13/files/patch-common::Defs-bsd.gmk index 686183aca934..218f8124fc5d 100644 --- a/java/jdk13/files/patch-common::Defs-bsd.gmk +++ b/java/jdk13/files/patch-common::Defs-bsd.gmk @@ -42,7 +42,7 @@ $FreeBSD$ override MOOT_PRIORITIES = true override NO_INTERRUPTIBLE_IO = true -override OPENWINHOME = /usr/X11R6 -+override OPENWINHOME = $(X11BASE) ++override OPENWINHOME = $(LOCALBASE) override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER override PREPROCESS_BEFORE_AS = true override PRIVATIZE_JVM_SYMBOLS = false @@ -51,7 +51,7 @@ $FreeBSD$ LDFLAGS_COMMON += -L$(MOTIF_DIR)/lib -L/usr/X11R6/lib # for libXp else - MOTIF_DIR=/usr/X11R6 -+ MOTIF_DIR=$(X11BASE) ++ MOTIF_DIR=$(LOCALBASE) endif endif ifdef ALT_MOTIF_DIR diff --git a/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c b/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c index 625ddf294d3a..c946715d313a 100644 --- a/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c +++ b/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c @@ -7,7 +7,7 @@ $FreeBSD$ { #ifndef __solaris__ - char *ptr = "/usr/X11R6/lib/X11/fonts/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/tt"; -+ char *ptr = "%%X11BASE%%/lib/X11/fonts/Type1:%%X11BASE%%/lib/X11/fonts/TrueType:%%X11BASE%%/lib/X11/fonts/tt"; ++ char *ptr = "%%LOCALBASE%%/lib/X11/fonts/Type1:%%LOCALBASE%%/lib/X11/fonts/TrueType:%%LOCALBASE%%/lib/X11/fonts/tt"; #else char *ptr = getSolarisFontLocations((int) (noType1==JNI_TRUE)); #endif diff --git a/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile b/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile index 48d25a056617..2b1f220208e2 100644 --- a/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile +++ b/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile @@ -17,8 +17,8 @@ $FreeBSD$ -X11_INCLUDE=/usr/X11R6/include -X11_LIB=/usr/X11R6/lib -+X11_INCLUDE=$(X11BASE)/include -+X11_LIB=$(X11BASE)/lib ++X11_INCLUDE=$(LOCALBASE)/include ++X11_LIB=$(LOCALBASE)/lib MOTIF_INCLUDE = $(MOTIF_DIR)/include MOTIF_LIB = $(MOTIF_DIR)/lib INTL_INCLUDE = $(INTL_DIR)/include |