pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases * Install my-{huge,large,innodb-heavy-4G,sma...
details: https://anonhg.NetBSD.org/pkgsrc/rev/072135bcb711
branches: trunk
changeset: 484041:072135bcb711
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Tue Nov 23 16:07:01 2004 +0000
description:
* Install my-{huge,large,innodb-heavy-4G,small,medium}.cnf example files.
* Use PTHREAD_AUTO_VARS=no to disable linking to libpthread all programs
and libraries, which is wrong.
* Set USE_LIBTOOL and GNU_CONFIGURE before including bsd.prefs.mk, so
the test for _OPSYS_MAX_CMDLEN is not skipped.
Bump PKGREVISION to each package respectively
(mysql-client and mysql4-client), closes PR pkg/28162 and PR pkg/28222.
diffstat:
databases/mysql-client/Makefile | 9 +++++++--
databases/mysql-client/Makefile.common | 20 +++++++++-----------
databases/mysql-client/PLIST | 8 +++++++-
databases/mysql4-client/Makefile | 11 +++++++----
databases/mysql4-client/Makefile.common | 20 +++++++++-----------
databases/mysql4-client/PLIST | 8 +++++++-
6 files changed, 46 insertions(+), 30 deletions(-)
diffs (234 lines):
diff -r d7bcbd18c98c -r 072135bcb711 databases/mysql-client/Makefile
--- a/databases/mysql-client/Makefile Tue Nov 23 16:05:04 2004 +0000
+++ b/databases/mysql-client/Makefile Tue Nov 23 16:07:01 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2004/11/16 18:01:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.38 2004/11/23 16:07:01 xtraeme Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
SVR4_PKGNAME= mysqc
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= MySQL 4, a free SQL database (client)
CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*}
@@ -19,6 +19,11 @@
post-install:
${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mysql
+.for f in huge large innodb-heavy-4G small medium
+ ${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \
+ ${PREFIX}/share/examples/mysql/my-${f}.cnf
+.endfor
.include "../../devel/readline/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d7bcbd18c98c -r 072135bcb711 databases/mysql-client/Makefile.common
--- a/databases/mysql-client/Makefile.common Tue Nov 23 16:05:04 2004 +0000
+++ b/databases/mysql-client/Makefile.common Tue Nov 23 16:07:01 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2004/11/16 18:55:13 tron Exp $
+# $NetBSD: Makefile.common,v 1.35 2004/11/23 16:07:02 xtraeme Exp $
DISTNAME= mysql-4.0.22
CATEGORIES= databases
@@ -11,6 +11,10 @@
EXTRACT_USING_PAX= # defined
+USE_BUILDLINK3= yes
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+
.include "../../mk/bsd.prefs.mk"
# MYSQL_USER username of the database administrator
@@ -27,8 +31,6 @@
MYSQL_CHARSET?= latin1
MYSQL_EXTRA_CHARSET?= all
-USE_BUILDLINK3= yes
-GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR}
CONFIGURE_ARGS+= --with-named-z-libs=z
CONFIGURE_ARGS+= --without-libwrap
@@ -70,6 +72,8 @@
CXXFLAGS+= -DHAVE_CURSES_H
.endif
+PTHREAD_AUTO_VARS= no
+
.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
@@ -81,11 +85,10 @@
USE_LANGUAGES= c c++
USE_GNU_TOOLS+= make
-USE_PERL5= # defined
-USE_LIBTOOL= # defined
+USE_PERL5= yes
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
-SUBST_CLASSES+= mk scripts thr
+SUBST_CLASSES+= mk scripts
SUBST_STAGE.mk= post-extract
SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in isam/Makefile.in \
merge/Makefile.in mysys/Makefile.in \
@@ -96,11 +99,6 @@
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"
diff -r d7bcbd18c98c -r 072135bcb711 databases/mysql-client/PLIST
--- a/databases/mysql-client/PLIST Tue Nov 23 16:05:04 2004 +0000
+++ b/databases/mysql-client/PLIST Tue Nov 23 16:07:01 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2004/11/09 06:11:48 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.14 2004/11/23 16:07:02 xtraeme Exp $
bin/msql2mysql
bin/mysql
bin/mysql_config
@@ -55,8 +55,14 @@
man/man1/mysqladmin.1
man/man1/mysqldump.1
man/man1/mysqlshow.1
+share/examples/mysql/my-huge.cnf
+share/examples/mysql/my-innodb-heavy-4G.cnf
+share/examples/mysql/my-large.cnf
+share/examples/mysql/my-medium.cnf
+share/examples/mysql/my-small.cnf
share/mysql/make_binary_distribution
share/mysql/make_sharedlib_distribution
@dirrm share/mysql
@dirrm lib/mysql
+@dirrm share/examples/mysql
@dirrm include/mysql
diff -r d7bcbd18c98c -r 072135bcb711 databases/mysql4-client/Makefile
--- a/databases/mysql4-client/Makefile Tue Nov 23 16:05:04 2004 +0000
+++ b/databases/mysql4-client/Makefile Tue Nov 23 16:07:01 2004 +0000
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.14 2004/11/16 18:01:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2004/11/23 16:07:02 xtraeme Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
-PKGREVISION= 4
+PKGREVISION= 5
SVR4_PKGNAME= mysqc
COMMENT= MySQL 4, a free SQL database (client)
CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*}
-USE_BUILDLINK3= yes
-
.include "Makefile.common"
CONFIGURE_ARGS+= --without-extra-tools
@@ -20,6 +18,11 @@
post-install:
${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mysql
+.for f in huge large innodb-heavy-4G small medium
+ ${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \
+ ${PREFIX}/share/examples/mysql/my-${f}.cnf
+.endfor
.include "../../devel/readline/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d7bcbd18c98c -r 072135bcb711 databases/mysql4-client/Makefile.common
--- a/databases/mysql4-client/Makefile.common Tue Nov 23 16:05:04 2004 +0000
+++ b/databases/mysql4-client/Makefile.common Tue Nov 23 16:07:01 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2004/11/16 18:56:29 tron Exp $
+# $NetBSD: Makefile.common,v 1.25 2004/11/23 16:07:02 xtraeme Exp $
DISTNAME= mysql-4.1.7
CATEGORIES= databases
@@ -11,6 +11,10 @@
EXTRACT_USING_PAX= # defined
+USE_BUILDLINK3= yes
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+
.include "../../mk/bsd.prefs.mk"
# MYSQL_USER username of the database administrator
@@ -27,8 +31,6 @@
MYSQL_CHARSET?= latin1
MYSQL_EXTRA_CHARSET?= all
-USE_BUILDLINK3= yes
-GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR}
CONFIGURE_ARGS+= --with-named-z-libs=z
CONFIGURE_ARGS+= --without-libwrap
@@ -70,6 +72,8 @@
CXXFLAGS+= -DHAVE_CURSES_H
.endif
+PTHREAD_AUTO_VARS= no
+
.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
@@ -81,11 +85,10 @@
USE_LANGUAGES= c c++
USE_GNU_TOOLS+= make
-USE_PERL5= # defined
-USE_LIBTOOL= # defined
+USE_PERL5= yes
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
-SUBST_CLASSES+= mk scripts thr
+SUBST_CLASSES+= mk scripts
SUBST_STAGE.mk= post-extract
SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in isam/Makefile.in \
merge/Makefile.in mysys/Makefile.in \
@@ -96,11 +99,6 @@
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"
diff -r d7bcbd18c98c -r 072135bcb711 databases/mysql4-client/PLIST
--- a/databases/mysql4-client/PLIST Tue Nov 23 16:05:04 2004 +0000
+++ b/databases/mysql4-client/PLIST Tue Nov 23 16:07:01 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/11/08 18:19:41 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/11/23 16:07:02 xtraeme Exp $
bin/msql2mysql
bin/mysql
bin/mysql_config
@@ -62,8 +62,14 @@
man/man1/mysqladmin.1
man/man1/mysqldump.1
man/man1/mysqlshow.1
+share/examples/mysql/my-huge.cnf
+share/examples/mysql/my-innodb-heavy-4G.cnf
+share/examples/mysql/my-large.cnf
+share/examples/mysql/my-medium.cnf
+share/examples/mysql/my-small.cnf
share/mysql/fill_help_tables.sql
share/mysql/mysql_fix_privilege_tables.sql
@dirrm share/mysql
@dirrm lib/mysql
+@dirrm share/examples/mysql
@dirrm include/mysql
Home |
Main Index |
Thread Index |
Old Index