3 files changed, 29 insertions, 16 deletions

diff --git a/x11-toolkits/swt31/Makefile b/x11-toolkits/swt31/Makefile
index 06d27b680b90..15d2ed8d4aef 100644
--- a/x11-toolkits/swt31/Makefile
+++ b/x11-toolkits/swt31/Makefile
@@ -31,6 +31,7 @@ PLIST_FILES=	%%JAVAJARDIR%%/swt.jar \
 		lib/libswt-pi-gtk-%%BUILD%%.so
 
 USE_JAVA=	yes
+USE_REINPLACE=	yes
 JAVA_VERSION=	1.4+
 JAVA_OS=	native
 
@@ -98,13 +99,17 @@ post-patch:
 	  + "cairo_structs.c" \
 	  + "cairo_structs.h"
 .endif
+	@${REINPLACE_CMD} -E \
+		-e 's|%%CC%%|${CC}|' \
+		-e 's|%%CXX%%|${CXX}|' \
+		${WRKSRC}/build.sh
 
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} build.sh)
 
 do-install:
 	${MKDIR} ${JAVAJARDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/libswt-*.so ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libswt-*.so ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/swt.jar ${JAVAJARDIR}/
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/swt31/files/patch-build.sh b/x11-toolkits/swt31/files/patch-build.sh
index 3b92678a9766..26d351c751f9 100644
--- a/x11-toolkits/swt31/files/patch-build.sh
+++ b/x11-toolkits/swt31/files/patch-build.sh
@@ -1,12 +1,13 @@
---- build.sh.orig	Fri May 13 11:37:09 2005
-+++ build.sh	Sat May 14 21:02:00 2005
-@@ -100,6 +100,33 @@
+--- build.sh.orig	Wed May  4 19:44:42 2005
++++ build.sh	Wed Jan  4 08:43:08 2006
+@@ -100,6 +100,34 @@
  				;;	
  		esac
  		;;
 +	"FreeBSD")
-+		CC=gcc
-+		LD=gcc
++		CC=%%CC%%
++		CXX=%%CXX%%
++		LD=%%CC%%
 +		XTEST_LIB_PATH=$X11BASE/lib
 +		GECKO_I=${X11BASE}/include/${BROWSER}
 +		GECKO_INCLUDES="-I${GECKO_I} -I${LOCALBASE}/include/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring"
@@ -34,9 +35,12 @@
  	"SunOS")
  		CC=gcc
  		LD=gcc
-@@ -128,4 +155,4 @@
+@@ -126,6 +154,6 @@
+ 	;;
+ esac
  
- export CC LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR
+-export CC LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR
++export CC CXX LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR
  
 -make -f $makefile ${1} ${2} ${3} ${4}
 +gmake -f $makefile ${1} ${2} ${3} ${4}
diff --git a/x11-toolkits/swt31/files/patch-make_freebsd.mak b/x11-toolkits/swt31/files/patch-make_freebsd.mak
index 6b41128a4cbb..37a506210299 100644
--- a/x11-toolkits/swt31/files/patch-make_freebsd.mak
+++ b/x11-toolkits/swt31/files/patch-make_freebsd.mak
@@ -1,5 +1,5 @@
---- make_freebsd.mak.orig	Thu Dec 15 18:14:06 2005
-+++ make_freebsd.mak	Thu Dec 15 18:25:59 2005
+--- make_freebsd.mak.orig	Wed Jan  4 08:43:21 2006
++++ make_freebsd.mak	Wed Jan  4 08:44:07 2006
 @@ -9,7 +9,7 @@
  #     IBM Corporation - initial API and implementation
  #*******************************************************************************
@@ -9,16 +9,19 @@
  
  include make_common.mak
  
-@@ -61,7 +61,7 @@
+@@ -61,32 +61,34 @@
  	-fPIC \
  	-I./ \
  	-I$(JAVA_HOME)/include \
 -	-I$(JAVA_HOME)/include/linux \
 +	-I$(JAVA_HOME)/include/freebsd \
  	${GECKO_INCLUDES} \
- 	${SWT_PTR_CFLAGS}
+-	${SWT_PTR_CFLAGS}
++	${SWT_PTR_CFLAGS} \
++	$(CFLAGS)
+ 	
+ MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic ${GECKO_LIBS}
  	
-@@ -70,7 +70,7 @@
  SWT_OBJECTS = swt.o callback.o
  AWT_OBJECTS = swt_awt.o
  SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
@@ -27,8 +30,9 @@
  ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
  GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
  MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
-@@ -78,15 +78,16 @@
- CFLAGS = -O -Wall \
+  
+-CFLAGS = -O -Wall \
++CFLAGS += -Wall \
  		-DSWT_VERSION=$(SWT_VERSION) \
  		$(NATIVE_STATS) \
 -		-DLINUX -DGTK \
@@ -49,7 +53,7 @@
  
  #
  # SWT libs
-@@ -123,8 +124,6 @@
+@@ -123,8 +125,6 @@
  
  cairo.o: cairo.c cairo.h swt.h
  	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c