pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc get rid of USE_GCC2/3 in pkg Makefiles, and set GCC_RE...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1fcf3db8a08e
branches:  trunk
changeset: 461555:1fcf3db8a08e
user:      grant <grant%pkgsrc.org@localhost>
date:      Wed Sep 17 19:39:58 2003 +0000

description:
get rid of USE_GCC2/3 in pkg Makefiles, and set GCC_REQD or
USE_PKGSRC_GCC as appropriate, as this is handled by compiler.mk now.

diffstat:

 audio/nas/Makefile                      |   6 +-----
 biology/rasmol/Makefile                 |   4 ++--
 cad/fastcap/Makefile                    |   4 ++--
 cad/fasthenry/Makefile                  |   4 ++--
 chat/gabber/Makefile                    |   4 ++--
 cross/h8300-hms-gcc/Makefile            |   4 ++--
 databases/cdb/Makefile                  |   4 ++--
 devel/ddd/Makefile                      |   4 ++--
 devel/glib/Makefile                     |   4 ++--
 devel/gnome-objc/Makefile               |   6 ++++--
 devel/prc-tools/Makefile                |   4 ++--
 editors/xemacs-current/Makefile         |   4 ++--
 emulators/stella/Makefile               |   4 ++--
 games/angband-tty/Makefile              |   4 ++--
 games/angband-x11/Makefile              |   4 ++--
 graphics/aalib/Makefile.common          |   4 ++--
 graphics/aqsis/Makefile                 |   4 ++--
 graphics/mplayer-share/Makefile.depends |   7 ++-----
 graphics/ncview/Makefile                |   4 ++--
 graphics/netpbm/Makefile                |   4 ++--
 graphics/ogle/Makefile                  |   4 ++--
 graphics/ogle_gui/Makefile              |   4 ++--
 graphics/xv/Makefile                    |   6 +-----
 lang/gpc/Makefile                       |  13 ++++++-------
 lang/perl58/Makefile                    |   5 +++--
 mail/imap-uw/Makefile                   |   6 ++----
 math/octave-current/Makefile            |   4 ++--
 math/scilab/Makefile                    |   4 ++--
 misc/koffice/Makefile                   |   4 ++--
 net/djbdns/Makefile                     |   4 ++--
 net/tightvncviewer/Makefile             |   5 +----
 net/ucspi-tcp/Makefile                  |   4 ++--
 news/inn/Makefile                       |   4 ++--
 print/ghostscript-esp/Makefile.common   |  10 +++++-----
 print/ghostscript-gnu/Makefile.common   |  10 +++++-----
 print/ghostscript-nox11/Makefile.common |  12 +++++-------
 print/hpijs/Makefile                    |   4 ++--
 security/sfs/Makefile                   |   6 ++----
 time/asclock/Makefile                   |   5 +----
 wm/blackbox/Makefile                    |   3 +--
 wm/bsetroot/Makefile                    |   3 +--
 wm/windowmaker/Makefile                 |  10 +++++-----
 www/apache/Makefile                     |   9 +++++----
 www/apache6/Makefile                    |   7 ++++++-
 x11/kdelibs2/Makefile                   |   6 +++---
 x11/kdelibs3/Makefile                   |   5 +++--
 x11/neXtaw/Makefile                     |   4 ++--
 x11/xephem/Makefile                     |   4 ++--
 x11/xfce/Makefile                       |   4 ++--
 x11/xphoon/Makefile                     |   4 ++--
 x11/xscreensaver/Makefile.common        |   4 ++--
 51 files changed, 124 insertions(+), 140 deletions(-)

diffs (truncated from 1028 to 300 lines):

