summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjmmv <jmmv>2003-05-02 08:22:12 +0000
committerjmmv <jmmv>2003-05-02 08:22:12 +0000
commita6a0e122c9d243db4d2cd9e4c4379a93c7eef260 (patch)
treee3930fd4797a38485641da029fbf3193a41cded0 /lang
parent253ecda6ae6189ffe32c88af0fe8447bb4fad6b5 (diff)
downloadpkgsrc-a6a0e122c9d243db4d2cd9e4c4379a93c7eef260.tar.gz
Move the sample mk.conf file to share/examples/gcc/mk.conf, instead of
installing in in etc/ (and not honouring PKG_SYSCONFDIR). Bump PKGREVISION.
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc/MESSAGE4
-rw-r--r--lang/gcc/Makefile13
-rw-r--r--lang/gcc/PLIST5
-rw-r--r--lang/gcc/PLIST.SunOS5
4 files changed, 16 insertions, 11 deletions
diff --git a/lang/gcc/MESSAGE b/lang/gcc/MESSAGE
index 8ca7a75d142..b13cf8d94e8 100644
--- a/lang/gcc/MESSAGE
+++ b/lang/gcc/MESSAGE
@@ -1,7 +1,7 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/03/14 16:21:57 wiz Exp $
+$NetBSD: MESSAGE,v 1.4 2003/05/02 08:22:12 jmmv Exp $
-To use ${PKGNAME} include "${PREFIX}/etc/${PKGNAME}.mk" in your
+To use ${PKGNAME} include "${PREFIX}/share/examples/gcc/mk.conf" in your
BSD style makefile.
===========================================================================
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 5ec0c8873b3..bd289161f9d 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2003/04/14 00:28:17 grant Exp $
+# $NetBSD: Makefile,v 1.56 2003/05/02 08:22:12 jmmv Exp $
# Make sure that the version number in "Makefile.gcc" matches this.
DISTNAME= gcc-2.95.3
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/}
#
@@ -48,12 +49,12 @@ ALL_TARGET= bootstrap
CONFIGURE_ARGS+= --with-gnu-as
CONFIGURE_ARGS+= --with-gnu-ld
CONFIGURE_ARGS+= --infodir=${PREFIX}/info
-GCC_PREFIX= ${PREFIX}/${PKGNAME}
+GCC_PREFIX= ${PREFIX}/${PKGNAME_NOREV}
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
.else
# try to use some sane defaults if we have no idea about the platform.
CONFIGURE_ARGS+= --infodir=${PREFIX}/info
-GCC_PREFIX= ${PREFIX}/${PKGNAME}
+GCC_PREFIX= ${PREFIX}/${PKGNAME_NOREV}
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
# play it safe, force a bootstrap build if we don't know for sure it
# is gcc.
@@ -95,11 +96,13 @@ post-build:
# make install; make deinstall; make install
#
post-install:
- ${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/etc/${PKGNAME}.mk
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gcc
+ ${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/share/examples/gcc/mk.conf
-cd ${GCC_ARCHDIR}/include && ${RM} -f fixed && ${RMDIR} v7 v9
.else
post-install:
- ${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/etc/${PKGNAME}.mk
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gcc
+ ${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/share/examples/gcc/mk.conf
. if exists(/usr/include/g++/FlexLexer.h)
${LN} -fs /usr/include/g++/FlexLexer.h \
${GCC_PREFIX}/include/g++-3/FlexLexer.h
diff --git a/lang/gcc/PLIST b/lang/gcc/PLIST
index d4f1bf19010..e10177a07b3 100644
--- a/lang/gcc/PLIST
+++ b/lang/gcc/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/09/27 12:28:15 jlam Exp $
-etc/${PKGNAME}.mk
+@comment $NetBSD: PLIST,v 1.8 2003/05/02 08:22:12 jmmv Exp $
@unexec ${INSTALL_INFO} --delete %D/info/chill.info %D/info/dir
info/chill.info
@exec ${INSTALL_INFO} %D/info/chill.info %D/info/dir
@@ -66,3 +65,5 @@ info/gcc.info-6
info/gcc.info-7
info/gcc.info-8
info/gcc.info-9
+share/examples/gcc/mk.conf
+@dirrm share/examples/gcc
diff --git a/lang/gcc/PLIST.SunOS b/lang/gcc/PLIST.SunOS
index 29a78cdff2e..c850d15e256 100644
--- a/lang/gcc/PLIST.SunOS
+++ b/lang/gcc/PLIST.SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS,v 1.7 2002/10/05 20:54:52 dmcmahill Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.8 2003/05/02 08:22:12 jmmv Exp $
${MACHINE_GNU_PLATFORM}/include/_G_config.h
${MACHINE_GNU_PLATFORM}/include/assert.h
bin/${MACHINE_GNU_PLATFORM}-gcc
@@ -14,7 +14,6 @@ bin/gcjh
bin/gcov
bin/jcf-dump
bin/jv-scan
-etc/${PKGNAME}.mk
include/g++-3/PlotFile.h
include/g++-3/SFile.h
include/g++-3/algo.h
@@ -301,6 +300,8 @@ man/man1/cccp.1
man/man1/g++.1
man/man1/g77.1
man/man1/gcc.1
+share/examples/gcc/mk.conf
+@dirrm share/examples/gcc
@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/sys
@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/objc
@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include