From e090734d623a7791745dc3e5fa2307d0af319d66 Mon Sep 17 00:00:00 2001 From: grant Date: Sun, 13 Jul 2003 13:16:03 +0000 Subject: oops, we still want the mk files for non-pkgsrc purposes. unbump PKGREVISIONs. --- lang/gcc/Makefile | 4 ++-- lang/gcc/PLIST | 5 +++-- lang/gcc/files/gcc.mk | 7 +++++++ lang/gcc3/Makefile | 8 ++++++-- lang/gcc3/PLIST | 5 +++-- lang/gcc3/files/gcc3.mk | 9 +++++++++ 6 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 lang/gcc/files/gcc.mk create mode 100644 lang/gcc3/files/gcc3.mk diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 5cbc67c0fa0..615a5d45e0b 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.67 2003/07/13 13:04:09 grant Exp $ +# $NetBSD: Makefile,v 1.68 2003/07/13 13:16:03 grant Exp $ DISTNAME= gcc-2.95.3 -PKGREVISION= 5 +PKGREVISION= 4 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/} diff --git a/lang/gcc/PLIST b/lang/gcc/PLIST index c6963082677..a2b60e6a9da 100644 --- a/lang/gcc/PLIST +++ b/lang/gcc/PLIST @@ -1,2 +1,3 @@ -@comment $NetBSD: PLIST,v 1.11 2003/07/13 13:04:09 grant Exp $ -@this plist intentionally left blank +@comment $NetBSD: PLIST,v 1.12 2003/07/13 13:16:03 grant Exp $ +share/examples/${DISTNAME}/mk.conf +@dirrm share/examples/${DISTNAME} diff --git a/lang/gcc/files/gcc.mk b/lang/gcc/files/gcc.mk new file mode 100644 index 00000000000..d81fad777a2 --- /dev/null +++ b/lang/gcc/files/gcc.mk @@ -0,0 +1,7 @@ +# $NetBSD: gcc.mk,v 1.7 2003/07/13 13:16:04 grant Exp $ +# +# make configuration file for @DISTNAME@ + +CC= @GCC_PREFIX@/bin/gcc +CPP= @GCC_PREFIX@/bin/cpp +CXX= @GCC_PREFIX@/bin/g++ diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile index accf1e1b0cb..1926bdfe61d 100644 --- a/lang/gcc3/Makefile +++ b/lang/gcc3/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2003/07/13 13:04:09 grant Exp $ +# $NetBSD: Makefile,v 1.38 2003/07/13 13:16:04 grant Exp $ # DISTNAME= gcc-3.3 -PKGREVISION= 5 +PKGREVISION= 4 PKGNAME= ${DISTNAME:C|gcc|gcc3|} CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-3.3/} @@ -92,11 +92,15 @@ pre-configure: ${MKDIR} ${BUILD_DIRS} cd ${WRKSRC} && contrib/gcc_update --touch +post-build: + @${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc3.mk > ${WRKDIR}/gcc3.mk + post-install: .if ${OPSYS} == "SunOS" -cd ${GCC_ARCHDIR}/include && ${RM} -f fixed && ${RMDIR} v7 v9 .endif ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${DISTNAME} + ${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${PREFIX}/share/examples/${DISTNAME}/mk.conf ${LN} -f ${GCC_PREFIX}/bin/gcc ${GCC_PREFIX}/bin/cc # ${LN} -f ${GCC_PREFIX}/bin/g77 ${GCC_PREFIX}/bin/f77 ${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} diff --git a/lang/gcc3/PLIST b/lang/gcc3/PLIST index 1206c0ddced..be41456e120 100644 --- a/lang/gcc3/PLIST +++ b/lang/gcc3/PLIST @@ -1,2 +1,3 @@ -@comment $NetBSD: PLIST,v 1.9 2003/07/13 13:04:10 grant Exp $ -@this plist intentionally left blank +@comment $NetBSD: PLIST,v 1.10 2003/07/13 13:16:04 grant Exp $ +share/examples/${DISTNAME}/mk.conf +@dirrm share/examples/${DISTNAME} diff --git a/lang/gcc3/files/gcc3.mk b/lang/gcc3/files/gcc3.mk new file mode 100644 index 00000000000..8f919c327b7 --- /dev/null +++ b/lang/gcc3/files/gcc3.mk @@ -0,0 +1,9 @@ +# $NetBSD: gcc3.mk,v 1.9 2003/07/13 13:16:05 grant Exp $ +# +# make configuration file for @DISTNAME@ + +CC= @GCC_PREFIX@/bin/gcc +CPP= @GCC_PREFIX@/bin/cpp +CXX= @GCC_PREFIX@/bin/g++ +F77= @GCC_PREFIX@/bin/g77 +PKG_FC= @GCC_PREFIX@/bin/g77 -- cgit v1.2.3