diff -r 8dd4b58d02b7 -r 1fcf3db8a08e audio/nas/Makefile
--- a/audio/nas/Makefile        Wed Sep 17 19:39:34 2003 +0000
+++ b/audio/nas/Makefile        Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/09/15 08:46:25 grant Exp $
+# $NetBSD: Makefile,v 1.32 2003/09/17 19:39:58 grant Exp $
 
 DISTNAME=      nas-1.6.src
 PKGNAME=       ${DISTNAME:S/.src//}
@@ -51,8 +51,4 @@
 CONF_FILES=    ${EGDIR}/nasd.conf.eg ${PKG_SYSCONFDIR}/nasd.conf
 .endif
 
-.if defined(USE_GCC3)
-.  include "../../lang/gcc3/buildlink2.mk"
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e biology/rasmol/Makefile
--- a/biology/rasmol/Makefile   Wed Sep 17 19:39:34 2003 +0000
+++ b/biology/rasmol/Makefile   Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/12 20:07:07 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/17 19:40:00 grant Exp $
 
 DISTNAME=      RasMol_2.7.1
 PKGNAME=       rasmol-2.7.1
@@ -19,7 +19,7 @@
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=              # defined
+USE_PKGSRC_GCC=                # defined
 .endif
 
 .if defined(RASMOL_DEPTH)
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e cad/fastcap/Makefile
--- a/cad/fastcap/Makefile      Wed Sep 17 19:39:34 2003 +0000
+++ b/cad/fastcap/Makefile      Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/12 20:07:08 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/17 19:40:02 grant Exp $
 #
 
 DISTNAME=      fastcap-2.0-15Jul92
@@ -25,7 +25,7 @@
 CONFIGURE_ARGS=                4
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=              # defined
+USE_PKGSRC_GCC=                # defined
 .endif
 
 do-install:
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e cad/fasthenry/Makefile
--- a/cad/fasthenry/Makefile    Wed Sep 17 19:39:34 2003 +0000
+++ b/cad/fasthenry/Makefile    Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/09/12 20:07:09 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/17 19:40:03 grant Exp $
 #
 
 DISTNAME=      fasthenry-3.0-12Nov96
@@ -40,7 +40,7 @@
 .endif
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=              # defined
+USE_PKGSRC_GCC=                # defined
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e chat/gabber/Makefile
--- a/chat/gabber/Makefile      Wed Sep 17 19:39:34 2003 +0000
+++ b/chat/gabber/Makefile      Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/09/12 20:07:09 grant Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/17 19:40:04 grant Exp $
 
 DISTNAME=      gabber-0.8.8
 PKGREVISION=   1
@@ -16,7 +16,7 @@
 USE_LIBTOOL=           YES
 LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
 
-USE_GCC2=              # defined
+USE_PKGSRC_GCC=                # defined
 
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --disable-xmms --disable-sigctest
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e cross/h8300-hms-gcc/Makefile
--- a/cross/h8300-hms-gcc/Makefile      Wed Sep 17 19:39:34 2003 +0000
+++ b/cross/h8300-hms-gcc/Makefile      Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/09/12 20:07:10 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/09/17 19:40:06 grant Exp $
 
 DISTNAME=              gcc-core-3.1
 PKGNAME=               cross-h8300-hms-gcc-3.1
@@ -32,7 +32,7 @@
 SRCDIR=                        ${WRKDIR}/gcc-3.1
 ALL_TARGET=            CFLAGS="-O2 -fomit-frame-pointer" all
 
-USE_GCC2=              # defined
+USE_PKGSRC_GCC=                # defined
 
 post-extract:
        ${LN} -s ${WRKDIR}/newlib-1.10.0/newlib ${SRCDIR}/newlib
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e databases/cdb/Makefile
--- a/databases/cdb/Makefile    Wed Sep 17 19:39:34 2003 +0000
+++ b/databases/cdb/Makefile    Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/09/12 20:07:11 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/17 19:40:08 grant Exp $
 
 DISTNAME=      cdb-0.75
 CATEGORIES=    databases
@@ -12,7 +12,7 @@
 INSTALL_TARGET=        setup check
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=      # defined
+USE_PKGSRC_GCC=                # defined
 .endif
 
 pre-build:
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e devel/ddd/Makefile
--- a/devel/ddd/Makefile        Wed Sep 17 19:39:34 2003 +0000
+++ b/devel/ddd/Makefile        Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2003/09/12 21:02:10 tron Exp $
+# $NetBSD: Makefile,v 1.54 2003/09/17 19:40:11 grant Exp $
 #
 
 DISTNAME=      ddd-3.3.7
@@ -16,7 +16,7 @@
 TEST_TARGET=           check
 INFO_FILES=            ddd-themes.info ddd.info
 
-USE_GCC3=              # defined
+GCC_REQD=              3.0
 
 CONFIGURE_ARGS+=       --with-ncurses=no
 CONFIGURE_ENV+=                COMPFACE="${FALSE}"
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e devel/glib/Makefile
--- a/devel/glib/Makefile       Wed Sep 17 19:39:34 2003 +0000
+++ b/devel/glib/Makefile       Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2003/09/12 20:07:12 grant Exp $
+# $NetBSD: Makefile,v 1.63 2003/09/17 19:40:13 grant Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
@@ -39,7 +39,7 @@
 .endif
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=              # defined
+GCC_REQD=              3.0
 .endif
 
 GLIB_VERSION=          ${DISTNAME:S/glib-//}
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e devel/gnome-objc/Makefile
--- a/devel/gnome-objc/Makefile Wed Sep 17 19:39:34 2003 +0000
+++ b/devel/gnome-objc/Makefile Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 21:30:50 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/09/17 19:41:30 grant Exp $
 #
 
 DISTNAME=      gnome-objc-1.0.40
@@ -16,12 +16,14 @@
 PTHREAD_OPTS+=         require
 
 GNU_CONFIGURE=         YES
+USE_PKGLOCALEDIR=      YES
 CONFIGURE_ENV+=                OBJC="${CC}"
 
 USE_LIBTOOL=           YES
 LTCONFIG_OVERRIDE=     ${WRKSRC}/ltconfig
 
+GCC_REQD=              3.0
+
 .include "../../x11/gnome-libs/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e devel/prc-tools/Makefile
--- a/devel/prc-tools/Makefile  Wed Sep 17 19:39:34 2003 +0000
+++ b/devel/prc-tools/Makefile  Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/12 20:07:13 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/17 19:40:14 grant Exp $
 #
 
 DISTNAME=      prc-tools-2.2
@@ -37,7 +37,7 @@
 USE_MAKEINFO=  YES
 INFO_FILES=    prc-tools.info
 
-USE_GCC2=      # defined
+USE_PKGSRC_GCC=        # defined
 
 #CONFIGURE_ARGS+=--target=m68k-palmos
 CONFIGURE_ARGS+=--enable-targets=m68k-palmos,arm-palmos
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile   Wed Sep 17 19:39:34 2003 +0000
+++ b/editors/xemacs-current/Makefile   Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/09/12 20:07:14 grant Exp $
+# $NetBSD: Makefile,v 1.30 2003/09/17 19:40:17 grant Exp $
 
 DISTNAME=      xemacs-21.5.15
 CATEGORIES=    editors
@@ -15,7 +15,7 @@
 MESSAGE_SUBST+=        EMACSVER=xemacs-21.5-b15
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=      # defined
+USE_PKGSRC_GCC=                # defined
 .endif
 
 .include "../../mk/bsd.prefs.mk"
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e emulators/stella/Makefile
--- a/emulators/stella/Makefile Wed Sep 17 19:39:34 2003 +0000
+++ b/emulators/stella/Makefile Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/12 20:07:15 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/17 19:40:18 grant Exp $
 
 DISTNAME=      stella-1.1-src
 PKGNAME=       stella-1.1
@@ -16,7 +16,7 @@
 ALL_TARGET=    unix-x
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=      # defined
+USE_PKGSRC_GCC=                # defined
 .endif
 
 MAKE_ENV=      CXXFLAGS="${CXXFLAGS} -fno-rtti"
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e games/angband-tty/Makefile
--- a/games/angband-tty/Makefile        Wed Sep 17 19:39:34 2003 +0000
+++ b/games/angband-tty/Makefile        Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/09/12 20:07:16 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/17 19:40:21 grant Exp $
 #
 
 DISTNAME=              angband-283
@@ -23,7 +23,7 @@
 SPOILERFILE=           angband-spoilers.tar.gz
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=      # defined
+USE_PKGSRC_GCC=                # defined
 .endif
 
 do-install:
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e games/angband-x11/Makefile
--- a/games/angband-x11/Makefile        Wed Sep 17 19:39:34 2003 +0000
+++ b/games/angband-x11/Makefile        Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/09/15 13:58:37 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2003/09/17 19:40:23 grant Exp $
 #
 
 DISTNAME=      angband-3.0.3
@@ -25,7 +25,7 @@
 CONFIGURE_ARGS=        --with-setgid=games --prefix=${PREFIX}
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=      # defined
+USE_PKGSRC_GCC=                # defined
 .endif
 
 # add spoiler files and clean up a bit
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e graphics/aalib/Makefile.common
--- a/graphics/aalib/Makefile.common    Wed Sep 17 19:39:34 2003 +0000
+++ b/graphics/aalib/Makefile.common    Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2003/09/12 20:07:17 grant Exp $
+# $NetBSD: Makefile.common,v 1.9 2003/09/17 19:40:26 grant Exp $
 
 DISTNAME=      aalib-${DIST_VERS}
 WRKSRC=                ${WRKDIR}/aalib-1.4.0
@@ -19,7 +19,7 @@
 LTCONFIG_OVERRIDE=     ${WRKSRC}/ltconfig
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=      # defined
+USE_PKGSRC_GCC=                # defined
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r 8dd4b58d02b7 -r 1fcf3db8a08e graphics/aqsis/Makefile
--- a/graphics/aqsis/Makefile   Wed Sep 17 19:39:34 2003 +0000
+++ b/graphics/aqsis/Makefile   Wed Sep 17 19:39:58 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/09/12 20:07:18 grant Exp $



Home | Main Index | Thread Index | Old Index