11 files changed, 145 insertions, 135 deletions

diff --git a/devel/i386-rtems-objc/Makefile b/devel/i386-rtems-objc/Makefile
index 98d0528277f4..29535bea2397 100644
--- a/devel/i386-rtems-objc/Makefile
+++ b/devel/i386-rtems-objc/Makefile
@@ -6,26 +6,34 @@
 #
 
 PORTNAME=	objc
-PORTVERSION=	3.2.1
+PORTVERSION=	3.2.3
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE} \
-		${MASTER_SITE_SOURCEWARE:S/$/:gcc/}
+		${MASTER_SITE_GNU:S/$/:gcc/}
 MASTER_SITE_SUBDIR=	newlib \
-			gcc/releases/${OBJCNAME}/:gcc
+			${PORTNAME}/${GCCNAME}/:gcc
 DISTFILES=		${NEWLIBNAME}.tar.gz \
 			${OBJCNAME}.tar.gz:gcc
-PATCHFILES=	${OBJCNAME}-rtems-20021209.diff \
-		${NEWLIBNAME}-rtems-20030120.diff
+PATCHFILES=	${OBJCNAME}-rtems-20030507a.diff \
+		${NEWLIBNAME}-rtems-20030605.diff
 PATCH_SITES=	ftp://ftp.rtems.com/pub/rtems/snapshots/c_tools/source/ \
 		http://rtems.thehousleys.net/
 
 MAINTAINER=	jeh@FreeBSD.org
 COMMENT=	FSF OBJC-gcc-3.2.1 base-port for RTEMS development
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not build"
+.endif
+
 LCLTARGET?=	i386-rtems
 
-OBJCNAME=	gcc-3.2.1
+GCCVERSION=	3.2.3
+OBJCNAME=	gcc-${GCCVERSION}
+PLIST_SUB+=	"GCCVERSION=${GCCVERSION}"
 NEWLIBNAME=	newlib-1.11.0
 MASTERDIR=	${.CURDIR}/../i386-rtems-objc
 PLIST=		${PKGDIR}/pkg-plist.${LCLTARGET}
@@ -37,12 +45,14 @@ RUN_DEPENDS=	${LCLTARGET}-gcc:${PORTSDIR}/devel/${LCLTARGET}-gcc
 PKGNAMEPREFIX=	${LCLTARGET}-
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-ALL_TARGET=	all
+ALL_TARGET=	all info
 NO_CPUCFLAGS=	yes
 
 CONFIGURE_TARGET?=	--target=${LCLTARGET}
 CONFIGURE_ARGS?=	--with-gnu-as --with-gnu-ld --with-newlib --verbose \
-			--enable-languages="objc"
+			--enable-languages="objc" \
+			--with-libiconv-prefix=${LOCALBASE} \
+			--without-included-gettext
 CONFIGURE_WRKSRC?=	${WRKDIR}/build-${LCLTARGET}
 CONFIGURE_SCRIPT?=	../${OBJCNAME}/configure
 
