sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

. Replace some hardwired /usr/X11R6 instances with X11BASE. [1]

Browse source 
. Replace some hardwired /usr/local instances with LOCALBASE.
. Small Makefile restructure to keep related variables in one place.
. Add ipv6 to CATEGORIES if its enabled. [2]

PR:             106130 [2]
Submitted by:   Janos Mohacsi <janos.mohacsi@bsd.hu> [2]
Pointed out by: pointyhat (via kris) [1]
This commit is contained in:
Greg Lewis 2006-12-11 17:10:52 +00:00
parent d6a805b229
commit 1bb6af069e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=179502
28 changed files with 450 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
java/jdk15/Makefile
View file

@ -66,6 +66,10 @@ LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.4.2
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if defined(WITH_IPV6)
CATEGORIES+= ipv6
.endif
.if defined(WITH_POLICY) .if defined(WITH_POLICY)
DISTFILES+= ${POLICYFILE} DISTFILES+= ${POLICYFILE}
EXTRACT_ONLY+= ${POLICYFILE} EXTRACT_ONLY+= ${POLICYFILE}
@ -147,6 +151,7 @@ HOTSPOTARCH=i586
JDKIMAGEDIR= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-image JDKIMAGEDIR= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-image
JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-debug-image JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-debug-image
LOCAL_FILES= ../../hotspot/src/os/bsd/vm/os_bsd.cpp
PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \ PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \
../../j2se/make/com/sun/java/pack/Makefile \ ../../j2se/make/com/sun/java/pack/Makefile \
../../j2se/make/common/Defs.gmk \ ../../j2se/make/common/Defs.gmk \
@ -158,8 +163,9 @@ PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \
../../j2se/make/jpda/transport/socket/Makefile \ ../../j2se/make/jpda/transport/socket/Makefile \
../../j2se/make/sun/cmm/Makefile \ ../../j2se/make/sun/cmm/Makefile \
../../j2se/make/sun/xawt/Makefile ../../j2se/make/sun/xawt/Makefile
X11_FILES= ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java \
LD_LIBRARY_PATH_FILES= ../../hotspot/src/os/bsd/vm/os_bsd.cpp ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \
../../j2se/src/solaris/native/sun/awt/fontpath.c
# Check for JDK sources and patch file # Check for JDK sources and patch file
.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{ .if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
@ -231,7 +237,7 @@ pre-patch:
${PATCH} -p0 < ${WRKDIR}/jdk15.patches ${PATCH} -p0 < ${WRKDIR}/jdk15.patches
post-patch: post-patch:
@for file in ${LD_LIBRARY_PATH_FILES}; do \ @for file in ${LOCAL_FILES}; do \
${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \ ${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
${WRKSRC}/$${file}; \ ${WRKSRC}/$${file}; \
done done
@ -239,6 +245,10 @@ post-patch:
${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \ ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \
${WRKSRC}/$${file}; \ ${WRKSRC}/$${file}; \
done done
@for file in ${X11_FILES}; do \
${REINPLACE_CMD} -e "s:%%X11BASE%%:${X11BASE}:" \
${WRKSRC}/$${file}; \
done
${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \ ${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \
-e "s:%%JDK_VERSION%%:${JDK_VERSION}:g"\ -e "s:%%JDK_VERSION%%:${JDK_VERSION}:g"\
${WRKSRC}/../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop ${WRKSRC}/../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop

18
java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
View file

@ -1,13 +1,25 @@
$FreeBSD$ $FreeBSD$
--- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Tue Mar 28 22:20:28 2006 --- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Sun Dec 10 11:49:51 2006
+++ ../../deploy/make/plugin/common/Defs-bsd.gmk Tue Mar 28 22:20:45 2006 +++ ../../deploy/make/plugin/common/Defs-bsd.gmk Sun Dec 10 21:44:53 2006
@@ -9,9 +9,9 @@
# Default MOZILLA_PATH and allow override.
ifeq ($(TRUE_PLATFORM), OpenBSD)
-MOZILLA_PATH = /usr/local
+MOZILLA_PATH = $(LOCALBASE)
else
-MOZILLA_PATH = /usr/X11R6
+MOZILLA_PATH = $(X11BASE)
endif
ifdef ALT_MOZILLA_PATH
MOZILLA_PATH = $(subst //,/,$(ALT_MOZILLA_PATH))
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
endif endif
# Default NSPR_PATH and allow override. # Default NSPR_PATH and allow override.
-NSPR_PATH = /usr/local -NSPR_PATH = /usr/local
+NSPR_PATH = ${LOCALBASE} +NSPR_PATH = $(LOCALBASE)
ifdef ALT_NSPR_PATH ifdef ALT_NSPR_PATH
NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH)) NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH))
endif endif

16
java/jdk15/files/patch-deploy::common::config.gmk Normal file
View file

@ -0,0 +1,16 @@
$FreeBSD$
--- ../../deploy/make/plugin/common/config.gmk.orig Sun Dec 10 21:40:24 2006
+++ ../../deploy/make/plugin/common/config.gmk Sun Dec 10 21:40:59 2006
@@ -44,9 +44,9 @@
ifeq ($(LINUX_OR_BSD), true)
PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/solaris
- OTHER_LDFLAGS = -L/usr/X11R6/lib
+ OTHER_LDFLAGS = -L$(X11BASE)/lib
ifeq ($(TRUE_PLATFORM), NetBSD)
- OTHER_LDFLAGS += -Wl,-R/usr/X11R6/lib
+ OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib
endif
endif

13
java/jdk15/files/patch-deploy::jvmnative::Makefile Normal file
View file

@ -0,0 +1,13 @@
$FreeBSD$
--- ../../deploy/make/plugin/jvmnative/Makefile.orig Sun Dec 10 21:45:33 2006
+++ ../../deploy/make/plugin/jvmnative/Makefile Sun Dec 10 21:45:54 2006
@@ -16,7 +16,7 @@
ifeq ($(PLATFORM), bsd)
LDLIBS = -lm -lX11
-X11HDRDIR = /usr/X11R6/include
+X11HDRDIR = $(X11BASE)/include
else
X11HDRDIR =
ifeq ($(PLATFORM), linux)

15
java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk Normal file
View file

@ -0,0 +1,15 @@
$FreeBSD$
--- ../../deploy/make/common/Defs-bsd.gmk.orig Sun Dec 10 18:30:50 2006
+++ ../../deploy/make/common/Defs-bsd.gmk Sun Dec 10 18:31:22 2006
@@ -13,8 +13,8 @@
JUMP_EXE = $(BIN_DIR)/javaws$(SUFFIX)
JUMP_EXE_DBG = $(BIN_DIR_DBG)/javaws$(DBG_SUFFIX)
PATH_SEP = /
-X11DIR = /usr/X11R6
-LOCALDIR = /usr/local
+X11DIR = $(X11BASE)
+LOCALDIR = $(LOCALBASE)
ifneq ($(TRUE_PLATFORM), NetBSD)
LIBS = -L$(X11DIR)/lib -lX11 -L$(LOCALDIR)/lib -liconv
else

15
java/jdk15/files/patch-deploy::ns7-adapter::Makefile Normal file
View file

@ -0,0 +1,15 @@
$FreeBSD$
--- ../../deploy/make/plugin/adapter/ns7-adapter/Makefile.orig Sun Dec 10 21:38:35 2006
+++ ../../deploy/make/plugin/adapter/ns7-adapter/Makefile Sun Dec 10 21:39:08 2006
@@ -84,8 +84,8 @@
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/plugin) \
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/xpcom)
endif
-X11HDRDIR = /usr/X11R6/include
-ICONVHDRDIR = /usr/local/include
+X11HDRDIR = $(X11BASE)/include
+ICONVHDRDIR = $(LOCALBASE)/include
NSPRHDRDIR = $(NSPR_HEADERS_PATH)
else
MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7) \

