[pkgsrc/trunk]: pkgsrc/databases Bl3ify.

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/380c3ec889ce
branches:  trunk
changeset: 473650:380c3ec889ce
user:      seb <seb%pkgsrc.org@localhost>
date:      Thu Apr 22 14:31:35 2004 +0000

description:
Bl3ify.
Provide a buildlink3.mk file for mysql4-client package.
While here remove obsolete USE_NEW_TEXINFO.

diffstat:

 databases/mysql4-client/Makefile        |   7 +++----
 databases/mysql4-client/Makefile.common |   8 ++++----
 databases/mysql4-client/buildlink3.mk   |  24 ++++++++++++++++++++++++
 databases/mysql4-server/Makefile        |  10 +++++-----
 4 files changed, 36 insertions(+), 13 deletions(-)

diffs (112 lines):

diff -r 99ee55cb3c1d -r 380c3ec889ce databases/mysql4-client/Makefile
--- a/databases/mysql4-client/Makefile  Thu Apr 22 13:11:58 2004 +0000
+++ b/databases/mysql4-client/Makefile  Thu Apr 22 14:31:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/03/26 02:27:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/22 14:31:35 seb Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-client-/}
 PKGREVISION=           1
@@ -10,9 +10,8 @@
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=       --without-server
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 
-USE_NEW_TEXINFO=       YES
 INFO_FILES=            mysql.info
 
 post-install:
@@ -21,5 +20,5 @@
        cd ${PREFIX}/share/mysql && ${RM} -f mysql.server
        ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 99ee55cb3c1d -r 380c3ec889ce databases/mysql4-client/Makefile.common
--- a/databases/mysql4-client/Makefile.common   Thu Apr 22 13:11:58 2004 +0000
+++ b/databases/mysql4-client/Makefile.common   Thu Apr 22 14:31:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2004/03/23 04:34:17 snj Exp $
+# $NetBSD: Makefile.common,v 1.7 2004/04/22 14:31:35 seb Exp $
 
 DISTNAME=              mysql-4.0.18
 CATEGORIES=            databases
@@ -27,7 +27,7 @@
 MYSQL_CHARSET?=                latin1
 MYSQL_EXTRA_CHARSET?=  all
 
-USE_BUILDLINK2=                # defined
+USE_BUILDLINK3=                YES
 GNU_CONFIGURE=         # defined
 CONFIGURE_ARGS+=       --localstatedir=${MYSQL_DATADIR}
 CONFIGURE_ARGS+=       --with-named-z-libs=z
@@ -87,5 +87,5 @@
                ${RM} $${file}.orig;                                    \
        done
 
-.include "../../security/openssl/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
diff -r 99ee55cb3c1d -r 380c3ec889ce databases/mysql4-client/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql4-client/buildlink3.mk     Thu Apr 22 14:31:35 2004 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/22 14:31:35 seb Exp $
+
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
+MYSQL_CLIENT_BUILDLINK3_MK:=   ${MYSQL_CLIENT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    mysql-client
+.endif
+
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nmysql-client}
+BUILDLINK_PACKAGES+=   mysql-client
+
+.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.mysql-client+=       mysql-client>=4.0.18nb1
+BUILDLINK_RECOMMENDED.mysql-client?=   mysql-client>=4.0.18nb1
+BUILDLINK_PKGSRCDIR.mysql-client?=     ../../databases/mysql4-client
+BUILDLINK_LIBDIRS.mysql-client?=       lib/mysql
+.endif # MYSQL_CLIENT_BUILDLINK3_MK
+
+.include "../../devel/readline/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 99ee55cb3c1d -r 380c3ec889ce databases/mysql4-server/Makefile
--- a/databases/mysql4-server/Makefile  Thu Apr 22 13:11:58 2004 +0000
+++ b/databases/mysql4-server/Makefile  Thu Apr 22 14:31:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/26 02:27:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/22 14:31:35 seb Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
 PKGREVISION=           2
@@ -11,7 +11,7 @@
 CONFIGURE_ARGS+=       --with-raid
 CONFIGURE_ARGS+=       --without-berkeley-db
 CONFIGURE_ARGS+=       --without-mysqlfs
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
 
 INSTALL_EXTRA_TMPL+=   ${.CURDIR}/INSTALL
@@ -50,9 +50,9 @@
        PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
        ${CHOWN} -R ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_DATADIR}
 
-.include "../../databases/mysql4-client/buildlink2.mk"
-.include "../../security/tcp_wrappers/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../databases/mysql4-client/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
 CFLAGS+=       -DSIGNALS_DONT_BREAK_READ