gcj: 4.2.3 -> 4.3.2

gcj/.md5sum

@@ -1,5 +1,4 @@
-780338e27c460545870434851199b534  gcc-core-4.2.3.tar.bz2
+dd8048b43d3d4e5595bcade47b9144c6  gcc-core-4.3.2.tar.bz2
-a028c39386dae7d16299b3c96a281116  gcc-g++-4.2.3.tar.bz2
+bfdf8d19e1b85f522f8b8d48d25e7aaa  gcc-g++-4.3.2.tar.bz2
-5a0c2444854964ac6d6ea23683385623  gcc-java-4.2.3.tar.bz2
+4a1dee5782dccc505072c6401cf1d4c3  gcc-java-4.3.2.tar.bz2
-839458a2fcff05c785b2b5d104397396  gcj-4.2.3-fixinc.patch
 a617c4d3fa11e0c9410ac213eb061677  gcj-4.2.3-nocheck-fixincludes.patch

gcj/Pkgfile

@@ -5,15 +5,13 @@
 # Depends On: alsa-lib
 
 name=gcj
-version=4.2.3
+version=4.3.2
-release=2
+release=1
-source=(ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-{core,g++,java}-$version.tar.bz2 \
+source=(ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-{core,g++,java}-$version.tar.bz2
-	gcj-$version-nocheck-fixincludes.patch \
+	$name-4.2.3-nocheck-fixincludes.patch)
-	gcj-$version-fixinc.patch)
 
 build() {
-	patch -d gcc-$version -p 1 -i ../gcj-$version-nocheck-fixincludes.patch
+	patch -d gcc-$version -p 1 -i $SRC/$name-4.2.3-nocheck-fixincludes.patch
-	patch -d gcc-$version -p 1 -i ../gcj-$version-fixinc.patch
 
 	sed -i gcc-$version/gcc/version.c \
 		-e 's|VERSUFFIX ""|VERSUFFIX " (CRUX)"|'
@@ -35,7 +33,7 @@ build() {
 
 	make bootstrap
 	make check
-	make -j 1 prefix=$PKG/usr install
+	make -j 1 DESTDIR=$PKG install
 
 	ln -sf /usr/libexec/gcc/i686-pc-linux-gnu/$version/jc1 $PKG/usr/bin/jc1
 	

gcj/gcj-4.2.3-fixinc.patch

@@ -1,16 +0,0 @@
-diff -Nru gcc-4.2.1.orig/gcc/Makefile.in gcc-4.2.1/gcc/Makefile.in
---- gcc-4.2.1.orig/gcc/Makefile.in	2007-08-15 13:45:59.000000000 +0200
-+++ gcc-4.2.1/gcc/Makefile.in	2007-08-15 14:57:32.000000000 +0200
-@@ -3251,12 +3251,6 @@
- 	  $(MAKE) real-$(INSTALL_HEADERS_DIR) DESTDIR=`pwd`/../gcc/ \
- 	    libsubdir=. ; \
- 	else \
--	  (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
--	    SHELL='$(SHELL)'; MACRO_LIST=`${PWD_COMMAND}`/macro_list ; \
--	    export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
--	    cd $(build_objdir)/fixincludes && \
--	    $(SHELL) ./fixinc.sh ../../gcc/include \
--	      $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \
- 	  rm -f include/syslimits.h; \
- 	  if [ -f include/limits.h ]; then \
- 	    mv include/limits.h include/syslimits.h; \