15
java/jdk15/files/patch-deploy::nscore::Makefile Normal file
View file

@ -0,0 +1,15 @@
$FreeBSD$
--- ../../deploy/make/plugin/nscore/unix/Makefile.orig Sun Dec 10 21:46:45 2006
+++ ../../deploy/make/plugin/nscore/unix/Makefile Sun Dec 10 21:47:26 2006
@@ -18,8 +18,8 @@
ifeq ($(PLATFORM), bsd)
LDLIBS = -lX11
-X11HDRDIR = /usr/X11R6/include
-ICONVHDRDIR = /usr/local/include
+X11HDRDIR = $(X11BASE)/include
+ICONVHDRDIR = $(LOCALBASE)/include
else
X11HDRDIR =
ICONVHDRDIR =

29
java/jdk15/files/patch-j2se::awt::fontpath.c Normal file
View file

@ -0,0 +1,29 @@
$FreeBSD$
--- ../../j2se/src/solaris/native/sun/awt/fontpath.c.orig Sun Dec 10 21:57:02 2006
+++ ../../j2se/src/solaris/native/sun/awt/fontpath.c Sun Dec 10 21:58:43 2006
@@ -98,18 +98,18 @@
* various flavors of Linux
*/
static char *fullLinuxFontPath[] = {
- "/usr/X11R6/lib/X11/fonts/TrueType", /* RH 7.1+ */
- "/usr/X11R6/lib/X11/fonts/truetype", /* SuSE */
- "/usr/X11R6/lib/X11/fonts/tt",
- "/usr/X11R6/lib/X11/fonts/TTF",
- "/usr/X11R6/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */
+ "%%X11BASE%%/lib/X11/fonts/TrueType", /* RH 7.1+ */
+ "%%X11BASE%%/lib/X11/fonts/truetype", /* SuSE */
+ "%%X11BASE%%/lib/X11/fonts/tt",
+ "%%X11BASE%%/lib/X11/fonts/TTF",
+ "%%X11BASE%%/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */
"/usr/share/fonts/ja/TrueType", /* RH 7.2+ */
"/usr/share/fonts/truetype",
"/usr/share/fonts/ko/TrueType", /* RH 9.0 */
"/usr/share/fonts/zh_CN/TrueType", /* RH 9.0 */
"/usr/share/fonts/zh_TW/TrueType", /* RH 9.0 */
"/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType", /* Debian */
- "/usr/X11R6/lib/X11/fonts/Type1",
+ "%%X11BASE%%/lib/X11/fonts/Type1",
"/usr/share/fonts/default/Type1", /* RH 9.0 */
NULL, /* terminates the list */
};

