Thats at bit better on the motif front!

3 files changed, 68 insertions, 16 deletions

diff --git a/dev-java/sun-j2sdk/ChangeLog b/dev-java/sun-j2sdk/ChangeLog
index b445cd95efe1..0a96186b8143 100644
--- a/dev-java/sun-j2sdk/ChangeLog
+++ b/dev-java/sun-j2sdk/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for dev-java/sun-j2sdk
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.12 2003/01/12 12:21:42 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.13 2003/01/13 20:23:35 cretin Exp $
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
 *sun-j2sdk-1.4.1 (12 Jan 2003)
+  13 Jan 2003; Stefan Jones <cretin@gentoo.org>:
+  Changed motif patch so it doesn't block motif and upped the CFLAGS
+
   12 Jan 2003; Stefan Jones <cretin@gentoo.org>:
   New version, works here, have fun!
 
diff --git a/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-force-motif.patch b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-force-motif.patch
index 69414c956dc3..0676e6805dc2 100644
--- a/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-force-motif.patch
+++ b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-force-motif.patch
@@ -1,6 +1,19 @@
+diff -ru j2sdk.orig/control/make/motif-rules.gmk j2sdk/control/make/motif-rules.gmk
 --- j2sdk.orig/control/make/motif-rules.gmk	2002-09-06 07:00:16.000000000 +0000
-+++ j2sdk/control/make/motif-rules.gmk	2003-01-11 22:02:07.000000000 +0000
-@@ -34,6 +34,9 @@
++++ j2sdk/control/make/motif-rules.gmk	2003-01-13 18:21:50.000000000 +0000
+@@ -25,7 +25,10 @@
+   ABS_MOTIF_DIR := $(shell $(CD) $(MOTIF_DIR); $(PWD))
+ endif
+ 
+-MOTIF = $(MOTIF_DIR)/lib/libXm.a 
++# Use a non-stadard name for motif lib to avoid using the system installed incompatible lib
++# Similar changes made below.
++# Changed by Tushar Teredesai <tush@yahoo.com>
++MOTIF = $(MOTIF_DIR)/lib/libXm-j2sdk.a 
+ 
+ motif: motif-build motif-install
+ 
+@@ -34,6 +37,9 @@
  motif-build:
    ifdef BUILD_MOTIF
  	$(CD) $(MOTIF_TOPDIR)/lib/Xm ; \
@@ -10,16 +23,13 @@
  	$(MAKE) MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL); \
  	$(MAKE) includes MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)
    endif
-@@ -42,16 +45,16 @@
- 
+@@ -43,15 +49,14 @@
  motif-install-lib: $(MOTIF_DIR)/lib 
    ifdef BUILD_MOTIF
--	$(CD) $(MOTIF_DIR)/lib; \
+ 	$(CD) $(MOTIF_DIR)/lib; \
 -	$(RM) libXm.a ; \
 -	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/libXm.a .
-+#	$(CD) $(MOTIF_DIR)/lib; \
-+#	$(RM) libXm.a ; \
-+#	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/libXm.a .
++	$(MV) libXm.a libXm-j2sdk.a
    endif
  
  motif-install-include: $(MOTIF_DIR)/include 
@@ -33,3 +43,42 @@
    endif
  #
  # clobber the workspace, but note that the motif code misses some
+@@ -62,7 +67,7 @@
+   ifdef BUILD_MOTIF
+ 	( $(CD) $(MOTIF_TOPDIR)/lib/Xm ; \
+ 		$(MAKE) clean MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL); ); \
+-	$(RM) $(MOTIF_TOPDIR)/lib/libXm.a \
++	$(RM) $(MOTIF_TOPDIR)/lib/libXm-j2sdk.a \
+ 	      $(MOTIF_TOPDIR)/lib/Xm/Xm.msg 
+ 	$(RM) -r $(MOTIF_TOPDIR)/lib/Xm/exports
+ 	$(RM) -r $(MOTIF_DIR)/lib $(MOTIF_DIR)/include $(MOTIF_DIR)
+diff -ru j2sdk.orig/j2se/make/sun/awt/Makefile j2sdk/j2se/make/sun/awt/Makefile
+--- j2sdk.orig/j2se/make/sun/awt/Makefile	2002-09-06 07:08:23.000000000 +0000
++++ j2sdk/j2se/make/sun/awt/Makefile	2003-01-13 18:05:35.000000000 +0000
+@@ -237,8 +237,10 @@
+ ifneq ($(PLATFORM), windows)
+ # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS/LINUX
+ 
++# If using static motif, use the non-standard name for the lib
++# Changed by Tushar Teredesai <tush@yahoo.com>
+ ifeq ($(STATIC_MOTIF),true)
+-  LIBXM = $(MOTIF_LIB)/libXm.a -lXp
++  LIBXM = $(MOTIF_LIB)/libXm-j2sdk.a -lXp
+ else # STATIC_MOTIF
+   LIBXM = -lXm
+ endif # STATIC_MOTIF
+diff -ru j2sdk.orig/j2se/make/sun/awt/mawt.gmk j2sdk/j2se/make/sun/awt/mawt.gmk
+--- j2sdk.orig/j2se/make/sun/awt/mawt.gmk	2002-09-06 07:08:24.000000000 +0000
++++ j2sdk/j2se/make/sun/awt/mawt.gmk	2003-01-13 18:05:35.000000000 +0000
+@@ -125,8 +125,10 @@
+ else
+ CFLAGS += -DMOTIF_VERSION=$(MOTIF_VERSION)
+ 
++# If using static motif, use non-standard lib name
++# Changed by Tushar Teredesai <tush@yahoo.com>
+ ifeq ($(STATIC_MOTIF),true)
+-LIBXM = $(MOTIF_LIB)/libXm.a -lXp
++LIBXM = $(MOTIF_LIB)/libXm-j2sdk.a -lXp
+ else
+ LIBXM = -lXm
+ endif
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild
index 449444226df1..71e6f327a967 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild,v 1.2 2003/01/12 20:01:53 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild,v 1.3 2003/01/13 20:23:35 cretin Exp $
 
 # Maintainer: Stefan Jones <cretin@gentoo.org>
 # Author: Stefan Jones <cretin@gentoo.org>
@@ -38,11 +38,10 @@ RDEPEND="virtual/glibc
 	virtual/x11
 	>=dev-java/java-config-0.1.3"
 DEPEND="${RDEPEND}
+	sys-apps/cpio
 	app-arch/zip
 	app-arch/unzip
-	>=virtual/jdk-1.4
-	!x11-libs/lesstif
-	!x11-libs/openmotif"
+	>=virtual/jdk-1.4"
 
 PROVIDE="virtual/jre-1.4.1
 	virtual/jdk-1.4.1
@@ -114,12 +113,13 @@ src_compile () {
 
 	# Any CFLAGS will cause the build to fail! 
 	# If you don't believe me ...
-	#export OTHER_CFLAGS=${CFLAGS}
-	#export OTHER_CXXFLAGS=${CXXFLAGS}
-	unset CFLAGS CXXFLAGS
+	export OTHER_CFLAGS=${CFLAGS}
+	export OTHER_CXXFLAGS=${CXXFLAGS}
+	unset CFLAGS CXXFLAGS LDFLAGS
 	
 	export ALT_MOZILLA_PATH="${S}/mozilla"
 	export ALT_BOOTDIR=`java-config --jdk-home`
+	export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts
 	export ALT_MOTIF_DIR="${S}/motif"
 	export ALT_DEVTOOLS_PATH="/usr/bin"
 	export MILESTONE="gentoo"