summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-06-01 20:07:59 +0000
committerjlam <jlam@pkgsrc.org>2005-06-01 20:07:59 +0000
commit2bb24f15f17cde7494cc69e5dac941f474ec8605 (patch)
tree77aa2e325b82a73660278dbb13238e6aac0adca7 /databases
parenta78a94a4f6f91c29d1969aa948a3f809f479fc73 (diff)
downloadpkgsrc-2bb24f15f17cde7494cc69e5dac941f474ec8605.tar.gz
Remove mk/autoconf.mk and mk/automake.mk and replace their usage with
USE_TOOLS and any of "autoconf", "autoconf213", "automake" or "automake14". Also, we don't need to call the auto* tools via ${ACLOCAL}, ${AUTOCONF}, etc., since the tools framework takes care to symlink the correct tool to the correct name, so we can just use aclocal, autoconf, etc.
Diffstat (limited to 'databases')
-rw-r--r--databases/mysqlcc/Makefile7
-rw-r--r--databases/postgresql73/Makefile.common8
2 files changed, 6 insertions, 9 deletions
diff --git a/databases/mysqlcc/Makefile b/databases/mysqlcc/Makefile
index 07e6e21b63f..c76bb81d537 100644
--- a/databases/mysqlcc/Makefile
+++ b/databases/mysqlcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:12 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/01 20:08:00 jlam Exp $
#
DISTNAME= mysqlcc-0.9.4-src
@@ -14,6 +14,7 @@ HOMEPAGE= http://www.mysql.com/
COMMENT= MySQL Control Center
USE_PKGLOCALEDIR= YES
+USE_TOOLS+= automake
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= \
--with-mysql-lib=${BUILDLINK_PREFIX.mysql-client}/lib/mysql
@@ -26,7 +27,7 @@ CONFIGURE_ENV+= QMAKESPEC="${QTDIR}/mkspecs/netbsd-g++"
MYSQL_VERSIONS_ACCEPTED= 40 41
pre-configure:
- cd ${WRKSRC} && ${ACLOCAL} && ${AUTOCONF}
+ cd ${WRKSRC} && aclocal && autoconf
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mysqlcc ${PREFIX}/bin/
@@ -34,6 +35,4 @@ do-install:
.include "../../security/openssl/buildlink3.mk"
.include "../../x11/qt3-tools/buildlink3.mk"
.include "../../mk/mysql.buildlink3.mk"
-.include "../../mk/autoconf.mk"
-.include "../../mk/automake.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql73/Makefile.common b/databases/postgresql73/Makefile.common
index 6ab332ec62c..a0c1c0b7502 100644
--- a/databases/postgresql73/Makefile.common
+++ b/databases/postgresql73/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/05/22 20:07:46 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/06/01 20:08:00 jlam 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.postgresql73-lib?= postgresql73-lib>=${BASE_VERS}
BUILDLINK_DEPENDS.tcl-postgresql73?= tcl-postgresql73>=${BASE_VERS}
-USE_TOOLS+= gmake
+USE_TOOLS+= autoconf gmake
GNU_CONFIGURE= YES
PKG_SYSCONFSUBDIR= postgresql
@@ -90,6 +90,4 @@ post-extract:
fi
pre-configure:
- cd ${WRKSRC} && ${AUTOCONF}
-
-.include "../../mk/autoconf.mk"
+ cd ${WRKSRC} && autoconf