26
java/jdk15/files/patch-j2se::awt::mawt.gmk Normal file
View file

@ -0,0 +1,26 @@
$FreeBSD$
--- ../../j2se/make/sun/awt/mawt.gmk.orig Sun Dec 10 21:49:45 2006
+++ ../../j2se/make/sun/awt/mawt.gmk Sun Dec 10 21:50:27 2006
@@ -132,9 +132,9 @@
ifeq ($(ARCH_DATA_MODEL), 64)
LIBXT = -lXt
else
- 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
endif
endif
else
@@ -229,7 +229,7 @@
$(EVENT_MODEL)
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
endif
ifeq ($(PLATFORM), solaris)

15
java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
View file

@ -1,13 +1,22 @@
$FreeBSD$ $FreeBSD$
--- ../../j2se/make/common/Defs-bsd.gmk.orig Thu Jan 13 02:03:20 2005 --- ../../j2se/make/common/Defs-bsd.gmk.orig Sun Dec 10 11:49:52 2006
+++ ../../j2se/make/common/Defs-bsd.gmk Thu Jan 13 02:03:38 2005 +++ ../../j2se/make/common/Defs-bsd.gmk Sun Dec 10 21:48:51 2006
@@ -180,7 +180,7 @@ @@ -180,7 +180,7 @@
ifeq ($(TRUE_PLATFORM), NetBSD) ifeq ($(TRUE_PLATFORM), NetBSD)
DEVTOOLS_PATH = /usr/pkg/bin/ DEVTOOLS_PATH = /usr/pkg/bin/
else else
-DEVTOOLS_PATH = /usr/local/bin/ -DEVTOOLS_PATH = /usr/local/bin/
+DEVTOOLS_PATH = ${LOCALBASE}/bin/ +DEVTOOLS_PATH = $(LOCALBASE)/bin/
endif endif
# Allow the user to override the default value... # Allow the user to override the default value...
ifdef ALT_DEVTOOLS_PATH ifdef ALT_DEVTOOLS_PATH
@@ -434,7 +434,7 @@
override LIBTHREAD =
override MOOT_PRIORITIES = true
override NO_INTERRUPTIBLE_IO = false
-override OPENWIN_HOME = /usr/X11R6
+override OPENWIN_HOME = $(X11BASE)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib
override OTHER_M4FLAGS = -DGNU_ASSEMBLER
override SUN_CMM_SUBDIR =