@@ -65,4 +75,4 @@ do-install:
 	@(cd ${WRKDIR}/build-${LCLTARGET} && \
 	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/i386-rtems-objc/distinfo b/devel/i386-rtems-objc/distinfo
index 4c10cd3387a1..ec8a0a1daedb 100644
--- a/devel/i386-rtems-objc/distinfo
+++ b/devel/i386-rtems-objc/distinfo
@@ -1,4 +1,4 @@
 MD5 (newlib-1.11.0.tar.gz) = 74de7de0c9624cd757df63f2ed17a9b4
-MD5 (gcc-3.2.1.tar.gz) = 82c26f362a6df7d2ba5b967606bd7d9a
-MD5 (gcc-3.2.1-rtems-20021209.diff) = 70d1c95af96ec4901261810909faeffa
-MD5 (newlib-1.11.0-rtems-20030120.diff) = bd3f5e9216a5ea4c66b397908d1e683c
+MD5 (gcc-3.2.3.tar.gz) = e951123b2dfd2288c3e9337024dc9e4c
+MD5 (gcc-3.2.3-rtems-20030507a.diff) = d4adda8ccba7ad57ee36b7720eadf19c
+MD5 (newlib-1.11.0-rtems-20030605.diff) = b1dfdabd92e241d835964c6ef86aa3c9
diff --git a/devel/i386-rtems-objc/files/patch-aa b/devel/i386-rtems-objc/files/patch-aa
index c74086e2f845..c46cfa95295a 100644
--- a/devel/i386-rtems-objc/files/patch-aa
+++ b/devel/i386-rtems-objc/files/patch-aa
@@ -1,5 +1,5 @@
---- gcc-3.2.1/Makefile.in.orig	Mon Oct  7 16:47:05 2002
-+++ gcc-3.2.1/Makefile.in	Sun Feb  2 20:20:51 2003
+--- gcc-3.2.3/Makefile.in.orig	Mon Oct  7 16:47:05 2002
++++ gcc-3.2.3/Makefile.in	Sun Feb  2 20:20:51 2003
 @@ -678,9 +678,7 @@
  	install-autoconf \
  	install-automake \
diff --git a/devel/i386-rtems-objc/files/patch-ab b/devel/i386-rtems-objc/files/patch-ab
index bced888e2972..59ff3af2d4ea 100644
--- a/devel/i386-rtems-objc/files/patch-ab
+++ b/devel/i386-rtems-objc/files/patch-ab
@@ -1,5 +1,5 @@
---- gcc-3.2.1/gcc/Makefile.in.orig	Mon Oct 14 17:04:16 2002
-+++ gcc-3.2.1/gcc/Makefile.in	Sun Feb  2 22:07:09 2003
+--- gcc-3.2.3/gcc/Makefile.in.orig	Tue Jan 28 16:54:07 2003
++++ gcc-3.2.3/gcc/Makefile.in	Sat Sep  6 19:45:51 2003
 @@ -405,7 +405,7 @@
  
  # It is convenient for configure to add the assignment at the beginning,
@@ -18,7 +18,7 @@
  
  # List of things which should already be built whenever we try to use xgcc
  # to compile anything (without linking).
-@@ -2530,9 +2530,8 @@
+@@ -2531,9 +2531,8 @@
  # Copy the compiler files into directories where they will be run.
  # Install the driver last so that the window when things are
  # broken is small.
@@ -30,57 +30,57 @@
  
  # Handle cpp installation.
  install-cpp: cpp$(exeext)
-@@ -2593,53 +2592,6 @@
+@@ -2581,53 +2580,6 @@
  	  else true; \
  	  fi; \
  	done
 -	for file in $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_COLLECT2) ..; do \
 -	  if [ x"$$file" != x.. ]; then \
--	    rm -f $(libsubdir)/$$file; \
--	    $(INSTALL_PROGRAM) $$file $(libsubdir)/$$file; \
+-	    rm -f $(DESTDIR)$(libsubdir)/$$file; \
+-	    $(INSTALL_PROGRAM) $$file $(DESTDIR)$(libsubdir)/$$file; \
 -	  else true; fi; \
 -	done
 -	for file in $(EXTRA_PARTS) ..; do \
 -	  if [ x"$$file" != x.. ]; then \
--	    rm -f $(libsubdir)/$$file; \
--	    $(INSTALL_DATA) $$file $(libsubdir)/$$file; \
--	    chmod a-x $(libsubdir)/$$file; \
+-	    rm -f $(DESTDIR)$(libsubdir)/$$file; \
+-	    $(INSTALL_DATA) $$file $(DESTDIR)$(libsubdir)/$$file; \
+-	    chmod a-x $(DESTDIR)$(libsubdir)/$$file; \
 -	  else true; fi; \
 -	done
 -# Don't mess with specs if it doesn't exist yet.
 -	-if [ -f specs ] ; then \
