pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/databases/mysql-client Use subst.mk for last tron@'s c...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/67828a35065c
branches:  trunk
changeset: 483646:67828a35065c
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Nov 16 18:01:11 2004 +0000

description:
Use subst.mk for last tron@'s changes, no functional changes.

diffstat:

 databases/mysql-client/Makefile        |  8 +-------
 databases/mysql-client/Makefile.common |  7 ++++++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diffs (43 lines):

diff -r cdf58c605911 -r 67828a35065c databases/mysql-client/Makefile
--- a/databases/mysql-client/Makefile   Tue Nov 16 17:30:04 2004 +0000
+++ b/databases/mysql-client/Makefile   Tue Nov 16 18:01:11 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2004/11/16 17:29:36 tron Exp $
+# $NetBSD: Makefile,v 1.37 2004/11/16 18:01:11 xtraeme Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-client-/}
 SVR4_PKGNAME=          mysqc
@@ -17,12 +17,6 @@
 
 INFO_FILES=            mysql.info
 
-post-configure:
-       ${SED} -e 's#${PTHREAD_CFLAGS}##g' -e 's#${PTHREAD_LDFLAGS}##g' \
-          -e 's#${PTHREAD_LIBS}##g' ${WRKSRC}/libmysql/Makefile \
-          >${WRKSRC}/libmysql/Makefile.new
-       ${MV} ${WRKSRC}/libmysql/Makefile.new ${WRKSRC}/libmysql/Makefile
-
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 
diff -r cdf58c605911 -r 67828a35065c databases/mysql-client/Makefile.common
--- a/databases/mysql-client/Makefile.common    Tue Nov 16 17:30:04 2004 +0000
+++ b/databases/mysql-client/Makefile.common    Tue Nov 16 18:01:11 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2004/11/16 17:29:36 tron Exp $
+# $NetBSD: Makefile.common,v 1.32 2004/11/16 18:01:11 xtraeme Exp $
 
 DISTNAME=              mysql-4.0.22
 CATEGORIES=            databases
@@ -102,6 +102,11 @@
 SUBST_FILES.scripts=   scripts/mysql_install_db.sh scripts/mysqld_safe.sh
 SUBST_SED.scripts=     -e "s,chown,${CHOWN},g"
 SUBST_MESSAGE.scripts= "Fixing scripts."
+SUBST_STAGE.thr=       post-configure
+SUBST_FILES.thr=       libmysql/Makefile
+SUBST_SED.thr=         -e "s,${PTHREAD_CFLAGS},,g"     \
+                       -e "s,${PTHREAD_LDFLAGS},,g"    \
+                       -e "s,${PTHREAD_LIBS},,g"
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"



Home | Main Index | Thread Index | Old Index