9 files changed, 401 insertions, 182 deletions

diff --git a/palm/prc-tools/Makefile b/palm/prc-tools/Makefile
index f68b5f28a1a3..821f0830f4ee 100644
--- a/palm/prc-tools/Makefile
+++ b/palm/prc-tools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	prc-tools
 PORTVERSION=	2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} ${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	prc-tools binutils/releases \
@@ -22,10 +22,6 @@ EXTRACT_ONLY=	binutils-2.14.tar.bz2 gdb-5.3.tar.bz2 gcc-2.95.3.tar.bz2 \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of tools supporting C and C++ programming for Palm OS
 
-BROKEN=		Incorrect pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-12-22
-
 # it is unknown whether it could actually be made to work elsewhere,
 # but right now it does not.
 ONLY_FOR_ARCHS=	i386
@@ -112,8 +108,12 @@ post-patch:
 			${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly."` ; \
 		fi; \
 	 done)
-	@cd ${WRKDIR}/gcc-2.95.3 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gcc:strerror.c
-	@cd ${WRKDIR}/gcc-3.3.1 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gcc:Makefile.in
+	@cd ${WRKDIR}/gcc-2.95.3 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gcc-strerror.c
+	@cd ${WRKDIR}/gcc-3.3.1 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gcc-Makefile.in
+	@cd ${WRKDIR}/binutils-2.14 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-binutils-configure
+	@cd ${WRKDIR}/gcc-3.3.1 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gcc3-configure.in
+	@cd ${WRKDIR}/gcc-2.95.3 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gcc2-configure.in
+	@cd ${WRKDIR}/gdb-5.3 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gdb-configure.in
 
 pre-configure:
 	(cd ${WRKDIR}/prc-tools-${PORTVERSION} && \
@@ -124,11 +124,10 @@ pre-configure:
 
 post-configure:
 	${RM} ${WRKDIR}/gdb-5.3/bfd/doc/bfd.info*
+	${RM} ${WRKDIR}/binutils-2.14/bfd/doc/bfd.info*
 
 post-install:
 	${RM} ${PREFIX}/pilot/bin/m68k-palmos-c++filt
 	${RM} ${PREFIX}/pilot/lib/libiberty.a
-	${RM} -f ${PREFIX}/pilot/m68k-palmos/sys-include/COPIED
-	${RM} -f ${PREFIX}/pilot/arm-palmos/sys-include/COPIED
 
 .include <bsd.port.post.mk>
diff --git a/palm/prc-tools/files/patch-gdb:strsignal.c b/palm/prc-tools/files/patch-gdb-strsignal.c
index 9c2bbfe44861..9c2bbfe44861 100644
--- a/palm/prc-tools/files/patch-gdb:strsignal.c
+++ b/palm/prc-tools/files/patch-gdb-strsignal.c
diff --git a/palm/prc-tools/files/post-patch-binutils-configure b/palm/prc-tools/files/post-patch-binutils-configure
new file mode 100644
index 000000000000..bb278d559c9e
--- /dev/null
+++ b/palm/prc-tools/files/post-patch-binutils-configure
@@ -0,0 +1,57 @@
+--- configure.org	Tue Oct 11 22:43:01 2005
++++ configure	Tue Oct 11 22:43:25 2005
+@@ -1609,30 +1609,30 @@
+ set fnord ${copy_dirs}
+ shift
+ while test $# != 0 ; do
+-  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
+-    :
+-  else
+-    echo Copying $1 to $2
+-
+-    # Use the install script to create the directory and all required
+-    # parent directories.
+-    if test -d $2 ; then
+-      :
+-    else
+-      echo >config.temp
+-      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
+-    fi
+-
+-    # Copy the directory, assuming we have tar.
+-    # FIXME: Should we use B in the second tar?  Not all systems support it.
+-    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
+-
+-    # It is the responsibility of the user to correctly adjust all
+-    # symlinks.  If somebody can figure out how to handle them correctly
+-    # here, feel free to add the code.
+-
+-    echo $1 > $2/COPIED
+-  fi
++#  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
++#    :
++#  else
++#    echo Copying $1 to $2
++#
++#    # Use the install script to create the directory and all required
++#    # parent directories.
++#    if test -d $2 ; then
++#      :
++#    else
++#      echo >config.temp
++#      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
++#    fi
++#
++#    # Copy the directory, assuming we have tar.
++#    # FIXME: Should we use B in the second tar?  Not all systems support it.
++#    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
++#
++#    # It is the responsibility of the user to correctly adjust all
++#    # symlinks.  If somebody can figure out how to handle them correctly
++#    # here, feel free to add the code.
++#
++#    echo $1 > $2/COPIED
++#  fi
+   shift; shift
+ done
+ 
diff --git a/palm/prc-tools/files/post-patch-gcc:Makefile.in b/palm/prc-tools/files/post-patch-gcc-Makefile.in
index d499e41ef1f0..d499e41ef1f0 100644
--- a/palm/prc-tools/files/post-patch-gcc:Makefile.in
+++ b/palm/prc-tools/files/post-patch-gcc-Makefile.in
diff --git a/palm/prc-tools/files/post-patch-gcc:strerror.c b/palm/prc-tools/files/post-patch-gcc-strerror.c
index 6f1cf7acddf6..6f1cf7acddf6 100644
--- a/palm/prc-tools/files/post-patch-gcc:strerror.c
+++ b/palm/prc-tools/files/post-patch-gcc-strerror.c
diff --git a/palm/prc-tools/files/post-patch-gcc2-configure.in b/palm/prc-tools/files/post-patch-gcc2-configure.in
new file mode 100644
index 000000000000..72722075544e
--- /dev/null
+++ b/palm/prc-tools/files/post-patch-gcc2-configure.in
@@ -0,0 +1,57 @@
+--- configure.in.org	Tue Oct 11 22:27:59 2005
++++ configure.in	Tue Oct 11 21:33:54 2005
+@@ -474,30 +474,30 @@
+ set fnord ${copy_dirs}
+ shift
+ while [ $# != 0 ]; do
+-  if [ -f $2/COPIED ] && [ x"`cat $2/COPIED`" = x"$1" ]; then
+-    :
+-  else
+-    echo Copying $1 to $2
+-
+-    # Use the install script to create the directory and all required
+-    # parent directories.
+-    if [ -d $2 ]; then
+-      :
+-    else
+-      echo >config.temp
+-      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
+-    fi
+-
+-    # Copy the directory, assuming we have tar.
+-    # FIXME: Should we use B in the second tar?  Not all systems support it.
+-    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
+-
+-    # It is the responsibility of the user to correctly adjust all
+-    # symlinks.  If somebody can figure out how to handle them correctly
+-    # here, feel free to add the code.
+-
+-    echo $1 > $2/COPIED
+-  fi
++#  if [ -f $2/COPIED ] && [ x"`cat $2/COPIED`" = x"$1" ]; then
++#    :
++#  else
++#    echo Copying $1 to $2
++#
++#    # Use the install script to create the directory and all required
++#    # parent directories.
++#    if [ -d $2 ]; then
++#      :
++#    else
++#      echo >config.temp
++#      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
++#    fi
++#
++#    # Copy the directory, assuming we have tar.
++#    # FIXME: Should we use B in the second tar?  Not all systems support it.
++#    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
++#
++#    # It is the responsibility of the user to correctly adjust all
++#    # symlinks.  If somebody can figure out how to handle them correctly
++#    # here, feel free to add the code.
++#
++#    echo $1 > $2/COPIED
++#  fi
+   shift; shift
+ done
+ 
diff --git a/palm/prc-tools/files/post-patch-gcc3-configure.in b/palm/prc-tools/files/post-patch-gcc3-configure.in
new file mode 100644
index 000000000000..6e4bdf7082bb
--- /dev/null
+++ b/palm/prc-tools/files/post-patch-gcc3-configure.in
@@ -0,0 +1,57 @@
+--- configure.in.orig	Fri Jun 27 21:44:14 2003
++++ configure.in	Tue Oct 11 21:52:15 2005
+@@ -906,30 +909,30 @@
+ set fnord ${copy_dirs}
+ shift
+ while test $# != 0 ; do
+-  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
+-    :
+-  else
+-    echo Copying $1 to $2
+-
+-    # Use the install script to create the directory and all required
+-    # parent directories.
+-    if test -d $2 ; then
+-      :
+-    else
+-      echo >config.temp
+-      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
+-    fi
+-
+-    # Copy the directory, assuming we have tar.
+-    # FIXME: Should we use B in the second tar?  Not all systems support it.
+-    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
+-
+-    # It is the responsibility of the user to correctly adjust all
+-    # symlinks.  If somebody can figure out how to handle them correctly
+-    # here, feel free to add the code.
+-
+-    echo $1 > $2/COPIED
+-  fi
++#  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
++#    :
++#  else
++#    echo Copying $1 to $2
++#
++#    # Use the install script to create the directory and all required
++#    # parent directories.
++#    if test -d $2 ; then
++#      :
++#    else
++#      echo >config.temp
++#      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
++#    fi
++#
++#    # Copy the directory, assuming we have tar.
++#    # FIXME: Should we use B in the second tar?  Not all systems support it.
++#    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
++#
++#    # It is the responsibility of the user to correctly adjust all
++#    # symlinks.  If somebody can figure out how to handle them correctly
++#    # here, feel free to add the code.
++#
++#    echo $1 > $2/COPIED
++#  fi
+   shift; shift
+ done
+ 
diff --git a/palm/prc-tools/files/post-patch-gdb-configure.in b/palm/prc-tools/files/post-patch-gdb-configure.in
new file mode 100644
index 000000000000..d9f58c78e191
--- /dev/null
+++ b/palm/prc-tools/files/post-patch-gdb-configure.in
@@ -0,0 +1,57 @@
+--- configure.in.org	Tue Oct 11 22:25:56 2005
++++ configure.in	Tue Oct 11 21:44:36 2005
+@@ -912,30 +912,30 @@
+ set fnord ${copy_dirs}
+ shift
+ while test $# != 0 ; do
+-  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
+-    :
+-  else
+-    echo Copying $1 to $2
+-
+-    # Use the install script to create the directory and all required
+-    # parent directories.
+-    if test -d $2 ; then
+-      :
+-    else
+-      echo >config.temp
+-      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
+-    fi
+-
+-    # Copy the directory, assuming we have tar.
+-    # FIXME: Should we use B in the second tar?  Not all systems support it.
+-    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
+-
+-    # It is the responsibility of the user to correctly adjust all
+-    # symlinks.  If somebody can figure out how to handle them correctly
+-    # here, feel free to add the code.
+-
+-    echo $1 > $2/COPIED
+-  fi
++#  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
++#    :
++#  else
++#    echo Copying $1 to $2
++#
++#    # Use the install script to create the directory and all required
++#    # parent directories.
++#    if test -d $2 ; then
++#      :
++#    else
++#      echo >config.temp
++#      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
++#    fi
++#
++#    # Copy the directory, assuming we have tar.
++#    # FIXME: Should we use B in the second tar?  Not all systems support it.
++#    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
++#
++#    # It is the responsibility of the user to correctly adjust all
++#    # symlinks.  If somebody can figure out how to handle them correctly
++#    # here, feel free to add the code.
++#
++#    echo $1 > $2/COPIED
++#  fi
+   shift; shift
+ done
+ 
diff --git a/palm/prc-tools/pkg-plist b/palm/prc-tools/pkg-plist
index 27ee0cffb33d..12d0cf05cd13 100644
--- a/palm/prc-tools/pkg-plist
+++ b/palm/prc-tools/pkg-plist
@@ -28,124 +28,6 @@ pilot/arm-palmos/lib/ldscripts/armpalmos.xr
 pilot/arm-palmos/lib/ldscripts/armpalmos.xu
 pilot/arm-palmos/lib/libc.a
 pilot/arm-palmos/lib/libstdc++.a
-pilot/m68k-palmos/bin/nm
-pilot/m68k-palmos/bin/strip
-pilot/m68k-palmos/bin/ar
-pilot/m68k-palmos/bin/ranlib
-pilot/m68k-palmos/bin/as
-pilot/m68k-palmos/bin/ld
-pilot/m68k-palmos/bin/gcc
-pilot/m68k-palmos/lib/ldscripts/m68kpalmos.x
-pilot/m68k-palmos/lib/ldscripts/m68kpalmos.xbn
-pilot/m68k-palmos/lib/ldscripts/m68kpalmos.xn
-pilot/m68k-palmos/lib/ldscripts/m68kpalmos.xr
-pilot/m68k-palmos/lib/ldscripts/m68kpalmos.xu
-pilot/m68k-palmos/lib/mown-gp/crt0.o
-pilot/m68k-palmos/lib/mown-gp/scrt0.o
-pilot/m68k-palmos/lib/mown-gp/gdbstub.o
-pilot/m68k-palmos/lib/mown-gp/libcrt.a
-pilot/m68k-palmos/lib/mown-gp/libc.a
-pilot/m68k-palmos/lib/mown-gp/libg.a
-pilot/m68k-palmos/lib/crt0.o
-pilot/m68k-palmos/lib/gdbstub.o
-pilot/m68k-palmos/lib/libcrt.a
-pilot/m68k-palmos/lib/libnoexcept.a
-pilot/m68k-palmos/lib/libnfm.a
-pilot/m68k-palmos/lib/libc.a
-pilot/m68k-palmos/lib/libg.a
-pilot/m68k-palmos/lib/libstdc++.a
-pilot/m68k-palmos/lib/libmf.a
-pilot/m68k-palmos/lib/libm.a
-pilot/m68k-palmos/lib/text_64k
-pilot/m68k-palmos/lib/text_64k_palmos3
-pilot/m68k-palmos/include/sys/types.h
-pilot/m68k-palmos/include/errno.h
-pilot/m68k-palmos/include/malloc.h
-pilot/m68k-palmos/include/setjmp.h
-pilot/m68k-palmos/include/stdio.h
-pilot/m68k-palmos/include/stdlib.h
-pilot/m68k-palmos/include/mathf.h
-pilot/m68k-palmos/include/math.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/cc1
-pilot/lib/gcc-lib/arm-palmos/3.3.1/cc1plus
-pilot/lib/gcc-lib/arm-palmos/3.3.1/collect2
-pilot/lib/gcc-lib/arm-palmos/3.3.1/crtbegin.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/crtend.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/crti.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/crtn.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/README
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/float.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/iso646.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/limits.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/stdarg.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/stdbool.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/stddef.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/syslimits.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/unwind.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/varargs.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/fixinc.sh
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/fixincl
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/gsyslimits.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/README
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/float.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/iso646.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/limits.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/stdarg.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/stdbool.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/stddef.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/unwind.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/varargs.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/mkheaders
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/mkheaders.conf
-pilot/lib/gcc-lib/arm-palmos/3.3.1/libgcc.a
-pilot/lib/gcc-lib/arm-palmos/3.3.1/specs
-pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/crtbegin.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/crtend.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/crti.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/crtn.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/libgcc.a
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/syslimits.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stdarg.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stddef.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/varargs.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-alpha.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-h8300.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-i860.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-i960.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-mips.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-m88k.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-mn10200.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-mn10300.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-pa.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-pyr.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-sparc.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-clipper.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-spur.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-m32r.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-sh.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-v850.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-arc.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/iso646.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-ppc.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-c4x.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/math-68881.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/typeinfo
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/exception
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/new
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/new.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/proto.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stdbool.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/limits.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/float.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/README
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/cc1
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/cc1plus
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/collect2
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/specs
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/cpp0
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/mown-gp/libgcc.a
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/libgcc.a
-pilot/lib/libmmalloc.a
 pilot/bin/arm-palmos-addr2line
 pilot/bin/arm-palmos-ar
 pilot/bin/arm-palmos-as
@@ -167,50 +49,40 @@ pilot/bin/arm-palmos-size
 pilot/bin/arm-palmos-strings
 pilot/bin/arm-palmos-strip
 pilot/bin/build-prc
-pilot/bin/m68k-palmos-size
-pilot/bin/m68k-palmos-objdump
-pilot/bin/m68k-palmos-ar
-pilot/bin/m68k-palmos-strings
-pilot/bin/m68k-palmos-ranlib
-pilot/bin/m68k-palmos-objcopy
 pilot/bin/m68k-palmos-addr2line
-pilot/bin/m68k-palmos-readelf
-pilot/bin/m68k-palmos-nm
-pilot/bin/m68k-palmos-strip
+pilot/bin/m68k-palmos-ar
 pilot/bin/m68k-palmos-as
-pilot/bin/m68k-palmos-ld
-pilot/bin/m68k-palmos-gdb
-pilot/bin/palmdev-prep
-pilot/bin/m68k-palmos-obj-res
-pilot/bin/m68k-palmos-multigen
-pilot/bin/m68k-palmos-stubgen
 pilot/bin/m68k-palmos-c++
-pilot/bin/m68k-palmos-g++
 pilot/bin/m68k-palmos-cpp
+pilot/bin/m68k-palmos-g++
 pilot/bin/m68k-palmos-gcc
+pilot/bin/m68k-palmos-gdb
+pilot/bin/m68k-palmos-ld
+pilot/bin/m68k-palmos-multigen
+pilot/bin/m68k-palmos-nm
+pilot/bin/m68k-palmos-obj-res
+pilot/bin/m68k-palmos-objcopy
+pilot/bin/m68k-palmos-objdump
+pilot/bin/m68k-palmos-ranlib
+pilot/bin/m68k-palmos-readelf
+pilot/bin/m68k-palmos-size
+pilot/bin/m68k-palmos-strings
+pilot/bin/m68k-palmos-strip
+pilot/bin/m68k-palmos-stubgen
 pilot/bin/m68k-palmos-trapfilt
-pilot/info/dir
+pilot/bin/palmdev-prep
+pilot/info/as.info
 pilot/info/bfd.info
 pilot/info/bfd.info-1
 pilot/info/bfd.info-2
-pilot/info/bfd.info-3
-pilot/info/bfd.info-4
-pilot/info/bfd.info-5
-pilot/info/bfd.info-6
-pilot/info/bfd.info-7
-pilot/info/bfd.info-8
-pilot/info/bfd.info-9
-pilot/info/cppinternals.info
-pilot/info/prc-tools.info
 pilot/info/binutils.info
-pilot/info/standards.info
 pilot/info/configure.info
 pilot/info/configure.info-1
 pilot/info/configure.info-2
 pilot/info/configure.info-3
-pilot/info/as.info
-pilot/info/ld.info
 pilot/info/cpp.info
+pilot/info/cppinternals.info
+pilot/info/dir
 pilot/info/gcc.info
 pilot/info/gccint.info
 pilot/info/gdb.info
@@ -237,12 +109,133 @@ pilot/info/gdbint.info-4
 pilot/info/gdbint.info-5
 pilot/info/gdbint.info-6
 pilot/info/gdbint.info-7
+pilot/info/ld.info
 pilot/info/mmalloc.info
+pilot/info/prc-tools.info
 pilot/info/stabs.info
 pilot/info/stabs.info-1
 pilot/info/stabs.info-2
 pilot/info/stabs.info-3
 pilot/info/stabs.info-4
+pilot/info/standards.info
+pilot/lib/gcc-lib/arm-palmos/3.3.1/cc1
+pilot/lib/gcc-lib/arm-palmos/3.3.1/cc1plus
+pilot/lib/gcc-lib/arm-palmos/3.3.1/collect2
+pilot/lib/gcc-lib/arm-palmos/3.3.1/crtbegin.o
+pilot/lib/gcc-lib/arm-palmos/3.3.1/crtend.o
+pilot/lib/gcc-lib/arm-palmos/3.3.1/crti.o
+pilot/lib/gcc-lib/arm-palmos/3.3.1/crtn.o
+pilot/lib/gcc-lib/arm-palmos/3.3.1/include/README
+pilot/lib/gcc-lib/arm-palmos/3.3.1/include/float.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/include/iso646.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/include/limits.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/include/stdarg.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/include/stdbool.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/include/stddef.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/include/syslimits.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/include/unwind.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/include/varargs.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/fixinc.sh
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/fixincl
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/gsyslimits.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/README
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/float.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/iso646.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/limits.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/stdarg.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/stdbool.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/stddef.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/unwind.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/varargs.h
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/mkheaders
+pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/mkheaders.conf
+pilot/lib/gcc-lib/arm-palmos/3.3.1/libgcc.a
+pilot/lib/gcc-lib/arm-palmos/3.3.1/specs
+pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/crtbegin.o
+pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/crtend.o
+pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/crti.o
+pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/crtn.o
+pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/libgcc.a
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/cc1
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/cc1plus
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/collect2
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/cpp0
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/README
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/exception
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/float.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/iso646.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/limits.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/math-68881.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/new
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/new.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/proto.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stdarg.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stdbool.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stddef.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/syslimits.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/typeinfo
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-alpha.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-arc.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-c4x.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-clipper.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-h8300.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-i860.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-i960.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-m32r.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-m88k.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-mips.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-mn10200.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-mn10300.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-pa.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-ppc.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-pyr.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-sh.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-sparc.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-spur.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-v850.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/varargs.h
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/libgcc.a
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/mown-gp/libgcc.a
+pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/specs
+pilot/lib/libmmalloc.a
+pilot/m68k-palmos/bin/ar
+pilot/m68k-palmos/bin/as
+pilot/m68k-palmos/bin/gcc
+pilot/m68k-palmos/bin/ld
+pilot/m68k-palmos/bin/nm
+pilot/m68k-palmos/bin/ranlib
+pilot/m68k-palmos/bin/strip
+pilot/m68k-palmos/include/errno.h
+pilot/m68k-palmos/include/malloc.h
+pilot/m68k-palmos/include/math.h
+pilot/m68k-palmos/include/mathf.h
+pilot/m68k-palmos/include/setjmp.h
+pilot/m68k-palmos/include/stdio.h
+pilot/m68k-palmos/include/stdlib.h
+pilot/m68k-palmos/include/sys/types.h
+pilot/m68k-palmos/lib/crt0.o
+pilot/m68k-palmos/lib/gdbstub.o
+pilot/m68k-palmos/lib/ldscripts/m68kpalmos.x
+pilot/m68k-palmos/lib/ldscripts/m68kpalmos.xbn
+pilot/m68k-palmos/lib/ldscripts/m68kpalmos.xn
+pilot/m68k-palmos/lib/ldscripts/m68kpalmos.xr
+pilot/m68k-palmos/lib/ldscripts/m68kpalmos.xu
+pilot/m68k-palmos/lib/libc.a
+pilot/m68k-palmos/lib/libcrt.a
+pilot/m68k-palmos/lib/libg.a
+pilot/m68k-palmos/lib/libm.a
+pilot/m68k-palmos/lib/libmf.a
+pilot/m68k-palmos/lib/libnfm.a
+pilot/m68k-palmos/lib/libnoexcept.a
+pilot/m68k-palmos/lib/libstdc++.a
+pilot/m68k-palmos/lib/mown-gp/crt0.o
+pilot/m68k-palmos/lib/mown-gp/gdbstub.o
+pilot/m68k-palmos/lib/mown-gp/libc.a
+pilot/m68k-palmos/lib/mown-gp/libcrt.a
+pilot/m68k-palmos/lib/mown-gp/libg.a
+pilot/m68k-palmos/lib/mown-gp/scrt0.o
+pilot/m68k-palmos/lib/text_64k
+pilot/m68k-palmos/lib/text_64k_palmos3
 pilot/share/prc-tools/include/EntryPoints.h
 pilot/share/prc-tools/include/NewTypes.h
 pilot/share/prc-tools/include/PalmOS.h
@@ -252,40 +245,39 @@ pilot/share/prc-tools/include/ctype.h
 pilot/share/prc-tools/include/stdint.h
 pilot/share/prc-tools/include/stdlib.h
 pilot/share/prc-tools/include/string.h
-@dirrm pilot/arm-palmos/bin
-@dirrm pilot/arm-palmos/include/sys
-@dirrm pilot/arm-palmos/include
-@dirrm pilot/arm-palmos/lib/ldscripts
-@dirrm pilot/arm-palmos/lib
-@unexec rmdir %D/pilot/arm-palmos/sys-include 2>/dev/null || true
-@dirrm pilot/arm-palmos
-@dirrm pilot/bin
-@dirrm pilot/include
-@dirrm pilot/info
-@dirrm pilot/m68k-palmos/bin
-@dirrm pilot/m68k-palmos/include/sys
-@dirrm pilot/m68k-palmos/include
+@dirrm pilot/share/prc-tools/include
+@dirrm pilot/share/prc-tools
+@dirrm pilot/share
+@dirrm pilot/man/man7
+@dirrm pilot/man/man1
+@dirrm pilot/man
 @dirrm pilot/m68k-palmos/lib/mown-gp
 @dirrm pilot/m68k-palmos/lib/ldscripts
 @dirrm pilot/m68k-palmos/lib
-@unexec rmdir %D/pilot/m68k-palmos/sys-include 2>/dev/null || true
+@dirrm pilot/m68k-palmos/include/sys
+@dirrm pilot/m68k-palmos/include
+@dirrm pilot/m68k-palmos/bin
 @dirrm pilot/m68k-palmos
-@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1/include
-@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include
-@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools
-@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb
-@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1
-@dirrm pilot/lib/gcc-lib/arm-palmos
 @dirrm pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/mown-gp
 @dirrm pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include
 @dirrm pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd
 @dirrm pilot/lib/gcc-lib/m68k-palmos
+@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb
+@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include
+@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools
+@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1/include
+@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1
+@dirrm pilot/lib/gcc-lib/arm-palmos
 @dirrm pilot/lib/gcc-lib
 @dirrm pilot/lib
-@dirrm pilot/man/man1
-@dirrm pilot/man/man7
-@dirrm pilot/man
-@dirrm pilot/share/prc-tools/include
-@dirrm pilot/share/prc-tools
-@dirrm pilot/share
+@dirrm pilot/info
+@exec mkdir -p %D/pilot/include
+@dirrm pilot/include
+@dirrm pilot/bin
+@dirrm pilot/arm-palmos/lib/ldscripts
+@dirrm pilot/arm-palmos/lib
+@dirrm pilot/arm-palmos/include/sys
+@dirrm pilot/arm-palmos/include
+@dirrm pilot/arm-palmos/bin
+@dirrm pilot/arm-palmos
 @dirrm pilot