--	  rm -f $(libsubdir)/specs; \
--	  $(INSTALL_DATA) specs $(libsubdir)/specs; \
--	  chmod a-x $(libsubdir)/specs; \
+-	  rm -f $(DESTDIR)$(libsubdir)/specs; \
+-	  $(INSTALL_DATA) specs $(DESTDIR)$(libsubdir)/specs; \
+-	  chmod a-x $(DESTDIR)$(libsubdir)/specs; \
 -	fi
 -# Install protoize if it was compiled.
 -	-if [ -f protoize$(exeext) ]; \
 -	then \
 -	    if [ -f gcc-cross$(exeext) ] ; then \
--		rm -f $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \
--		$(INSTALL_PROGRAM) protoize$(exeext) $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \
--		rm -f $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \
--		$(INSTALL_PROGRAM) unprotoize$(exeext) $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \
+-		rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \
+-		$(INSTALL_PROGRAM) protoize$(exeext) $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \
+-		rm -f $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \
+-		$(INSTALL_PROGRAM) unprotoize$(exeext) $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \
 -	    else \
--		rm -f $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
--		$(INSTALL_PROGRAM) protoize$(exeext) $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
--		rm -f $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
--		$(INSTALL_PROGRAM) unprotoize$(exeext) $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
+-		rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
+-		$(INSTALL_PROGRAM) protoize$(exeext) $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
+-		rm -f $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
+-		$(INSTALL_PROGRAM) unprotoize$(exeext) $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
 -	    fi ; \
--	    rm -f $(libsubdir)/SYSCALLS.c.X; \
--	    $(INSTALL_DATA) SYSCALLS.c.X $(libsubdir)/SYSCALLS.c.X; \
--	    chmod a-x $(libsubdir)/SYSCALLS.c.X; \
+-	    rm -f $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
+-	    $(INSTALL_DATA) SYSCALLS.c.X $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
+-	    chmod a-x $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
 -	fi
--	-rm -f $(libsubdir)/cpp0$(exeext)
--	$(INSTALL_PROGRAM) cpp0$(exeext) $(libsubdir)/cpp0$(exeext)
--	-rm -f $(libsubdir)/tradcpp0$(exeext)
--	$(INSTALL_PROGRAM) tradcpp0$(exeext) $(libsubdir)/tradcpp0$(exeext)
+-	-rm -f $(DESTDIR)$(libsubdir)/cpp0$(exeext)
+-	$(INSTALL_PROGRAM) cpp0$(exeext) $(DESTDIR)$(libsubdir)/cpp0$(exeext)
+-	-rm -f $(DESTDIR)$(libsubdir)/tradcpp0$(exeext)
+-	$(INSTALL_PROGRAM) tradcpp0$(exeext) $(DESTDIR)$(libsubdir)/tradcpp0$(exeext)
 -# Install gcov if it was compiled.
 -	-if [ -f gcov$(exeext) ]; \
 -	then \
--	    rm -f $(bindir)/gcov$(exeext); \
--	    $(INSTALL_PROGRAM) gcov$(exeext) $(bindir)/$(GCOV_INSTALL_NAME)$(exeext); \
+-	    rm -f $(DESTDIR)$(bindir)/gcov$(exeext); \
+-	    $(INSTALL_PROGRAM) gcov$(exeext) $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext); \
 -	fi
- 	$(INSTALL_SCRIPT) gccbug $(bindir)/$(GCCBUG_INSTALL_NAME)
+ 	$(INSTALL_SCRIPT) gccbug $(DESTDIR)$(bindir)/$(GCCBUG_INSTALL_NAME)
  
  # Install the driver program as $(target_alias)-gcc
diff --git a/devel/i386-rtems-objc/pkg-plist.arm-rtems b/devel/i386-rtems-objc/pkg-plist.arm-rtems
index e7dfb8c5f8c4..c17cb09f527d 100644
--- a/devel/i386-rtems-objc/pkg-plist.arm-rtems
+++ b/devel/i386-rtems-objc/pkg-plist.arm-rtems
@@ -2,16 +2,16 @@ arm-rtems/lib/thumb/libobjc.la
 arm-rtems/lib/thumb/libobjc.a        
 arm-rtems/lib/libobjc.la  
 arm-rtems/lib/libobjc.a  
