Sync with PEACE repositry

http://cvs.kshosen.ac.jp/cvsweb.cgi/peace/pkgsrc/cross/i386-netbsdpe/
 - Update binutils to 2.13
 - Remove f77/objcc stuff

1 files changed, 24 insertions, 28 deletions

diff --git a/cross/i386-netbsdpe/Makefile b/cross/i386-netbsdpe/Makefile
index a7a0fe1cc55..0e1ce854583 100644
--- a/cross/i386-netbsdpe/Makefile
+++ b/cross/i386-netbsdpe/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.9 2002/03/18 03:04:40 kent Exp $
-# $PEACE: Makefile,v 1.18 2001/12/05 07:13:57 kent Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/21 12:42:44 kent Exp $
+# $PEACE: Makefile,v 1.21 2002/08/21 02:48:23 kent Exp $
 
-DISTVERSION=		1.3.0
+DISTVERSION=		1.3.4
 CROSS_DISTFILES=		# none
 
 MAINTAINER=		peace-sacrifice@hauN.org
 HOMEPAGE=		http://chiharu.hauN.org/peace/
 COMMENT=		Cross-compile environment for PEACE/i386
+# Need NetBSD headers in /usr/include
+ONLY_FOR_PLATFORM=	NetBSD-*-*
 
-WRKSRC=			${WRKDIR}/${GCC_DISTNAME}
+WRKSRC=			${WRKDIR}/toolchain
 
 USE_CROSS_BINUTILS=	yes
 BINUTILS_GNUTARGET=	pe-i386
@@ -16,55 +18,50 @@ BINUTILS_LDEMULATION=	i386pe
 USE_CROSS_GCC=		yes
 GCC_FAKE_RUNTIME=	yes
 GCC_CXX=		yes
-#GCC_F77=		yes
-#GCC_OBJC=		yes
 #GCC_CXX_RUNTIME=	yes
-#GCC_F77_RUNTIME=	yes
-#GCC_OBJC_RUNTIME=	yes
 
 TARGET_ARCH=		i386-netbsdpe
 GCC_CONFIGURE_ARGS+=	--enable-threads
 
-BINUTILS_EXTRAS=	dlltool windres
+BINUTILS_EXTRAS=	dlltool dllwrap windres
 
 # Mingw pathes
 GCC_WIN32_PATCHBUNDLE=	${GCC_DISTNAME}-x86-win32-patches.tar.gz
 GCC_WIN32_PATCH=	${WRKDIR}/${GCC_DISTNAME}-patches/${GCC_DISTNAME}-x86-win32.diff
 MASTER_SITES+=		ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/${GCC_DISTNAME}/patches/
-CROSS_DISTFILES+=	${GCC_WIN32_PATCHBUNDLE}
+DISTFILES+=		${GCC_WIN32_PATCHBUNDLE}
 
 # SSP patch
 MASTER_SITES+=		http://www.trl.ibm.com/projects/security/ssp/gcc2_95_2/
 SSP_PATCH=		protector-2.95.2-2.tar.gz
-CROSS_DISTFILES+=	${SSP_PATCH}
+DISTFILES+=		${SSP_PATCH}
 
 # pthread
 PTHREAD_DISTNAME=	unproven-pthreads-0.17
 PTHREAD_DISTFILE=	${PTHREAD_DISTNAME}.tar.gz
 MASTER_SITES+=		ftp://ftp.flame.org/pub/netbsd/
-CROSS_DISTFILES+=	${PTHREAD_DISTFILE}
+DISTFILES+=		${PTHREAD_DISTFILE}
 
-pre-patch: gcc-patchbundle
+EXTRACT_ONLY=		${GCC_WIN32_PATCHBUNDLE} ${SSP_PATCH} ${PTHREAD_DISTFILE}
 
-gcc-patchbundle:
-	cd ${WRKDIR} && /usr/bin/tar zxf ${_DISTDIR}/${GCC_WIN32_PATCHBUNDLE}
-	${PATCH} -d ${WRKDIR} --forward --quiet -E < ${GCC_WIN32_PATCH}
+post-extract:
+	cd ${WRKDIR} && ${PAX} -rz -s /${GCC_DISTNAME}/toolchain/ \
+		-f ${_DISTDIR}/${GCC_DISTNAME}.tar.gz
+	${PATCH} -d ${WRKSRC} -p1 --forward --quiet -E < ${GCC_WIN32_PATCH}
+	cd ${WRKDIR} && ${PAX} -rz -s /${BINUTILS_DISTNAME}/toolchain/ \
+		-f ${_DISTDIR}/${BINUTILS_DISTNAME}.tar.bz2
 
 post-patch:
 	for i in patches/binutils-*; do \
-		${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -E < $$i; \
+		${PATCH} -d ${WRKSRC} --forward --quiet -E < $$i; \
 	done
-	cd ${BINUTILS_WRKSRC}/bfd && ${LOCALBASE}/bin/autoconf
-	cd ${BINUTILS_WRKSRC}/gas && ${LOCALBASE}/bin/autoconf
-	cd ${WRKDIR}/${GCC_DISTNAME}/gcc && ${LOCALBASE}/bin/autoconf
-	cd ${WRKDIR} && /usr/bin/tar zxf ${_DISTDIR}/${PTHREAD_DISTFILE}
-	cd ${WRKDIR}/${GCC_DISTNAME}/gcc && \
+	cd ${WRKSRC}/gcc && ${LOCALBASE}/bin/autoconf
+	cd ${WRKSRC}/gcc && \
 		${LN} -s ../../${PTHREAD_DISTNAME}/include/pthread.h . && \
 		${LN} -s ../../${PTHREAD_DISTNAME}/include/pthread .
-	cd ${WRKDIR} && /usr/bin/tar zxf ${_DISTDIR}/${SSP_PATCH}
-	${CP} ${WRKDIR}/protector.c ${WRKDIR}/protector.h ${WRKDIR}/${GCC_DISTNAME}/gcc/
-	${PATCH} -d ${WRKDIR}/${GCC_DISTNAME} --forward --quiet -E < ${WRKDIR}/protector.dif
-#	${PATCH} -d ${WRKDIR}/${GCC_DISTNAME} --forward --quiet -E < ${WRKDIR}/protectonly.dif
+	${CP} ${WRKDIR}/protector.c ${WRKDIR}/protector.h ${WRKSRC}/gcc/
+	${PATCH} -d ${WRKSRC} --forward --quiet -E < ${WRKDIR}/protector.dif
+#	${PATCH} -d ${WRKSRC} --forward --quiet -E < ${WRKDIR}/protectonly.dif
 
 CFLAGS_FOR_TARGET+=	-I${WRKDIR}
 post-configure:
@@ -72,8 +69,7 @@ post-configure:
 	${CP} ${FILESDIR}/syslimits.h ${CROSS_SYS_INCLUDE}/sys/
 	${CP} ${FILESDIR}/featuretest.h ${CROSS_SYS_INCLUDE}/sys/
 	${CP} ${FILESDIR}/limits.h ${CROSS_SYS_INCLUDE}/
-	${RM} ${WRKDIR}/${GCC_DISTNAME}/texinfo/makeinfo/Makefile
-	${SED} "s/extern FILE/__declspec(dllimport) FILE/" /usr/include/stdio.h > ${WRKDIR}/stdio.h
+	${SED} "s/^extern FILE/__declspec(dllimport) FILE/" /usr/include/stdio.h > ${WRKDIR}/stdio.h
 
 #.include "../COMMON/cross.mk"
 .include "files/cross.mk"