13
java/jdk15/files/patch-j2se::font::Makefile Normal file
View file

@ -0,0 +1,13 @@
$FreeBSD$
--- ../../j2se/make/sun/font/Makefile.orig Sun Dec 10 21:51:17 2006
+++ ../../j2se/make/sun/font/Makefile Sun Dec 10 21:51:50 2006
@@ -125,7 +125,7 @@
# setup the list of libraries to link in...
ifeq ($(PLATFORM), bsd)
# XXXBSD: why here?
-OTHER_INCLUDES += -I/usr/X11R6/include
+OTHER_INCLUDES += -I$(X11BASE)/include
OTHER_LDLIBS += -lawt$(SUFFIX) $(LIBM) $(LIBCXX)
else
ifeq ($(PLATFORM), linux)

15
java/jdk15/files/patch-j2se::gtk::GTKLookAndFeel.java Normal file
View file

@ -0,0 +1,15 @@
$FreeBSD$
--- ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java.orig Sun Dec 10 21:53:38 2006
+++ ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Sun Dec 10 21:54:16 2006
@@ -1387,8 +1387,8 @@
String[] dirs = new String[] {
userHome + "/.themes",
System.getProperty("swing.gtkthemedir"),
- "/usr/X11R6/share/gnome/themes", // FreeBSD
- "/usr/X11R6/share/themes", // FreeBSD
+ "%%X11BASE%%/share/gnome/themes", // FreeBSD
+ "%%X11BASE%%/share/themes", // FreeBSD
"/usr/share/themes" // Debian/Redhat/Solaris/SuSE
};

15
java/jdk15/files/patch-j2se::gtk::Metacity.java Normal file
View file