-lib/gcc-lib/arm-rtems/3.2.1/include/objc/hash.h
-lib/gcc-lib/arm-rtems/3.2.1/include/objc/objc-list.h
-lib/gcc-lib/arm-rtems/3.2.1/include/objc/sarray.h
-lib/gcc-lib/arm-rtems/3.2.1/include/objc/objc.h
-lib/gcc-lib/arm-rtems/3.2.1/include/objc/objc-api.h
-lib/gcc-lib/arm-rtems/3.2.1/include/objc/NXConstStr.h
-lib/gcc-lib/arm-rtems/3.2.1/include/objc/Object.h
-lib/gcc-lib/arm-rtems/3.2.1/include/objc/Protocol.h
-lib/gcc-lib/arm-rtems/3.2.1/include/objc/encoding.h
-lib/gcc-lib/arm-rtems/3.2.1/include/objc/typedstream.h
-lib/gcc-lib/arm-rtems/3.2.1/include/objc/thr.h
-lib/gcc-lib/arm-rtems/3.2.1/cc1obj
-@dirrm lib/gcc-lib/arm-rtems/3.2.1/include/objc
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/include/objc/hash.h
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/include/objc/objc-list.h
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/include/objc/sarray.h
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/include/objc/objc.h
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/include/objc/objc-api.h
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/include/objc/NXConstStr.h
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/include/objc/Object.h
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/include/objc/Protocol.h
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/include/objc/encoding.h
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/include/objc/typedstream.h
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/include/objc/thr.h
+lib/gcc-lib/arm-rtems/%%GCCVERSION%%/cc1obj
+@dirrm lib/gcc-lib/arm-rtems/%%GCCVERSION%%/include/objc
diff --git a/devel/i386-rtems-objc/pkg-plist.i386-rtems b/devel/i386-rtems-objc/pkg-plist.i386-rtems
index 1a016717b98c..890745ef7bc6 100644
--- a/devel/i386-rtems-objc/pkg-plist.i386-rtems
+++ b/devel/i386-rtems-objc/pkg-plist.i386-rtems
@@ -16,16 +16,16 @@ i386-rtems/lib/athlon/libobjc.la
 i386-rtems/lib/athlon/libobjc.a
 i386-rtems/lib/libobjc.la
 i386-rtems/lib/libobjc.a
-lib/gcc-lib/i386-rtems/3.2.1/include/objc/hash.h
-lib/gcc-lib/i386-rtems/3.2.1/include/objc/objc-list.h
-lib/gcc-lib/i386-rtems/3.2.1/include/objc/sarray.h
-lib/gcc-lib/i386-rtems/3.2.1/include/objc/objc.h
-lib/gcc-lib/i386-rtems/3.2.1/include/objc/objc-api.h
-lib/gcc-lib/i386-rtems/3.2.1/include/objc/NXConstStr.h
-lib/gcc-lib/i386-rtems/3.2.1/include/objc/Object.h
-lib/gcc-lib/i386-rtems/3.2.1/include/objc/Protocol.h
-lib/gcc-lib/i386-rtems/3.2.1/include/objc/encoding.h
-lib/gcc-lib/i386-rtems/3.2.1/include/objc/typedstream.h
-lib/gcc-lib/i386-rtems/3.2.1/include/objc/thr.h
-lib/gcc-lib/i386-rtems/3.2.1/cc1obj
-@dirrm lib/gcc-lib/i386-rtems/3.2.1/include/objc
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/include/objc/hash.h
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/include/objc/objc-list.h
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/include/objc/sarray.h
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/include/objc/objc.h
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/include/objc/objc-api.h
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/include/objc/NXConstStr.h
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/include/objc/Object.h
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/include/objc/Protocol.h
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/include/objc/encoding.h
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/include/objc/typedstream.h
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/include/objc/thr.h
+lib/gcc-lib/i386-rtems/%%GCCVERSION%%/cc1obj
+@dirrm lib/gcc-lib/i386-rtems/%%GCCVERSION%%/include/objc
diff --git a/devel/i386-rtems-objc/pkg-plist.m68k-rtems b/devel/i386-rtems-objc/pkg-plist.m68k-rtems
index 0214f750bc25..2f9a98fd1abd 100644
--- a/devel/i386-rtems-objc/pkg-plist.m68k-rtems
+++ b/devel/i386-rtems-objc/pkg-plist.m68k-rtems
@@ -1,15 +1,15 @@
-lib/gcc-lib/m68k-rtems/3.2.1/include/objc/hash.h
-lib/gcc-lib/m68k-rtems/3.2.1/include/objc/objc-list.h
-lib/gcc-lib/m68k-rtems/3.2.1/include/objc/sarray.h
-lib/gcc-lib/m68k-rtems/3.2.1/include/objc/objc.h
-lib/gcc-lib/m68k-rtems/3.2.1/include/objc/objc-api.h
-lib/gcc-lib/m68k-rtems/3.2.1/include/objc/NXConstStr.h
-lib/gcc-lib/m68k-rtems/3.2.1/include/objc/Object.h
-lib/gcc-lib/m68k-rtems/3.2.1/include/objc/Protocol.h
-lib/gcc-lib/m68k-rtems/3.2.1/include/objc/encoding.h
-lib/gcc-lib/m68k-rtems/3.2.1/include/objc/typedstream.h
-lib/gcc-lib/m68k-rtems/3.2.1/include/objc/thr.h
-lib/gcc-lib/m68k-rtems/3.2.1/cc1obj
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/include/objc/hash.h
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/include/objc/objc-list.h
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/include/objc/sarray.h
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/include/objc/objc.h
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/include/objc/objc-api.h
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/include/objc/NXConstStr.h
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/include/objc/Object.h
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/include/objc/Protocol.h
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/include/objc/encoding.h
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/include/objc/typedstream.h
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/include/objc/thr.h
+lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/cc1obj
 m68k-rtems/lib/m68000/libobjc.la     
 m68k-rtems/lib/m68000/libobjc.a
 m68k-rtems/lib/m68040/msoft-float/libobjc.la
