pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc kill all references to gcc.buildlink2.mk and compiler....
details: https://anonhg.NetBSD.org/pkgsrc/rev/b6257d5f06cd
branches: trunk
changeset: 461219:b6257d5f06cd
user: grant <grant%pkgsrc.org@localhost>
date: Fri Sep 12 20:07:06 2003 +0000
description:
kill all references to gcc.buildlink2.mk and compiler.mk, and define
USE_GCC2 or USE_GCC3 where appropriate.
the functionality of the old gcc.buildlink2.mk has been rolled into
compiler.mk now, which is automatically used.
more changes to come later...
diffstat:
audio/cheesetracker/Makefile | 3 +--
biology/rasmol/Makefile | 4 ++--
cad/fastcap/Makefile | 4 ++--
cad/fasthenry/Makefile | 4 ++--
chat/gabber/Makefile | 5 +++--
cross/h8300-hms-gcc/Makefile | 5 +++--
databases/cdb/Makefile | 5 ++---
devel/ddd/Makefile | 5 +++--
devel/glib/Makefile | 5 ++---
devel/prc-tools/Makefile | 5 +++--
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/ncview/Makefile | 4 ++--
graphics/netpbm/Makefile | 5 ++---
graphics/ogle/Makefile | 5 +++--
graphics/ogle_gui/Makefile | 5 +++--
lang/perl58/Makefile | 4 ++--
math/octave-current/Makefile | 5 ++---
math/scilab/Makefile | 4 ++--
misc/koffice/Makefile | 6 +++---
net/djbdns/Makefile | 5 ++---
net/ucspi-tcp/Makefile | 5 ++---
news/inn/Makefile | 4 ++--
print/ghostscript-esp/Makefile.common | 5 ++---
print/ghostscript-gnu/Makefile.common | 5 ++---
security/sfs/Makefile | 5 +++--
wm/windowmaker/Makefile | 5 ++---
www/ap-php4/Makefile | 3 +--
www/ap-ssl/Makefile | 3 +--
x11/kdelibs2/Makefile | 7 +++----
x11/kdelibs3/Makefile | 4 ++--
x11/neXtaw/Makefile | 4 ++--
x11/xephem/Makefile | 4 ++--
x11/xfce/Makefile | 4 ++--
x11/xphoon/Makefile | 4 ++--
x11/xscreensaver/Makefile.common | 4 ++--
40 files changed, 86 insertions(+), 92 deletions(-)
diffs (truncated from 780 to 300 lines):
diff -r e59f951c3140 -r b6257d5f06cd audio/cheesetracker/Makefile
--- a/audio/cheesetracker/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/audio/cheesetracker/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/09/12 19:03:58 recht Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/12 20:07:06 grant Exp $
#
DISTNAME= cheesetracker-0.5.5
@@ -26,7 +26,6 @@
cd ${WRKSRC} && ${AUTOMAKE} --add-missing
.include "../../mk/automake.mk"
-.include "../../mk/compiler.mk"
.include "../../mk/pthread.buildlink2.mk"
.include "../../x11/gtk--/buildlink2.mk"
diff -r e59f951c3140 -r b6257d5f06cd biology/rasmol/Makefile
--- a/biology/rasmol/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/biology/rasmol/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:24:42 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/12 20:07:07 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"
-. include "../../mk/gcc.buildlink2.mk"
+USE_GCC2= # defined
.endif
.if defined(RASMOL_DEPTH)
diff -r e59f951c3140 -r b6257d5f06cd cad/fastcap/Makefile
--- a/cad/fastcap/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/cad/fastcap/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:24:52 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/12 20:07:08 grant Exp $
#
DISTNAME= fastcap-2.0-15Jul92
@@ -25,7 +25,7 @@
CONFIGURE_ARGS= 4
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-. include "../../mk/gcc.buildlink2.mk"
+USE_GCC2= # defined
.endif
do-install:
diff -r e59f951c3140 -r b6257d5f06cd cad/fasthenry/Makefile
--- a/cad/fasthenry/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/cad/fasthenry/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:24:53 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/09/12 20:07:09 grant Exp $
#
DISTNAME= fasthenry-3.0-12Nov96
@@ -40,7 +40,7 @@
.endif
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-. include "../../mk/gcc.buildlink2.mk"
+USE_GCC2= # defined
.endif
.include "../../mk/bsd.pkg.mk"
diff -r e59f951c3140 -r b6257d5f06cd chat/gabber/Makefile
--- a/chat/gabber/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/chat/gabber/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/07/17 21:25:43 grant Exp $
+# $NetBSD: Makefile,v 1.22 2003/09/12 20:07:09 grant Exp $
DISTNAME= gabber-0.8.8
PKGREVISION= 1
@@ -16,13 +16,14 @@
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+USE_GCC2= # defined
+
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --disable-xmms --disable-sigctest
.include "../../devel/gal/buildlink2.mk"
.include "../../devel/libglade/buildlink2.mk"
.include "../../devel/libsigc++10/buildlink2.mk"
-.include "../../mk/gcc.buildlink2.mk"
.include "../../graphics/freetype-lib/buildlink2.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk--/buildlink2.mk"
diff -r e59f951c3140 -r b6257d5f06cd cross/h8300-hms-gcc/Makefile
--- a/cross/h8300-hms-gcc/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/cross/h8300-hms-gcc/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:38:10 martti Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/12 20:07:10 grant Exp $
DISTNAME= gcc-core-3.1
PKGNAME= cross-h8300-hms-gcc-3.1
@@ -32,6 +32,8 @@
SRCDIR= ${WRKDIR}/gcc-3.1
ALL_TARGET= CFLAGS="-O2 -fomit-frame-pointer" all
+USE_GCC2= # defined
+
post-extract:
${LN} -s ${WRKDIR}/newlib-1.10.0/newlib ${SRCDIR}/newlib
${MKDIR} ${WRKSRC}
@@ -42,5 +44,4 @@
${LN} -s ${H8300_PREFIX}/bin/$$f ${PREFIX}/bin/$$f ; \
done
-.include "../../mk/gcc.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e59f951c3140 -r b6257d5f06cd databases/cdb/Makefile
--- a/databases/cdb/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/databases/cdb/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:39:05 martti Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/12 20:07:11 grant Exp $
DISTNAME= cdb-0.75
CATEGORIES= databases
@@ -12,8 +12,7 @@
INSTALL_TARGET= setup check
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=YES
-. include "../../mk/gcc.buildlink2.mk"
+USE_GCC3= # defined
.endif
pre-build:
diff -r e59f951c3140 -r b6257d5f06cd devel/ddd/Makefile
--- a/devel/ddd/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/devel/ddd/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2003/09/12 18:36:10 recht Exp $
+# $NetBSD: Makefile,v 1.52 2003/09/12 20:07:12 grant Exp $
#
DISTNAME= ddd-3.3.7
@@ -16,6 +16,8 @@
TEST_TARGET= check
INFO_FILES= ddd-themes.info ddd.info
+USE_GCC3= # defined
+
CONFIGURE_ARGS+= --with-ncurses=no
.include "../../mk/bsd.prefs.mk"
@@ -46,7 +48,6 @@
.include "../../devel/binutils/buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/compiler.mk"
.include "../../mk/motif.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e59f951c3140 -r b6257d5f06cd devel/glib/Makefile
--- a/devel/glib/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/devel/glib/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2003/08/09 10:44:41 seb Exp $
+# $NetBSD: Makefile,v 1.62 2003/09/12 20:07:12 grant Exp $
# FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
#
@@ -39,8 +39,7 @@
.endif
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=YES
-. include "../../mk/gcc.buildlink2.mk"
+USE_GCC3= # defined
.endif
GLIB_VERSION= ${DISTNAME:S/glib-//}
diff -r e59f951c3140 -r b6257d5f06cd devel/prc-tools/Makefile
--- a/devel/prc-tools/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/devel/prc-tools/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/08/09 10:44:48 seb Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/12 20:07:13 grant Exp $
#
DISTNAME= prc-tools-2.2
@@ -37,6 +37,8 @@
USE_MAKEINFO= YES
INFO_FILES= prc-tools.info
+USE_GCC2= # defined
+
#CONFIGURE_ARGS+=--target=m68k-palmos
CONFIGURE_ARGS+=--enable-targets=m68k-palmos,arm-palmos
CONFIGURE_ARGS+=--enable-languages=c,c++
@@ -60,6 +62,5 @@
&& ${PATCH} --quiet -p0 < ${WRKSRC}/${DIST_GDB}.palmos.diff
.include "../../mk/autoconf.mk"
-.include "../../mk/gcc.buildlink2.mk"
.include "../../devel/ncurses/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e59f951c3140 -r b6257d5f06cd editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/editors/xemacs-current/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/09/06 17:01:42 magick Exp $
+# $NetBSD: Makefile,v 1.29 2003/09/12 20:07:14 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"
-. include "../../mk/gcc.buildlink2.mk"
+USE_GCC2= # defined
.endif
.include "../../mk/bsd.prefs.mk"
diff -r e59f951c3140 -r b6257d5f06cd emulators/stella/Makefile
--- a/emulators/stella/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/emulators/stella/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:35:46 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/12 20:07:15 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"
-. include "../../mk/gcc.buildlink2.mk"
+USE_GCC2= # defined
.endif
MAKE_ENV= CXXFLAGS="${CXXFLAGS} -fno-rtti"
diff -r e59f951c3140 -r b6257d5f06cd games/angband-tty/Makefile
--- a/games/angband-tty/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/games/angband-tty/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/06/11 20:50:53 abs Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/12 20:07:16 grant Exp $
#
DISTNAME= angband-283
@@ -23,7 +23,7 @@
SPOILERFILE= angband-spoilers.tar.gz
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-. include "../../mk/gcc.buildlink2.mk"
+USE_GCC2= # defined
.endif
do-install:
diff -r e59f951c3140 -r b6257d5f06cd games/angband-x11/Makefile
--- a/games/angband-x11/Makefile Fri Sep 12 19:42:37 2003 +0000
+++ b/games/angband-x11/Makefile Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/07/13 13:51:41 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/12 20:07:16 grant Exp $
#
DISTNAME= angband-3.0.1
@@ -26,7 +26,7 @@
CONFIGURE_ARGS= --with-setgid=games --prefix=${PREFIX}
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-. include "../../mk/gcc.buildlink2.mk"
+USE_GCC2= # defined
.endif
# add spoiler files and clean up a bit
diff -r e59f951c3140 -r b6257d5f06cd graphics/aalib/Makefile.common
--- a/graphics/aalib/Makefile.common Fri Sep 12 19:42:37 2003 +0000
+++ b/graphics/aalib/Makefile.common Fri Sep 12 20:07:06 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2003/07/17 21:40:03 grant Exp $
+# $NetBSD: Makefile.common,v 1.8 2003/09/12 20:07:17 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"
-. include "../../mk/gcc.buildlink2.mk"
+USE_GCC2= # defined
.endif
.include "../../mk/bsd.pkg.mk"
diff -r e59f951c3140 -r b6257d5f06cd graphics/aqsis/Makefile
Home |
Main Index |
Thread Index |
Old Index