@ -0,0 +1,15 @@
$FreeBSD$
--- ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java.orig Sun Dec 10 21:55:26 2006
+++ ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java Sun Dec 10 21:55:56 2006
@@ -456,8 +456,8 @@
String[] dirs = new String[] {
userHome + sep + ".themes",
System.getProperty("swing.metacitythemedir"),
- "/usr/X11R6/share/themes",
- "/usr/X11R6/share/gnome/themes",
+ "%%X11BASE%%/share/themes",
+ "%%X11BASE%%/share/gnome/themes",
"/usr/share/themes",
"/usr/gnome/share/themes", // Debian/Redhat/Solaris
"/opt/gnome2/share/themes" // SuSE

13
java/jdk15/files/patch-j2se::xawt::Makefile Normal file
View file

@ -0,0 +1,13 @@
$FreeBSD$
--- ../../j2se/make/sun/xawt/Makefile.orig Sun Dec 10 21:52:27 2006
+++ ../../j2se/make/sun/xawt/Makefile Sun Dec 10 21:52:52 2006
@@ -117,7 +117,7 @@
endif
ifeq ($(PLATFORM), bsd)
- CPPFLAGS += -I/usr/X11R6/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
+ CPPFLAGS += -I$(X11BASE)/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
endif
ifeq ($(PLATFORM), solaris)

16
java/jdk16/Makefile
View file

@ -66,6 +66,10 @@ LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.4.2
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if defined(WITH_IPV6)
CATEGORIES+= ipv6
.endif
.if defined(WITH_POLICY) .if defined(WITH_POLICY)
DISTFILES+= ${POLICYFILE} DISTFILES+= ${POLICYFILE}
EXTRACT_ONLY+= ${POLICYFILE} EXTRACT_ONLY+= ${POLICYFILE}
@ -147,6 +151,7 @@ HOTSPOTARCH=i586
JDKIMAGEDIR= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-image JDKIMAGEDIR= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-image
JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-debug-image JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-debug-image
LOCAL_FILES= ../../hotspot/src/os/bsd/vm/os_bsd.cpp
PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \ PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \
../../j2se/make/com/sun/java/pack/Makefile \ ../../j2se/make/com/sun/java/pack/Makefile \
../../j2se/make/common/Defs.gmk \ ../../j2se/make/common/Defs.gmk \
@ -158,8 +163,9 @@ PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \
../../j2se/make/jpda/transport/socket/Makefile \ ../../j2se/make/jpda/transport/socket/Makefile \
../../j2se/make/sun/cmm/Makefile \ ../../j2se/make/sun/cmm/Makefile \
../../j2se/make/sun/xawt/Makefile ../../j2se/make/sun/xawt/Makefile
X11_FILES= ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java \
LD_LIBRARY_PATH_FILES= ../../hotspot/src/os/bsd/vm/os_bsd.cpp ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \
../../j2se/src/solaris/native/sun/awt/fontpath.c
# Check for JDK sources and patch file # Check for JDK sources and patch file
.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{ .if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
@ -231,7 +237,7 @@ pre-patch:
${PATCH} -p0 < ${WRKDIR}/jdk15.patches ${PATCH} -p0 < ${WRKDIR}/jdk15.patches
post-patch: post-patch:
@for file in ${LD_LIBRARY_PATH_FILES}; do \ @for file in ${LOCAL_FILES}; do \
${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \ ${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
${WRKSRC}/$${file}; \ ${WRKSRC}/$${file}; \
done done
@ -239,6 +245,10 @@ post-patch:
${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \ ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \
${WRKSRC}/$${file}; \ ${WRKSRC}/$${file}; \
done done
@for file in ${X11_FILES}; do \
${REINPLACE_CMD} -e "s:%%X11BASE%%:${X11BASE}:" \
${WRKSRC}/$${file}; \
done
${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \ ${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \
-e "s:%%JDK_VERSION%%:${JDK_VERSION}:g"\ -e "s:%%JDK_VERSION%%:${JDK_VERSION}:g"\
${WRKSRC}/../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop ${WRKSRC}/../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop

18
java/jdk16/files/patch-deploy::common::Defs-bsd.gmk
View file

@ -1,13 +1,25 @@
$FreeBSD$ $FreeBSD$
--- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Tue Mar 28 22:20:28 2006 --- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Sun Dec 10 11:49:51 2006
+++ ../../deploy/make/plugin/common/Defs-bsd.gmk Tue Mar 28 22:20:45 2006 +++ ../../deploy/make/plugin/common/Defs-bsd.gmk Sun Dec 10 21:44:53 2006
@@ -9,9 +9,9 @@
# Default MOZILLA_PATH and allow override.
ifeq ($(TRUE_PLATFORM), OpenBSD)
-MOZILLA_PATH = /usr/local
+MOZILLA_PATH = $(LOCALBASE)
else
-MOZILLA_PATH = /usr/X11R6
+MOZILLA_PATH = $(X11BASE)
endif
ifdef ALT_MOZILLA_PATH
MOZILLA_PATH = $(subst //,/,$(ALT_MOZILLA_PATH))
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
endif endif
# Default NSPR_PATH and allow override. # Default NSPR_PATH and allow override.
-NSPR_PATH = /usr/local -NSPR_PATH = /usr/local
+NSPR_PATH = ${LOCALBASE} +NSPR_PATH = $(LOCALBASE)
ifdef ALT_NSPR_PATH ifdef ALT_NSPR_PATH
NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH)) NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH))
endif endif

16
java/jdk16/files/patch-deploy::common::config.gmk Normal file
View file

@ -0,0 +1,16 @@
$FreeBSD$
--- ../../deploy/make/plugin/common/config.gmk.orig Sun Dec 10 21:40:24 2006
+++ ../../deploy/make/plugin/common/config.gmk Sun Dec 10 21:40:59 2006
@@ -44,9 +44,9 @@
ifeq ($(LINUX_OR_BSD), true)
PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/solaris
- OTHER_LDFLAGS = -L/usr/X11R6/lib
+ OTHER_LDFLAGS = -L$(X11BASE)/lib
ifeq ($(TRUE_PLATFORM), NetBSD)
- OTHER_LDFLAGS += -Wl,-R/usr/X11R6/lib
+ OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib
endif
endif

13
java/jdk16/files/patch-deploy::jvmnative::Makefile Normal file
View file

@ -0,0 +1,13 @@
$FreeBSD$
--- ../../deploy/make/plugin/jvmnative/Makefile.orig Sun Dec 10 21:45:33 2006
+++ ../../deploy/make/plugin/jvmnative/Makefile Sun Dec 10 21:45:54 2006
@@ -16,7 +16,7 @@
ifeq ($(PLATFORM), bsd)
LDLIBS = -lm -lX11
-X11HDRDIR = /usr/X11R6/include
+X11HDRDIR = $(X11BASE)/include
else
X11HDRDIR =
ifeq ($(PLATFORM), linux)

15
java/jdk16/files/patch-deploy::make::common::Defs-bsd.gmk Normal file
View file

@ -0,0 +1,15 @@
$FreeBSD$
--- ../../deploy/make/common/Defs-bsd.gmk.orig Sun Dec 10 18:30:50 2006
+++ ../../deploy/make/common/Defs-bsd.gmk Sun Dec 10 18:31:22 2006
@@ -13,8 +13,8 @@
JUMP_EXE = $(BIN_DIR)/javaws$(SUFFIX)
JUMP_EXE_DBG = $(BIN_DIR_DBG)/javaws$(DBG_SUFFIX)
PATH_SEP = /
-X11DIR = /usr/X11R6
-LOCALDIR = /usr/local
+X11DIR = $(X11BASE)
+LOCALDIR = $(LOCALBASE)
ifneq ($(TRUE_PLATFORM), NetBSD)
LIBS = -L$(X11DIR)/lib -lX11 -L$(LOCALDIR)/lib -liconv
else

15
java/jdk16/files/patch-deploy::ns7-adapter::Makefile Normal file
View file

@ -0,0 +1,15 @@
$FreeBSD$
--- ../../deploy/make/plugin/adapter/ns7-adapter/Makefile.orig Sun Dec 10 21:38:35 2006
+++ ../../deploy/make/plugin/adapter/ns7-adapter/Makefile Sun Dec 10 21:39:08 2006
@@ -84,8 +84,8 @@
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/plugin) \
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/xpcom)
endif
-X11HDRDIR = /usr/X11R6/include
-ICONVHDRDIR = /usr/local/include
+X11HDRDIR = $(X11BASE)/include
+ICONVHDRDIR = $(LOCALBASE)/include
NSPRHDRDIR = $(NSPR_HEADERS_PATH)
else
MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7) \

15
java/jdk16/files/patch-deploy::nscore::Makefile Normal file
View file

@ -0,0 +1,15 @@
$FreeBSD$
--- ../../deploy/make/plugin/nscore/unix/Makefile.orig Sun Dec 10 21:46:45 2006
+++ ../../deploy/make/plugin/nscore/unix/Makefile Sun Dec 10 21:47:26 2006
@@ -18,8 +18,8 @@
ifeq ($(PLATFORM), bsd)
LDLIBS = -lX11
-X11HDRDIR = /usr/X11R6/include
-ICONVHDRDIR = /usr/local/include
+X11HDRDIR = $(X11BASE)/include
+ICONVHDRDIR = $(LOCALBASE)/include
else
X11HDRDIR =
ICONVHDRDIR =

29
java/jdk16/files/patch-j2se::awt::fontpath.c Normal file
View file

@ -0,0 +1,29 @@
$FreeBSD$
--- ../../j2se/src/solaris/native/sun/awt/fontpath.c.orig Sun Dec 10 21:57:02 2006
+++ ../../j2se/src/solaris/native/sun/awt/fontpath.c Sun Dec 10 21:58:43 2006
@@ -98,18 +98,18 @@
* various flavors of Linux
*/
static char *fullLinuxFontPath[] = {
- "/usr/X11R6/lib/X11/fonts/TrueType", /* RH 7.1+ */
- "/usr/X11R6/lib/X11/fonts/truetype", /* SuSE */
- "/usr/X11R6/lib/X11/fonts/tt",
- "/usr/X11R6/lib/X11/fonts/TTF",
- "/usr/X11R6/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */
+ "%%X11BASE%%/lib/X11/fonts/TrueType", /* RH 7.1+ */
+ "%%X11BASE%%/lib/X11/fonts/truetype", /* SuSE */
+ "%%X11BASE%%/lib/X11/fonts/tt",
+ "%%X11BASE%%/lib/X11/fonts/TTF",
+ "%%X11BASE%%/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */
"/usr/share/fonts/ja/TrueType", /* RH 7.2+ */
"/usr/share/fonts/truetype",
"/usr/share/fonts/ko/TrueType", /* RH 9.0 */
"/usr/share/fonts/zh_CN/TrueType", /* RH 9.0 */
"/usr/share/fonts/zh_TW/TrueType", /* RH 9.0 */
"/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType", /* Debian */
- "/usr/X11R6/lib/X11/fonts/Type1",
+ "%%X11BASE%%/lib/X11/fonts/Type1",
"/usr/share/fonts/default/Type1", /* RH 9.0 */
NULL, /* terminates the list */
};

26
java/jdk16/files/patch-j2se::awt::mawt.gmk Normal file
View file

@ -0,0 +1,26 @@
$FreeBSD$
--- ../../j2se/make/sun/awt/mawt.gmk.orig Sun Dec 10 21:49:45 2006
+++ ../../j2se/make/sun/awt/mawt.gmk Sun Dec 10 21:50:27 2006
@@ -132,9 +132,9 @@
ifeq ($(ARCH_DATA_MODEL), 64)
LIBXT = -lXt
else
- 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
endif
endif
else
@@ -229,7 +229,7 @@
$(EVENT_MODEL)
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
endif
ifeq ($(PLATFORM), solaris)

15
java/jdk16/files/patch-j2se::common::Defs-bsd.gmk
View file

@ -1,13 +1,22 @@
$FreeBSD$ $FreeBSD$
--- ../../j2se/make/common/Defs-bsd.gmk.orig Thu Jan 13 02:03:20 2005 --- ../../j2se/make/common/Defs-bsd.gmk.orig Sun Dec 10 11:49:52 2006
+++ ../../j2se/make/common/Defs-bsd.gmk Thu Jan 13 02:03:38 2005 +++ ../../j2se/make/common/Defs-bsd.gmk Sun Dec 10 21:48:51 2006
@@ -180,7 +180,7 @@ @@ -180,7 +180,7 @@
ifeq ($(TRUE_PLATFORM), NetBSD) ifeq ($(TRUE_PLATFORM), NetBSD)
DEVTOOLS_PATH = /usr/pkg/bin/ DEVTOOLS_PATH = /usr/pkg/bin/
else else
-DEVTOOLS_PATH = /usr/local/bin/ -DEVTOOLS_PATH = /usr/local/bin/
+DEVTOOLS_PATH = ${LOCALBASE}/bin/ +DEVTOOLS_PATH = $(LOCALBASE)/bin/
endif endif
# Allow the user to override the default value... # Allow the user to override the default value...
ifdef ALT_DEVTOOLS_PATH ifdef ALT_DEVTOOLS_PATH
@@ -434,7 +434,7 @@
override LIBTHREAD =
override MOOT_PRIORITIES = true
override NO_INTERRUPTIBLE_IO = false
-override OPENWIN_HOME = /usr/X11R6
+override OPENWIN_HOME = $(X11BASE)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib
override OTHER_M4FLAGS = -DGNU_ASSEMBLER
override SUN_CMM_SUBDIR =

13
java/jdk16/files/patch-j2se::font::Makefile Normal file
View file

@ -0,0 +1,13 @@
$FreeBSD$
--- ../../j2se/make/sun/font/Makefile.orig Sun Dec 10 21:51:17 2006
+++ ../../j2se/make/sun/font/Makefile Sun Dec 10 21:51:50 2006
@@ -125,7 +125,7 @@
# setup the list of libraries to link in...
ifeq ($(PLATFORM), bsd)
# XXXBSD: why here?
-OTHER_INCLUDES += -I/usr/X11R6/include
+OTHER_INCLUDES += -I$(X11BASE)/include
OTHER_LDLIBS += -lawt$(SUFFIX) $(LIBM) $(LIBCXX)
else
ifeq ($(PLATFORM), linux)

15
java/jdk16/files/patch-j2se::gtk::GTKLookAndFeel.java Normal file
View file

@ -0,0 +1,15 @@
$FreeBSD$
--- ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java.orig Sun Dec 10 21:53:38 2006
+++ ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Sun Dec 10 21:54:16 2006
@@ -1387,8 +1387,8 @@
String[] dirs = new String[] {
userHome + "/.themes",
System.getProperty("swing.gtkthemedir"),
- "/usr/X11R6/share/gnome/themes", // FreeBSD
- "/usr/X11R6/share/themes", // FreeBSD
+ "%%X11BASE%%/share/gnome/themes", // FreeBSD
+ "%%X11BASE%%/share/themes", // FreeBSD
"/usr/share/themes" // Debian/Redhat/Solaris/SuSE
};

15
java/jdk16/files/patch-j2se::gtk::Metacity.java Normal file
View file

@ -0,0 +1,15 @@
$FreeBSD$
--- ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java.orig Sun Dec 10 21:55:26 2006
+++ ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java Sun Dec 10 21:55:56 2006
@@ -456,8 +456,8 @@
String[] dirs = new String[] {
userHome + sep + ".themes",
System.getProperty("swing.metacitythemedir"),
- "/usr/X11R6/share/themes",
- "/usr/X11R6/share/gnome/themes",
+ "%%X11BASE%%/share/themes",
+ "%%X11BASE%%/share/gnome/themes",
"/usr/share/themes",
"/usr/gnome/share/themes", // Debian/Redhat/Solaris
"/opt/gnome2/share/themes" // SuSE

13
java/jdk16/files/patch-j2se::xawt::Makefile Normal file
View file

@ -0,0 +1,13 @@
$FreeBSD$
--- ../../j2se/make/sun/xawt/Makefile.orig Sun Dec 10 21:52:27 2006
+++ ../../j2se/make/sun/xawt/Makefile Sun Dec 10 21:52:52 2006
@@ -117,7 +117,7 @@
endif
ifeq ($(PLATFORM), bsd)
- CPPFLAGS += -I/usr/X11R6/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
+ CPPFLAGS += -I$(X11BASE)/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
endif
ifeq ($(PLATFORM), solaris)