@@ -28,4 +28,4 @@ m68k-rtems/lib/msoft-float/libobjc.la
 m68k-rtems/lib/msoft-float/libobjc.a
 m68k-rtems/lib/libobjc.la
 m68k-rtems/lib/libobjc.a
-@dirrm lib/gcc-lib/m68k-rtems/3.2.1/include/objc
+@dirrm lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/include/objc
diff --git a/devel/i386-rtems-objc/pkg-plist.mips-rtems b/devel/i386-rtems-objc/pkg-plist.mips-rtems
index 8704302851d8..432f16e52996 100644
--- a/devel/i386-rtems-objc/pkg-plist.mips-rtems
+++ b/devel/i386-rtems-objc/pkg-plist.mips-rtems
@@ -1,15 +1,15 @@
-lib/gcc-lib/mips-rtems/3.2.1/include/objc/hash.h
-lib/gcc-lib/mips-rtems/3.2.1/include/objc/objc-list.h
-lib/gcc-lib/mips-rtems/3.2.1/include/objc/sarray.h
-lib/gcc-lib/mips-rtems/3.2.1/include/objc/objc.h
-lib/gcc-lib/mips-rtems/3.2.1/include/objc/objc-api.h
-lib/gcc-lib/mips-rtems/3.2.1/include/objc/NXConstStr.h
-lib/gcc-lib/mips-rtems/3.2.1/include/objc/Object.h
-lib/gcc-lib/mips-rtems/3.2.1/include/objc/Protocol.h
-lib/gcc-lib/mips-rtems/3.2.1/include/objc/encoding.h
-lib/gcc-lib/mips-rtems/3.2.1/include/objc/typedstream.h
-lib/gcc-lib/mips-rtems/3.2.1/include/objc/thr.h
-lib/gcc-lib/mips-rtems/3.2.1/cc1obj
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/include/objc/hash.h
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/include/objc/objc-list.h
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/include/objc/sarray.h
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/include/objc/objc.h
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/include/objc/objc-api.h
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/include/objc/NXConstStr.h
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/include/objc/Object.h
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/include/objc/Protocol.h
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/include/objc/encoding.h
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/include/objc/typedstream.h
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/include/objc/thr.h
+lib/gcc-lib/mips-rtems/%%GCCVERSION%%/cc1obj
 mips-rtems/lib/el/libobjc.la
 mips-rtems/lib/el/libobjc.a
 mips-rtems/lib/single/el/libobjc.la  
