From c044c82d67187200b4ab1b0d968e86cba336ffa1 Mon Sep 17 00:00:00 2001 From: grant Date: Thu, 22 Jan 2004 08:02:15 +0000 Subject: replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make. --- databases/freetds/Makefile | 4 ++-- databases/geneweb/Makefile | 4 ++-- databases/gnats/Makefile | 4 ++-- databases/guile-pg/Makefile | 4 ++-- databases/jdbc-postgresql/Makefile | 4 ++-- databases/libgda/Makefile.common | 4 ++-- databases/libgnomedb/Makefile | 4 ++-- databases/mergeant/Makefile | 4 ++-- databases/myodbc/Makefile | 4 ++-- databases/mysql-client/Makefile.common | 4 ++-- databases/mysql-server/Makefile | 4 ++-- databases/mysql4-client/Makefile.common | 4 ++-- databases/odbc-postgresql/Makefile.common | 4 ++-- databases/postgresql/Makefile.common | 4 ++-- databases/pxtools/Makefile | 4 ++-- databases/rrdtool/Makefile | 4 ++-- databases/sqlite/Makefile | 4 ++-- databases/tdb/Makefile | 4 ++-- databases/xsqlmenu/Makefile | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index ca8e60226dc..7d764e0284a 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/10/09 17:23:16 jdolecek Exp $ +# $NetBSD: Makefile,v 1.18 2004/01/22 08:02:15 grant Exp $ DISTNAME= freetds-0.61.2 CATEGORIES= databases @@ -10,7 +10,7 @@ COMMENT= LGPL'd implementation of Sybase's db-lib/ct-lib/ODBC libs USE_BUILDLINK2= yes USE_PKGINSTALL= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${PREFIX}/freetds diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile index 85145a63765..29fad73e0bf 100644 --- a/databases/geneweb/Makefile +++ b/databases/geneweb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/07/17 21:28:07 grant Exp $ +# $NetBSD: Makefile,v 1.15 2004/01/22 08:02:15 grant Exp $ # DISTNAME= geneweb-4.09 @@ -12,7 +12,7 @@ COMMENT= GeneWeb is a comprehensive genealogy database application DEPENDS+= ocaml>=3.04:../../lang/ocaml USE_PKGINSTALL= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make RCD_SCRIPTS= geneweb diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile index c80a9f68aaa..644216b136d 100644 --- a/databases/gnats/Makefile +++ b/databases/gnats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/20 18:05:35 seb Exp $ +# $NetBSD: Makefile,v 1.11 2004/01/22 08:02:15 grant Exp $ DISTNAME= gnats-3.113.1 CATEGORIES= devel @@ -12,7 +12,7 @@ BUILD_DEPENDS+= m4-*:../../devel/m4 USE_PKGINSTALL= YES GNU_CONFIGURE= YES -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_BISON= yes USE_MAKEINFO= YES diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile index a80e93a959c..fc8335f3032 100644 --- a/databases/guile-pg/Makefile +++ b/databases/guile-pg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/08/09 10:38:24 seb Exp $ +# $NetBSD: Makefile,v 1.11 2004/01/22 08:02:15 grant Exp $ # DISTNAME= guile-pg-0.07 @@ -14,7 +14,7 @@ DEPENDS+= postgresql-lib>=7.3.1:../../databases/postgresql-lib USE_BUILDLINK2= YES USE_LIBTOOL= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-libpq-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql diff --git a/databases/jdbc-postgresql/Makefile b/databases/jdbc-postgresql/Makefile index 5597c9bb29a..f870ba228eb 100644 --- a/databases/jdbc-postgresql/Makefile +++ b/databases/jdbc-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/01/20 12:12:49 agc Exp $ +# $NetBSD: Makefile,v 1.23 2004/01/22 08:02:15 grant Exp $ # DISTNAME= postgresql-${DIST_VERS} @@ -24,7 +24,7 @@ BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant EXTRACT_ELEMENTS= ${DISTNAME}/src/interfaces/jdbc WRKSRC= ${WRKDIR}/${DISTNAME}/src/interfaces/jdbc -USE_GMAKE= YES +USE_GNU_TOOLS+= make EXAMPLEDIR= ${PREFIX}/share/examples/java/jdbc-postgresql DOCDIR= ${PREFIX}/share/doc/java/jdbc-postgresql diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common index 201b3cd14da..3a9730c9b93 100644 --- a/databases/libgda/Makefile.common +++ b/databases/libgda/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2003/12/23 13:24:40 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.14 2004/01/22 08:02:16 grant Exp $ # DISTNAME?= libgda-1.0.0 @@ -10,7 +10,7 @@ MAINTAINER?= sab@posix.org.uk HOMEPAGE?= http://www.gnome-db.org/ USE_X11= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_BUILDLINK2= YES USE_PKGINSTALL= YES diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 32e203c19ba..b228d23f276 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/01/03 18:49:36 reed Exp $ +# $NetBSD: Makefile,v 1.19 2004/01/22 08:02:16 grant Exp $ # DISTNAME= libgnomedb-1.0.0 @@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes DEPENDS= gnome2-dirs>=1.2:../../misc/gnome2-dirs USE_X11= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile index 149f512fafb..5421ec1b9d7 100644 --- a/databases/mergeant/Makefile +++ b/databases/mergeant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/01/03 18:49:36 reed Exp $ +# $NetBSD: Makefile,v 1.15 2004/01/22 08:02:16 grant Exp $ # DISTNAME= mergeant-0.12.1 @@ -16,7 +16,7 @@ DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs USE_PERL5= build USE_BUILDLINK2= YES USE_X11= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile index ee82ed7cd61..ee1129df8e1 100644 --- a/databases/myodbc/Makefile +++ b/databases/myodbc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 21:28:21 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/01/22 08:02:16 grant Exp $ # DISTNAME= MyODBC-2.50.36 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-odbc-ini=${LOCALBASE}/etc/odbc.ini USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -USE_GMAKE= yes +USE_GNU_TOOLS+= make post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/myodbc diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index 6408bba5c8c..b59677793d7 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2003/11/03 12:21:40 gavan Exp $ +# $NetBSD: Makefile.common,v 1.21 2004/01/22 08:02:16 grant Exp $ DISTNAME= mysql-3.23.58 CATEGORIES= databases @@ -30,7 +30,7 @@ MYSQL_EXTRA_CHARSET?= all USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined -USE_GMAKE= # defined +USE_GNU_TOOLS+= make CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR} CONFIGURE_ARGS+= --with-named-z-libs=z CONFIGURE_ARGS+= --without-libwrap diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile index 5c9d15ca5f2..78e0bc87f1b 100644 --- a/databases/mysql-server/Makefile +++ b/databases/mysql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2003/10/05 17:55:34 martti Exp $ +# $NetBSD: Makefile,v 1.52 2004/01/22 08:02:16 grant Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} SVR4_PKGNAME= mysqs @@ -9,7 +9,7 @@ COMMENT= MySQL, a free SQL database (server) CONFIGURE_ARGS+= --with-libwrap CONFIGURE_ARGS+= --without-berkeley-db USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_PKGINSTALL= YES INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index b7048febec3..e639a8f89a4 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2003/12/20 16:00:12 martti Exp $ +# $NetBSD: Makefile.common,v 1.2 2004/01/22 08:02:16 grant Exp $ DISTNAME= mysql-4.0.17 CATEGORIES= databases @@ -58,7 +58,7 @@ CFLAGS+= -DHAVE_CURSES_H CXXFLAGS+= -DHAVE_CURSES_H .endif -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_PERL5= # defined USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/databases/odbc-postgresql/Makefile.common b/databases/odbc-postgresql/Makefile.common index 94436ee63a9..3109e0b3068 100644 --- a/databases/odbc-postgresql/Makefile.common +++ b/databases/odbc-postgresql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2003/07/17 21:28:25 grant Exp $ +# $NetBSD: Makefile.common,v 1.4 2004/01/22 08:02:16 grant Exp $ DISTNAME= postgresql-${DIST_VERS} CATEGORIES= databases @@ -30,7 +30,7 @@ DIST_VERS?= 7.2.3 BASE_VERS?= ${DIST_VERS} USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make MAKEFILE= GNUmakefile GNU_CONFIGURE= YES diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common index bd8902cdc39..5e35196e00c 100644 --- a/databases/postgresql/Makefile.common +++ b/databases/postgresql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.40 2004/01/20 14:11:49 jlam Exp $ +# $NetBSD: Makefile.common,v 1.41 2004/01/22 08:02:16 grant Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -39,7 +39,7 @@ BASE_VERS?= ${DIST_VERS} BUILDLINK_DEPENDS.postgresql-lib?= postgresql-lib>=${BASE_VERS} BUILDLINK_DEPENDS.tcl-postgresql?= tcl-postgresql>=${BASE_VERS} -USE_GMAKE= YES +USE_GNU_TOOLS+= make GNU_CONFIGURE= YES PKG_SYSCONFSUBDIR= postgresql diff --git a/databases/pxtools/Makefile b/databases/pxtools/Makefile index 0891a560d9f..71692db5051 100644 --- a/databases/pxtools/Makefile +++ b/databases/pxtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/12/24 09:53:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 08:02:16 grant Exp $ # DISTNAME= pxtools-0.0.19 @@ -12,7 +12,7 @@ COMMENT= Paradox database export/info utilities USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make GNU_CONFIGURE= YES diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index 30fbe12d796..df2996fc3e5 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2003/06/23 10:33:52 adam Exp $ +# $NetBSD: Makefile,v 1.22 2004/01/22 08:02:16 grant Exp $ # DISTNAME= rrdtool-1.0.40 @@ -18,7 +18,7 @@ USE_LIBTOOL= # defined USE_BUILDLINK2= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig LTCONFIG_OVERRIDE+= ${WRKSRC}/contrib/php4/ltconfig -USE_GMAKE= # defined +USE_GNU_TOOLS+= make GNU_CONFIGURE= # defined CONFIGURE_ARGS= --enable-shared diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile index bc9b3e2a8ed..77ecf1d6a08 100644 --- a/databases/sqlite/Makefile +++ b/databases/sqlite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/01/20 12:12:49 agc Exp $ +# $NetBSD: Makefile,v 1.20 2004/01/22 08:02:16 grant Exp $ DISTNAME= sqlite-2.8.5 CATEGORIES= databases @@ -12,7 +12,7 @@ COMMENT= SQL Database Engine In A C Library WRKSRC= ${WRKDIR}/sqlite-build USE_BUILDLINK2= YES USE_LIBTOOL= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile index 1a660e4eb21..74470e81cb2 100644 --- a/databases/tdb/Makefile +++ b/databases/tdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/07/17 21:29:08 grant Exp $ +# $NetBSD: Makefile,v 1.3 2004/01/22 08:02:16 grant Exp $ # DISTNAME= tdb-1.0.6 @@ -11,7 +11,7 @@ COMMENT= Small database system which uses files to store data GNU_CONFIGURE= YES USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/databases/xsqlmenu/Makefile b/databases/xsqlmenu/Makefile index 5765c84f1c2..fb9485feddd 100644 --- a/databases/xsqlmenu/Makefile +++ b/databases/xsqlmenu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/03 18:49:36 reed Exp $ +# $NetBSD: Makefile,v 1.8 2004/01/22 08:02:16 grant Exp $ # DISTNAME= xsqlmenu-2.10 @@ -12,7 +12,7 @@ COMMENT= X based GUI for MySQL USE_BUILDLINK2= yes USE_X11= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make MAKE_ENV+= MAKE=${MAKE_PROGRAM} do-install: -- cgit v1.2.3