4 files changed, 273 insertions, 28 deletions

diff --git a/palm/prc-tools/Makefile b/palm/prc-tools/Makefile
index 7db9b16a684d..420e527e374d 100644
--- a/palm/prc-tools/Makefile
+++ b/palm/prc-tools/Makefile
@@ -6,33 +6,68 @@
 #
 
 PORTNAME=	prc-tools
-PORTVERSION=	2.0
+PORTVERSION=	2.2
 CATEGORIES=	palm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	prc-tools
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} ${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR= prc-tools binutils/releases gcc/releases/gcc-2.95.3 gdb/old-releases
+DISTNAME=	prc-tools-${PORTVERSION}
+DISTFILES=	${DISTNAME}.tar.gz \
+		binutils-2.12.1.tar.bz2 gdb-5.0.tar.bz2 gcc-2.95.3.tar.bz2
+EXTRACT_ONLY=	binutils-2.12.1.tar.bz2 gdb-5.0.tar.bz2 gcc-2.95.3.tar.bz2
 
 MAINTAINER=	linimon@lonesome.com
-COMMENT=	PRC-tools for Palm OS (main part)
+COMMENT=		Collection of tools supporting C and C++ programming for Palm OS
 
-BUILD_DEPENDS=	${PREFIX}/bin/m68k-palmos-gcc:${PORTSDIR}/palm/prc-tools-gcc \
-		${LOCALBASE}/palmdev/sdk-3.5/include/Core/System/NetMgr.h:${PORTSDIR}/palm/palmos-sdk
+BUILD_DEPENDS=	${LOCALBASE}/bin/autoheader:${PORTSDIR}/devel/autoconf
 
-RESTRICTED=	Required port is restricted.
+USE_BZIP2=	YES
 USE_BISON=	YES
 USE_GMAKE=	YES
 PREFIX=		${LOCALBASE}/pilot
 WRKSRC=		${WRKDIR}/build
-ALL_TARGET=	all-target
-INSTALL_TARGET=	install-target
 HAS_CONFIGURE=	YES
-CONFIGURE_SCRIPT=	../prc-tools-2.0/configure
+CONFIGURE_SCRIPT=	../prc-tools-${PORTVERSION}/configure
 CONFIGURE_ARGS=	--target=m68k-palmos --enable-languages=c,c++ \
 		--sharedstatedir=${LOCALBASE}/palmdev --prefix=${PREFIX} \
-		--with-build-sdk=3.5
+		--with-headers=${WRKSRC}/empty  --disable-nls
 CONFIGURE_ENV=	PATH=${PATH}:${PREFIX}/bin
 MAKE_ENV=	PATH=${PATH}:${PREFIX}/bin
+MAN1=		cccp.1 m68k-palmos-g++.1 m68k-palmos-gcc.1 \
+		m68k-palmos-addr2line.1 m68k-palmos-ar.1 \
+		m68k-palmos-as.1 m68k-palmos-c++filt.1 \
+		m68k-palmos-ld.1 m68k-palmos-nlmconv.1 \
+		m68k-palmos-nm.1 m68k-palmos-objcopy.1 \
+		m68k-palmos-objdump.1 m68k-palmos-ranlib.1 \
+		m68k-palmos-size.1 m68k-palmos-strings.1 \
+		m68k-palmos-strip.1 m68k-palmos-dlltool.1 \
+		m68k-palmos-readelf.1 m68k-palmos-windres.1 \
+		m68k-palmos-gdb.1
+
+.include <bsd.port.pre.mk>
+
+CFLAGS:=	${CFLAGS:C/-m[-=0-9a-z]*//g}
+
+post-extract:
+	@(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${DISTNAME}.tar.gz ${EXTRACT_AFTER_ARGS})
 
 pre-patch:
 	${MKDIR} ${WRKSRC}/empty
 
-.include <bsd.port.mk>
+post-patch:
+	(cd ${WRKDIR} && \
+	 ${CAT}	prc-tools-${PORTVERSION}/binutils-2.12.1.palmos.diff \
+		prc-tools-${PORTVERSION}/gdb-5.0.palmos.diff \
+		prc-tools-${PORTVERSION}/gcc-2.95.3.palmos.diff | ${PATCH} -p0)
+
+pre-configure:
+	(cd ${WRKDIR}/prc-tools-${PORTVERSION} && \
+	 ${LN} -sf ../binutils-2.12.1 binutils; \
+	 ${LN} -sf ../gdb-5.0 gdb; \
+	 ${LN} -sf ../gcc-2.95.3 gcc)
+
+post-install:
+	${RM} ${PREFIX}/bin/m68k-palmos-c++filt
+	${RM} ${PREFIX}/lib/libiberty.a
+	${RM} -f ${PREFIX}/m68k-palmos/sys-include/COPIED
+
+.include <bsd.port.post.mk>
diff --git a/palm/prc-tools/distinfo b/palm/prc-tools/distinfo
index 995d1c791cd5..75cc1b208e15 100644
--- a/palm/prc-tools/distinfo
+++ b/palm/prc-tools/distinfo
@@ -1 +1,4 @@
-MD5 (prc-tools-2.0.tar.gz) = cd22ec500ebb3ec90fd8a8da53c6e39a
+MD5 (prc-tools-2.2.tar.gz) = 91a9a04d2042fcf673ff212a3ffd7ab9
+MD5 (binutils-2.12.1.tar.bz2) = f67fe2e8065c5683bc34782de131f5d3
+MD5 (gdb-5.0.tar.bz2) = b2720def719fd024e380793d9084da2a
+MD5 (gcc-2.95.3.tar.bz2) = 87ee083a830683e2aaa57463940a0c3c
diff --git a/palm/prc-tools/pkg-descr b/palm/prc-tools/pkg-descr
index 09211a5268ae..3877f3caaa22 100644
--- a/palm/prc-tools/pkg-descr
+++ b/palm/prc-tools/pkg-descr
@@ -1,3 +1,12 @@
-PRC-tools for Palm OS (main part)
+The prc-tools package is a collection of tools supporting C and 
+C++ programming for Palm OS. It consists of:
 
-WWW: http://www.palmos.com/dev/tools/gcc/
+- the GNU Compiler Collection, assembler, linker, and symbolic
+  debugger;
+- modifications to these generic tools to support functionality
+  peculiar to Palm OS;
+- tools for dealing with .prc files, Palm OS's version of
+  executable applications;
+- conveniently packaged documentation for all of the above.
+
+WWW: http://prc-tools.sourceforge.net/
diff --git a/palm/prc-tools/pkg-plist b/palm/prc-tools/pkg-plist
index 2c5ad6f80cc5..caadc7b72c74 100644
--- a/palm/prc-tools/pkg-plist
+++ b/palm/prc-tools/pkg-plist
@@ -1,20 +1,218 @@
+m68k-palmos/bin/nm
+m68k-palmos/bin/strip
+m68k-palmos/bin/ar
+m68k-palmos/bin/ranlib
+m68k-palmos/bin/as
+m68k-palmos/bin/ld
+m68k-palmos/bin/gcc
+m68k-palmos/lib/ldscripts/m68kpalmos.x
+m68k-palmos/lib/ldscripts/m68kpalmos.xbn
+m68k-palmos/lib/ldscripts/m68kpalmos.xn
+m68k-palmos/lib/ldscripts/m68kpalmos.xr
+m68k-palmos/lib/ldscripts/m68kpalmos.xu
+m68k-palmos/lib/mown-gp/crt0.o
+m68k-palmos/lib/mown-gp/scrt0.o
+m68k-palmos/lib/mown-gp/gdbstub.o
+m68k-palmos/lib/mown-gp/libcrt.a
+m68k-palmos/lib/mown-gp/libc.a
+m68k-palmos/lib/mown-gp/libg.a
+m68k-palmos/lib/crt0.o
+m68k-palmos/lib/gdbstub.o
+m68k-palmos/lib/libcrt.a
+m68k-palmos/lib/libnoexcept.a
+m68k-palmos/lib/libnfm.a
+m68k-palmos/lib/libc.a
+m68k-palmos/lib/libg.a
+m68k-palmos/lib/libstdc++.a
+m68k-palmos/lib/libmf.a
+m68k-palmos/lib/libm.a
+m68k-palmos/lib/text_64k
+m68k-palmos/lib/text_64k_palmos3
+m68k-palmos/include/sys/types.h
 m68k-palmos/include/ctype.h
 m68k-palmos/include/errno.h
 m68k-palmos/include/malloc.h
-m68k-palmos/include/math.h
-m68k-palmos/include/mathf.h
 m68k-palmos/include/setjmp.h
 m68k-palmos/include/stdio.h
-m68k-palmos/include/stdlib.h
 m68k-palmos/include/string.h
-m68k-palmos/include/sys/types.h
-m68k-palmos/lib/crt0.o
-m68k-palmos/lib/gcrt0.o
-m68k-palmos/lib/libc.a
-m68k-palmos/lib/libcrt.a
-m68k-palmos/lib/libg.a
-m68k-palmos/lib/libm.a
-m68k-palmos/lib/libmf.a
-m68k-palmos/lib/libnoexcept.a
-m68k-palmos/lib/libstdc++.a
+m68k-palmos/include/stdlib.h
+m68k-palmos/include/mathf.h
+m68k-palmos/include/math.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/syslimits.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stdarg.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stddef.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/varargs.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-alpha.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-h8300.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-i860.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-i960.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-mips.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-m88k.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-mn10200.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-mn10300.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-pa.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-pyr.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-sparc.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-clipper.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-spur.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-m32r.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-sh.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-v850.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-arc.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/iso646.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-ppc.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-c4x.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/math-68881.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/typeinfo
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/exception
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/new
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/new.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/proto.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stdbool.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/limits.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/float.h
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/README
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/cc1
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/cc1plus
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/collect2
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/specs
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/cpp0
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/mown-gp/libgcc.a
+lib/gcc-lib/m68k-palmos/2.95.3-kgpd/libgcc.a
+lib/libbfd.la
+lib/libbfd.a
+lib/libopcodes.la
+lib/libopcodes.a
+lib/libmmalloc.a
+bin/build-prc
+bin/m68k-palmos-size
+bin/m68k-palmos-objdump
+bin/m68k-palmos-ar
+bin/m68k-palmos-strings
+bin/m68k-palmos-ranlib
+bin/m68k-palmos-objcopy
+bin/m68k-palmos-addr2line
+bin/m68k-palmos-readelf
+bin/m68k-palmos-nm
+bin/m68k-palmos-strip
+bin/m68k-palmos-as
+bin/m68k-palmos-gasp
+bin/m68k-palmos-ld
+bin/m68k-palmos-gdb
+bin/palmdev-prep
+bin/m68k-palmos-obj-res
+bin/m68k-palmos-multigen
+bin/m68k-palmos-stubgen
+bin/m68k-palmos-c++
+bin/m68k-palmos-g++
+bin/m68k-palmos-cpp
+bin/m68k-palmos-gcc
+include/bfd.h
+include/ansidecl.h
+include/symcat.h
+include/bfdlink.h
+info/dir
+info/bfd.info
+info/bfd.info-1
+info/bfd.info-2
+info/bfd.info-3
+info/bfd.info-4
+info/bfd.info-5
+info/bfd.info-6
+info/bfd.info-7
+info/bfd.info-8
+info/bfd.info-9
+info/prc-tools.info
+info/binutils.info
+info/binutils.info-1
+info/binutils.info-2
+info/binutils.info-3
+info/standards.info
+info/configure.info
+info/configure.info-1
+info/configure.info-2
+info/configure.info-3
+info/as.info
+info/as.info-1
+info/as.info-2
+info/as.info-3
+info/as.info-4
+info/as.info-5
+info/as.info-6
+info/as.info-7
+info/as.info-8
+info/as.info-9
+info/as.info-10
+info/gasp.info
+info/ld.info
+info/ld.info-1
+info/ld.info-2
+info/ld.info-3
+info/ld.info-4
+info/ld.info-5
+info/ld.info-6
+info/cpp.info
+info/cpp.info-1
+info/cpp.info-2
+info/cpp.info-3
+info/gcc.info
+info/gcc.info-1
+info/gcc.info-10
+info/gcc.info-11
+info/gcc.info-12
+info/gcc.info-13
+info/gcc.info-14
+info/gcc.info-15
+info/gcc.info-16
+info/gcc.info-17
+info/gcc.info-18
+info/gcc.info-19
+info/gcc.info-2
+info/gcc.info-20
+info/gcc.info-21
+info/gcc.info-22
+info/gcc.info-23
+info/gcc.info-24
+info/gcc.info-25
+info/gcc.info-26
+info/gcc.info-27
+info/gcc.info-28
+info/gcc.info-29
+info/gcc.info-3
+info/gcc.info-30
+info/gcc.info-4
+info/gcc.info-5
+info/gcc.info-6
+info/gcc.info-7
+info/gcc.info-8
+info/gcc.info-9
+@unexec rmdir %D/m68k-palmos/sys-include 2>/dev/null || true
+@dirrm m68k-palmos/lib/mown-gp
+@dirrm m68k-palmos/lib/ldscripts
+@dirrm m68k-palmos/lib
 @dirrm m68k-palmos/include/sys
+@dirrm m68k-palmos/include
+@dirrm m68k-palmos/bin
+@dirrm m68k-palmos
+@dirrm lib/gcc-lib/m68k-palmos/2.95.3-kgpd/mown-gp
+@dirrm lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include
+@dirrm lib/gcc-lib/m68k-palmos/2.95.3-kgpd
+@dirrm lib/gcc-lib/m68k-palmos
+@dirrm lib/gcc-lib
+@unexec rmdir %D/libexec 2>/dev/null || true
+@unexec rmdir %D/libdata 2>/dev/null || true
+@unexec rmdir %D/lib 2>/dev/null || true
+@unexec rmdir %D/info 2>/dev/null || true
+@unexec rmdir %D/include 2>/dev/null || true
+@unexec rmdir %D/bin 2>/dev/null || true
+@unexec rmdir %D/man/man1 2>/dev/null || true
+@unexec rmdir %D/man/man2 2>/dev/null || true
+@unexec rmdir %D/man/man3 2>/dev/null || true
+@unexec rmdir %D/man/man4 2>/dev/null || true
+@unexec rmdir %D/man/man5 2>/dev/null || true
+@unexec rmdir %D/man/man6 2>/dev/null || true
+@unexec rmdir %D/man/man7 2>/dev/null || true
+@unexec rmdir %D/man/man8 2>/dev/null || true
+@unexec rmdir %D/man/man9 2>/dev/null || true
+@unexec rmdir %D/man/mann 2>/dev/null || true
+@unexec rmdir %D/man 2>/dev/null || true