@@ -22,4 +22,4 @@ mips-rtems/lib/soft-float/libobjc.la
 mips-rtems/lib/soft-float/libobjc.a
 mips-rtems/lib/libobjc.la
 mips-rtems/lib/libobjc.a
-@dirrm lib/gcc-lib/mips-rtems/3.2.1/include/objc
+@dirrm lib/gcc-lib/mips-rtems/%%GCCVERSION%%/include/objc
diff --git a/devel/i386-rtems-objc/pkg-plist.powerpc-rtems b/devel/i386-rtems-objc/pkg-plist.powerpc-rtems
index c1e7750176e6..adf3ea55dbe3 100644
--- a/devel/i386-rtems-objc/pkg-plist.powerpc-rtems
+++ b/devel/i386-rtems-objc/pkg-plist.powerpc-rtems
@@ -1,15 +1,15 @@
-lib/gcc-lib/powerpc-rtems/3.2.1/include/objc/hash.h
-lib/gcc-lib/powerpc-rtems/3.2.1/include/objc/objc-list.h
-lib/gcc-lib/powerpc-rtems/3.2.1/include/objc/sarray.h
-lib/gcc-lib/powerpc-rtems/3.2.1/include/objc/objc.h
-lib/gcc-lib/powerpc-rtems/3.2.1/include/objc/objc-api.h
-lib/gcc-lib/powerpc-rtems/3.2.1/include/objc/NXConstStr.h
-lib/gcc-lib/powerpc-rtems/3.2.1/include/objc/Object.h
-lib/gcc-lib/powerpc-rtems/3.2.1/include/objc/Protocol.h
-lib/gcc-lib/powerpc-rtems/3.2.1/include/objc/encoding.h
-lib/gcc-lib/powerpc-rtems/3.2.1/include/objc/typedstream.h
-lib/gcc-lib/powerpc-rtems/3.2.1/include/objc/thr.h
-lib/gcc-lib/powerpc-rtems/3.2.1/cc1obj
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/include/objc/hash.h
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/include/objc/objc-list.h
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/include/objc/sarray.h
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/include/objc/objc.h
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/include/objc/objc-api.h
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/include/objc/NXConstStr.h
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/include/objc/Object.h
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/include/objc/Protocol.h
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/include/objc/encoding.h
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/include/objc/typedstream.h
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/include/objc/thr.h
+lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/cc1obj
 powerpc-rtems/lib/m403/roe/libobjc.la         
 powerpc-rtems/lib/m403/roe/libobjc.a         
 powerpc-rtems/lib/m403/libobjc.la         
@@ -70,4 +70,4 @@ powerpc-rtems/lib/nof/libobjc.la
 powerpc-rtems/lib/nof/libobjc.a
 powerpc-rtems/lib/libobjc.la
 powerpc-rtems/lib/libobjc.a
