diff options
Diffstat (limited to 'databases/mysql-client')
| -rw-r--r-- | databases/mysql-client/Makefile | 9 | ||||
| -rw-r--r-- | databases/mysql-client/Makefile.common | 20 | ||||
| -rw-r--r-- | databases/mysql-client/PLIST | 8 |
3 files changed, 23 insertions, 14 deletions
diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile index 13c5e18d2dc..802192f6589 100644 --- a/databases/mysql-client/Makefile +++ b/databases/mysql-client/Makefile @@ -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 @@ INFO_FILES= mysql.info 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 --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index 33acb56cedb..53353f97906 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -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 @@ HOMEPAGE= http://www.mysql.com/ 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_DATADIR?= ${VARBASE}/mysql 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 @@ CFLAGS+= -DHAVE_CURSES_H 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 @@ CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no 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_STAGE.scripts= post-extract 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 --git a/databases/mysql-client/PLIST b/databases/mysql-client/PLIST index d3878b596b5..c03b8af7c69 100644 --- a/databases/mysql-client/PLIST +++ b/databases/mysql-client/PLIST @@ -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/mysqlaccess.1 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 |