-@dirrm lib/gcc-lib/powerpc-rtems/3.2.1/include/objc
+@dirrm lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/include/objc
diff --git a/devel/i386-rtems-objc/pkg-plist.sh-rtems b/devel/i386-rtems-objc/pkg-plist.sh-rtems
index 9cdaa2c30a20..747d83291d2c 100644
--- a/devel/i386-rtems-objc/pkg-plist.sh-rtems
+++ b/devel/i386-rtems-objc/pkg-plist.sh-rtems
@@ -1,15 +1,15 @@
-lib/gcc-lib/sh-rtems/3.2.1/include/objc/hash.h
-lib/gcc-lib/sh-rtems/3.2.1/include/objc/objc-list.h
-lib/gcc-lib/sh-rtems/3.2.1/include/objc/sarray.h
-lib/gcc-lib/sh-rtems/3.2.1/include/objc/objc.h
-lib/gcc-lib/sh-rtems/3.2.1/include/objc/objc-api.h
-lib/gcc-lib/sh-rtems/3.2.1/include/objc/NXConstStr.h
-lib/gcc-lib/sh-rtems/3.2.1/include/objc/Object.h
-lib/gcc-lib/sh-rtems/3.2.1/include/objc/Protocol.h
-lib/gcc-lib/sh-rtems/3.2.1/include/objc/encoding.h
-lib/gcc-lib/sh-rtems/3.2.1/include/objc/typedstream.h
-lib/gcc-lib/sh-rtems/3.2.1/include/objc/thr.h
-lib/gcc-lib/sh-rtems/3.2.1/cc1obj
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/include/objc/hash.h
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/include/objc/objc-list.h
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/include/objc/sarray.h
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/include/objc/objc.h
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/include/objc/objc-api.h
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/include/objc/NXConstStr.h
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/include/objc/Object.h
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/include/objc/Protocol.h
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/include/objc/encoding.h
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/include/objc/typedstream.h
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/include/objc/thr.h
+lib/gcc-lib/sh-rtems/%%GCCVERSION%%/cc1obj
 sh-rtems/lib/ml/m2/libobjc.la
 sh-rtems/lib/ml/m2/libobjc.a            
 sh-rtems/lib/ml/m3e/libobjc.la
@@ -34,4 +34,4 @@ sh-rtems/lib/m4/libobjc.la
 sh-rtems/lib/m4/libobjc.a
 sh-rtems/lib/libobjc.la
 sh-rtems/lib/libobjc.a
-@dirrm lib/gcc-lib/sh-rtems/3.2.1/include/objc
+@dirrm lib/gcc-lib/sh-rtems/%%GCCVERSION%%/include/objc
diff --git a/devel/i386-rtems-objc/pkg-plist.sparc-rtems b/devel/i386-rtems-objc/pkg-plist.sparc-rtems
index 7a78d6c0de47..3df8144f7d7f 100644
--- a/devel/i386-rtems-objc/pkg-plist.sparc-rtems
+++ b/devel/i386-rtems-objc/pkg-plist.sparc-rtems
@@ -1,15 +1,15 @@
-lib/gcc-lib/sparc-rtems/3.2.1/include/objc/hash.h
-lib/gcc-lib/sparc-rtems/3.2.1/include/objc/objc-list.h
-lib/gcc-lib/sparc-rtems/3.2.1/include/objc/sarray.h
-lib/gcc-lib/sparc-rtems/3.2.1/include/objc/objc.h
-lib/gcc-lib/sparc-rtems/3.2.1/include/objc/objc-api.h
-lib/gcc-lib/sparc-rtems/3.2.1/include/objc/NXConstStr.h
-lib/gcc-lib/sparc-rtems/3.2.1/include/objc/Object.h
-lib/gcc-lib/sparc-rtems/3.2.1/include/objc/Protocol.h
-lib/gcc-lib/sparc-rtems/3.2.1/include/objc/encoding.h
-lib/gcc-lib/sparc-rtems/3.2.1/include/objc/typedstream.h
-lib/gcc-lib/sparc-rtems/3.2.1/include/objc/thr.h
-lib/gcc-lib/sparc-rtems/3.2.1/cc1obj
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/include/objc/hash.h
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/include/objc/objc-list.h
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/include/objc/sarray.h
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/include/objc/objc.h
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/include/objc/objc-api.h
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/include/objc/NXConstStr.h
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/include/objc/Object.h
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/include/objc/Protocol.h
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/include/objc/encoding.h
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/include/objc/typedstream.h
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/include/objc/thr.h
+lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/cc1obj
 sparc-rtems/lib/soft/v8/libobjc.la
 sparc-rtems/lib/soft/v8/libobjc.a
 sparc-rtems/lib/soft/libobjc.la
@@ -18,4 +18,4 @@ sparc-rtems/lib/v8/libobjc.la
 sparc-rtems/lib/v8/libobjc.a
 sparc-rtems/lib/libobjc.la    
 sparc-rtems/lib/libobjc.a  
-@dirrm lib/gcc-lib/sparc-rtems/3.2.1/include/objc
+@dirrm lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/include/objc