diff options
70 files changed, 900 insertions, 430 deletions
diff --git a/databases/mysql322-client/Makefile b/databases/mysql322-client/Makefile new file mode 100644 index 00000000000..d6c33fa0022 --- /dev/null +++ b/databases/mysql322-client/Makefile @@ -0,0 +1,17 @@ +# ports collection makefile for: MySQL-client +# Version required: v3.22.x +# Date created: Thu Jun 24 00:12:22 CEST 1999 +# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# +# $Id$ +# + +PKGNAME= ${DISTNAME:S/-/-client-/g} + +MASTERDIR= ${.CURDIR}/../mysql322 +COMMENT= ${PKGDIR}/COMMENT.client +PLIST= ${PKGDIR}/PLIST.client + +CLIENT_ONLY= yes + +.include "${MASTERDIR}/Makefile" diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile index 108782feabd..8e7bbe5ed1a 100644 --- a/databases/mysql322-server/Makefile +++ b/databases/mysql322-server/Makefile @@ -1,12 +1,13 @@ -# ports collection makefile for: MySQL -# Version required: v3.22.23b +# ports collection makefile for: MySQL-server +# Version required: v3.22.x # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.55 1999/06/22 17:01:39 steve Exp $ +# $Id: Makefile,v 1.56 1999/06/23 21:29:27 billf Exp $ # DISTNAME= mysql-3.22.23b +PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.22/ \ @@ -22,8 +23,6 @@ BROKEN= doesn\'t build on the alpha yet Y2K= http://www.tcx.se/Manual_chapter/manual_Introduction.html#Year_2000_compliance -MAN1= mysql.1 - USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ @@ -37,6 +36,9 @@ CONFIGURE_ENV+= PERL=${PERL} \ CXXFLAGS="${CFLAGS}" \ CONFIGURE_ARGS="${CONFIGURE_ARGS}" +.if !defined(CLIENT_ONLY) +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client + .include <bsd.port.pre.mk> .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -70,24 +72,21 @@ pre-fetch: pre-install: .if !defined(PACKAGE_BUILDING) - @ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version + @${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version .endif post-install: - ${MKDIR} ${PREFIX}/share/mysql/mysql .if !defined(PACKAGE_BUILDING) ${PREFIX}/bin/mysql_install_db .endif - @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh - @ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mysql @@ -98,6 +97,20 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif +.include <bsd.port.post.mk> +.else +MAN1= mysql.1 + +CONFIGURE_ARGS+=--without-server +MAKE_ENV= CLIENT_ONLY="${CLIENT_ONLY}" + +post-install: + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-client.sh + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql -.include <bsd.port.post.mk> +.include <bsd.port.mk> +.endif diff --git a/databases/mysql322-server/files/patch-an b/databases/mysql322-server/files/patch-an new file mode 100644 index 00000000000..ca368054999 --- /dev/null +++ b/databases/mysql322-server/files/patch-an @@ -0,0 +1,16 @@ +--- Makefile.in.orig Sun Jun 6 04:51:50 1999 ++++ Makefile.in Sat Jun 26 08:53:51 1999 +@@ -141,8 +141,11 @@ + # These are built from source in the Docs directory + EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS + +-SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts include tests man @bench_dirs@ support-files +- ++.if defined(CLIENT_ONLY) ++SUBDIRS = @readline_dir@ client include tests man ++.else ++SUBDIRS = @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files ++.endif + + # Relink after clean + CLEANFILES = linked_client_sources diff --git a/databases/mysql322-server/pkg-comment b/databases/mysql322-server/pkg-comment index 3e40b96ed1a..a8f0f7a5e83 100644 --- a/databases/mysql322-server/pkg-comment +++ b/databases/mysql322-server/pkg-comment @@ -1 +1 @@ -A multithreaded SQL database +a multithreaded SQL database (server) diff --git a/databases/mysql322-server/pkg-comment.client b/databases/mysql322-server/pkg-comment.client new file mode 100644 index 00000000000..3af4339ad74 --- /dev/null +++ b/databases/mysql322-server/pkg-comment.client @@ -0,0 +1 @@ +a multithreaded SQL database (client) diff --git a/databases/mysql322-server/pkg-plist b/databases/mysql322-server/pkg-plist index 9a57fde27ae..ad8ec6d06dd 100644 --- a/databases/mysql322-server/pkg-plist +++ b/databases/mysql322-server/pkg-plist @@ -2,41 +2,23 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql -bin/mysql bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission bin/mysql_zap bin/mysqlaccess -bin/mysqladmin bin/mysqlbug -bin/mysqldump -bin/mysqlimport -bin/mysqlshow bin/perror bin/replace bin/resolveip bin/safe_mysqld -etc/rc.d/mysql.sh -include/mysql/dbug.h -include/mysql/errmsg.h -include/mysql/m_ctype.h.in -include/mysql/m_string.h -include/mysql/my_list.h -include/mysql/my_sys.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -include/mysql/mysqld_error.h +etc/rc.d/mysql-server.sh @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.6 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -87,8 +69,6 @@ share/mysql/spanish/errmsg.sys share/mysql/spanish/errmsg.txt share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt -@dirrm include/mysql -@dirrm lib/mysql @dirrm share/doc/mysql @dirrm share/mysql/czech @dirrm share/mysql/dutch @@ -99,7 +79,6 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/italian @dirrm share/mysql/japanese @dirrm share/mysql/korean -@dirrm share/mysql/mysql @dirrm share/mysql/norwegian @dirrm share/mysql/norwegian-ny @dirrm share/mysql/polish @@ -111,5 +90,3 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql322-server/pkg-plist.client b/databases/mysql322-server/pkg-plist.client new file mode 100644 index 00000000000..b293ad704aa --- /dev/null +++ b/databases/mysql322-server/pkg-plist.client @@ -0,0 +1,23 @@ +bin/mysql +bin/mysqladmin +bin/mysqldump +bin/mysqlimport +bin/mysqlshow +etc/rc.d/mysql-client.sh +include/mysql/dbug.h +include/mysql/errmsg.h +include/mysql/m_ctype.h.in +include/mysql/m_string.h +include/mysql/my_list.h +include/mysql/my_sys.h +include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h +include/mysql/mysqld_error.h +lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient.so.6 +@dirrm include/mysql +@dirrm lib/mysql +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile new file mode 100644 index 00000000000..d6c33fa0022 --- /dev/null +++ b/databases/mysql323-client/Makefile @@ -0,0 +1,17 @@ +# ports collection makefile for: MySQL-client +# Version required: v3.22.x +# Date created: Thu Jun 24 00:12:22 CEST 1999 +# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# +# $Id$ +# + +PKGNAME= ${DISTNAME:S/-/-client-/g} + +MASTERDIR= ${.CURDIR}/../mysql322 +COMMENT= ${PKGDIR}/COMMENT.client +PLIST= ${PKGDIR}/PLIST.client + +CLIENT_ONLY= yes + +.include "${MASTERDIR}/Makefile" diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index 108782feabd..8e7bbe5ed1a 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -1,12 +1,13 @@ -# ports collection makefile for: MySQL -# Version required: v3.22.23b +# ports collection makefile for: MySQL-server +# Version required: v3.22.x # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.55 1999/06/22 17:01:39 steve Exp $ +# $Id: Makefile,v 1.56 1999/06/23 21:29:27 billf Exp $ # DISTNAME= mysql-3.22.23b +PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.22/ \ @@ -22,8 +23,6 @@ BROKEN= doesn\'t build on the alpha yet Y2K= http://www.tcx.se/Manual_chapter/manual_Introduction.html#Year_2000_compliance -MAN1= mysql.1 - USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ @@ -37,6 +36,9 @@ CONFIGURE_ENV+= PERL=${PERL} \ CXXFLAGS="${CFLAGS}" \ CONFIGURE_ARGS="${CONFIGURE_ARGS}" +.if !defined(CLIENT_ONLY) +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client + .include <bsd.port.pre.mk> .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -70,24 +72,21 @@ pre-fetch: pre-install: .if !defined(PACKAGE_BUILDING) - @ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version + @${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version .endif post-install: - ${MKDIR} ${PREFIX}/share/mysql/mysql .if !defined(PACKAGE_BUILDING) ${PREFIX}/bin/mysql_install_db .endif - @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh - @ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mysql @@ -98,6 +97,20 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif +.include <bsd.port.post.mk> +.else +MAN1= mysql.1 + +CONFIGURE_ARGS+=--without-server +MAKE_ENV= CLIENT_ONLY="${CLIENT_ONLY}" + +post-install: + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-client.sh + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql -.include <bsd.port.post.mk> +.include <bsd.port.mk> +.endif diff --git a/databases/mysql323-server/files/patch-an b/databases/mysql323-server/files/patch-an new file mode 100644 index 00000000000..ca368054999 --- /dev/null +++ b/databases/mysql323-server/files/patch-an @@ -0,0 +1,16 @@ +--- Makefile.in.orig Sun Jun 6 04:51:50 1999 ++++ Makefile.in Sat Jun 26 08:53:51 1999 +@@ -141,8 +141,11 @@ + # These are built from source in the Docs directory + EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS + +-SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts include tests man @bench_dirs@ support-files +- ++.if defined(CLIENT_ONLY) ++SUBDIRS = @readline_dir@ client include tests man ++.else ++SUBDIRS = @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files ++.endif + + # Relink after clean + CLEANFILES = linked_client_sources diff --git a/databases/mysql323-server/pkg-comment b/databases/mysql323-server/pkg-comment index 3e40b96ed1a..a8f0f7a5e83 100644 --- a/databases/mysql323-server/pkg-comment +++ b/databases/mysql323-server/pkg-comment @@ -1 +1 @@ -A multithreaded SQL database +a multithreaded SQL database (server) diff --git a/databases/mysql323-server/pkg-comment.client b/databases/mysql323-server/pkg-comment.client new file mode 100644 index 00000000000..3af4339ad74 --- /dev/null +++ b/databases/mysql323-server/pkg-comment.client @@ -0,0 +1 @@ +a multithreaded SQL database (client) diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist index 9a57fde27ae..ad8ec6d06dd 100644 --- a/databases/mysql323-server/pkg-plist +++ b/databases/mysql323-server/pkg-plist @@ -2,41 +2,23 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql -bin/mysql bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission bin/mysql_zap bin/mysqlaccess -bin/mysqladmin bin/mysqlbug -bin/mysqldump -bin/mysqlimport -bin/mysqlshow bin/perror bin/replace bin/resolveip bin/safe_mysqld -etc/rc.d/mysql.sh -include/mysql/dbug.h -include/mysql/errmsg.h -include/mysql/m_ctype.h.in -include/mysql/m_string.h -include/mysql/my_list.h -include/mysql/my_sys.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -include/mysql/mysqld_error.h +etc/rc.d/mysql-server.sh @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.6 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -87,8 +69,6 @@ share/mysql/spanish/errmsg.sys share/mysql/spanish/errmsg.txt share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt -@dirrm include/mysql -@dirrm lib/mysql @dirrm share/doc/mysql @dirrm share/mysql/czech @dirrm share/mysql/dutch @@ -99,7 +79,6 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/italian @dirrm share/mysql/japanese @dirrm share/mysql/korean -@dirrm share/mysql/mysql @dirrm share/mysql/norwegian @dirrm share/mysql/norwegian-ny @dirrm share/mysql/polish @@ -111,5 +90,3 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql323-server/pkg-plist.client b/databases/mysql323-server/pkg-plist.client new file mode 100644 index 00000000000..b293ad704aa --- /dev/null +++ b/databases/mysql323-server/pkg-plist.client @@ -0,0 +1,23 @@ +bin/mysql +bin/mysqladmin +bin/mysqldump +bin/mysqlimport +bin/mysqlshow +etc/rc.d/mysql-client.sh +include/mysql/dbug.h +include/mysql/errmsg.h +include/mysql/m_ctype.h.in +include/mysql/m_string.h +include/mysql/my_list.h +include/mysql/my_sys.h +include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h +include/mysql/mysqld_error.h +lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient.so.6 +@dirrm include/mysql +@dirrm lib/mysql +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile new file mode 100644 index 00000000000..d6c33fa0022 --- /dev/null +++ b/databases/mysql40-client/Makefile @@ -0,0 +1,17 @@ +# ports collection makefile for: MySQL-client +# Version required: v3.22.x +# Date created: Thu Jun 24 00:12:22 CEST 1999 +# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# +# $Id$ +# + +PKGNAME= ${DISTNAME:S/-/-client-/g} + +MASTERDIR= ${.CURDIR}/../mysql322 +COMMENT= ${PKGDIR}/COMMENT.client +PLIST= ${PKGDIR}/PLIST.client + +CLIENT_ONLY= yes + +.include "${MASTERDIR}/Makefile" diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index 108782feabd..8e7bbe5ed1a 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -1,12 +1,13 @@ -# ports collection makefile for: MySQL -# Version required: v3.22.23b +# ports collection makefile for: MySQL-server +# Version required: v3.22.x # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.55 1999/06/22 17:01:39 steve Exp $ +# $Id: Makefile,v 1.56 1999/06/23 21:29:27 billf Exp $ # DISTNAME= mysql-3.22.23b +PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.22/ \ @@ -22,8 +23,6 @@ BROKEN= doesn\'t build on the alpha yet Y2K= http://www.tcx.se/Manual_chapter/manual_Introduction.html#Year_2000_compliance -MAN1= mysql.1 - USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ @@ -37,6 +36,9 @@ CONFIGURE_ENV+= PERL=${PERL} \ CXXFLAGS="${CFLAGS}" \ CONFIGURE_ARGS="${CONFIGURE_ARGS}" +.if !defined(CLIENT_ONLY) +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client + .include <bsd.port.pre.mk> .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -70,24 +72,21 @@ pre-fetch: pre-install: .if !defined(PACKAGE_BUILDING) - @ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version + @${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version .endif post-install: - ${MKDIR} ${PREFIX}/share/mysql/mysql .if !defined(PACKAGE_BUILDING) ${PREFIX}/bin/mysql_install_db .endif - @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh - @ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mysql @@ -98,6 +97,20 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif +.include <bsd.port.post.mk> +.else +MAN1= mysql.1 + +CONFIGURE_ARGS+=--without-server +MAKE_ENV= CLIENT_ONLY="${CLIENT_ONLY}" + +post-install: + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-client.sh + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql -.include <bsd.port.post.mk> +.include <bsd.port.mk> +.endif diff --git a/databases/mysql40-server/files/patch-Makefile.in b/databases/mysql40-server/files/patch-Makefile.in new file mode 100644 index 00000000000..ca368054999 --- /dev/null +++ b/databases/mysql40-server/files/patch-Makefile.in @@ -0,0 +1,16 @@ +--- Makefile.in.orig Sun Jun 6 04:51:50 1999 ++++ Makefile.in Sat Jun 26 08:53:51 1999 +@@ -141,8 +141,11 @@ + # These are built from source in the Docs directory + EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS + +-SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts include tests man @bench_dirs@ support-files +- ++.if defined(CLIENT_ONLY) ++SUBDIRS = @readline_dir@ client include tests man ++.else ++SUBDIRS = @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files ++.endif + + # Relink after clean + CLEANFILES = linked_client_sources diff --git a/databases/mysql40-server/pkg-comment b/databases/mysql40-server/pkg-comment index 3e40b96ed1a..a8f0f7a5e83 100644 --- a/databases/mysql40-server/pkg-comment +++ b/databases/mysql40-server/pkg-comment @@ -1 +1 @@ -A multithreaded SQL database +a multithreaded SQL database (server) diff --git a/databases/mysql40-server/pkg-comment.client b/databases/mysql40-server/pkg-comment.client new file mode 100644 index 00000000000..3af4339ad74 --- /dev/null +++ b/databases/mysql40-server/pkg-comment.client @@ -0,0 +1 @@ +a multithreaded SQL database (client) diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist index 9a57fde27ae..ad8ec6d06dd 100644 --- a/databases/mysql40-server/pkg-plist +++ b/databases/mysql40-server/pkg-plist @@ -2,41 +2,23 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql -bin/mysql bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission bin/mysql_zap bin/mysqlaccess -bin/mysqladmin bin/mysqlbug -bin/mysqldump -bin/mysqlimport -bin/mysqlshow bin/perror bin/replace bin/resolveip bin/safe_mysqld -etc/rc.d/mysql.sh -include/mysql/dbug.h -include/mysql/errmsg.h -include/mysql/m_ctype.h.in -include/mysql/m_string.h -include/mysql/my_list.h -include/mysql/my_sys.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -include/mysql/mysqld_error.h +etc/rc.d/mysql-server.sh @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.6 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -87,8 +69,6 @@ share/mysql/spanish/errmsg.sys share/mysql/spanish/errmsg.txt share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt -@dirrm include/mysql -@dirrm lib/mysql @dirrm share/doc/mysql @dirrm share/mysql/czech @dirrm share/mysql/dutch @@ -99,7 +79,6 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/italian @dirrm share/mysql/japanese @dirrm share/mysql/korean -@dirrm share/mysql/mysql @dirrm share/mysql/norwegian @dirrm share/mysql/norwegian-ny @dirrm share/mysql/polish @@ -111,5 +90,3 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql40-server/pkg-plist.client b/databases/mysql40-server/pkg-plist.client new file mode 100644 index 00000000000..b293ad704aa --- /dev/null +++ b/databases/mysql40-server/pkg-plist.client @@ -0,0 +1,23 @@ +bin/mysql +bin/mysqladmin +bin/mysqldump +bin/mysqlimport +bin/mysqlshow +etc/rc.d/mysql-client.sh +include/mysql/dbug.h +include/mysql/errmsg.h +include/mysql/m_ctype.h.in +include/mysql/m_string.h +include/mysql/my_list.h +include/mysql/my_sys.h +include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h +include/mysql/mysqld_error.h +lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient.so.6 +@dirrm include/mysql +@dirrm lib/mysql +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile new file mode 100644 index 00000000000..d6c33fa0022 --- /dev/null +++ b/databases/mysql41-client/Makefile @@ -0,0 +1,17 @@ +# ports collection makefile for: MySQL-client +# Version required: v3.22.x +# Date created: Thu Jun 24 00:12:22 CEST 1999 +# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# +# $Id$ +# + +PKGNAME= ${DISTNAME:S/-/-client-/g} + +MASTERDIR= ${.CURDIR}/../mysql322 +COMMENT= ${PKGDIR}/COMMENT.client +PLIST= ${PKGDIR}/PLIST.client + +CLIENT_ONLY= yes + +.include "${MASTERDIR}/Makefile" diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index 108782feabd..8e7bbe5ed1a 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -1,12 +1,13 @@ -# ports collection makefile for: MySQL -# Version required: v3.22.23b +# ports collection makefile for: MySQL-server +# Version required: v3.22.x # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.55 1999/06/22 17:01:39 steve Exp $ +# $Id: Makefile,v 1.56 1999/06/23 21:29:27 billf Exp $ # DISTNAME= mysql-3.22.23b +PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.22/ \ @@ -22,8 +23,6 @@ BROKEN= doesn\'t build on the alpha yet Y2K= http://www.tcx.se/Manual_chapter/manual_Introduction.html#Year_2000_compliance -MAN1= mysql.1 - USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ @@ -37,6 +36,9 @@ CONFIGURE_ENV+= PERL=${PERL} \ CXXFLAGS="${CFLAGS}" \ CONFIGURE_ARGS="${CONFIGURE_ARGS}" +.if !defined(CLIENT_ONLY) +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client + .include <bsd.port.pre.mk> .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -70,24 +72,21 @@ pre-fetch: pre-install: .if !defined(PACKAGE_BUILDING) - @ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version + @${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version .endif post-install: - ${MKDIR} ${PREFIX}/share/mysql/mysql .if !defined(PACKAGE_BUILDING) ${PREFIX}/bin/mysql_install_db .endif - @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh - @ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mysql @@ -98,6 +97,20 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif +.include <bsd.port.post.mk> +.else +MAN1= mysql.1 + +CONFIGURE_ARGS+=--without-server +MAKE_ENV= CLIENT_ONLY="${CLIENT_ONLY}" + +post-install: + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-client.sh + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql -.include <bsd.port.post.mk> +.include <bsd.port.mk> +.endif diff --git a/databases/mysql41-server/files/patch-Makefile.in b/databases/mysql41-server/files/patch-Makefile.in new file mode 100644 index 00000000000..ca368054999 --- /dev/null +++ b/databases/mysql41-server/files/patch-Makefile.in @@ -0,0 +1,16 @@ +--- Makefile.in.orig Sun Jun 6 04:51:50 1999 ++++ Makefile.in Sat Jun 26 08:53:51 1999 +@@ -141,8 +141,11 @@ + # These are built from source in the Docs directory + EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS + +-SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts include tests man @bench_dirs@ support-files +- ++.if defined(CLIENT_ONLY) ++SUBDIRS = @readline_dir@ client include tests man ++.else ++SUBDIRS = @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files ++.endif + + # Relink after clean + CLEANFILES = linked_client_sources diff --git a/databases/mysql41-server/pkg-comment b/databases/mysql41-server/pkg-comment index 3e40b96ed1a..a8f0f7a5e83 100644 --- a/databases/mysql41-server/pkg-comment +++ b/databases/mysql41-server/pkg-comment @@ -1 +1 @@ -A multithreaded SQL database +a multithreaded SQL database (server) diff --git a/databases/mysql41-server/pkg-comment.client b/databases/mysql41-server/pkg-comment.client new file mode 100644 index 00000000000..3af4339ad74 --- /dev/null +++ b/databases/mysql41-server/pkg-comment.client @@ -0,0 +1 @@ +a multithreaded SQL database (client) diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist index 9a57fde27ae..ad8ec6d06dd 100644 --- a/databases/mysql41-server/pkg-plist +++ b/databases/mysql41-server/pkg-plist @@ -2,41 +2,23 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql -bin/mysql bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission bin/mysql_zap bin/mysqlaccess -bin/mysqladmin bin/mysqlbug -bin/mysqldump -bin/mysqlimport -bin/mysqlshow bin/perror bin/replace bin/resolveip bin/safe_mysqld -etc/rc.d/mysql.sh -include/mysql/dbug.h -include/mysql/errmsg.h -include/mysql/m_ctype.h.in -include/mysql/m_string.h -include/mysql/my_list.h -include/mysql/my_sys.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -include/mysql/mysqld_error.h +etc/rc.d/mysql-server.sh @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.6 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -87,8 +69,6 @@ share/mysql/spanish/errmsg.sys share/mysql/spanish/errmsg.txt share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt -@dirrm include/mysql -@dirrm lib/mysql @dirrm share/doc/mysql @dirrm share/mysql/czech @dirrm share/mysql/dutch @@ -99,7 +79,6 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/italian @dirrm share/mysql/japanese @dirrm share/mysql/korean -@dirrm share/mysql/mysql @dirrm share/mysql/norwegian @dirrm share/mysql/norwegian-ny @dirrm share/mysql/polish @@ -111,5 +90,3 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql41-server/pkg-plist.client b/databases/mysql41-server/pkg-plist.client new file mode 100644 index 00000000000..b293ad704aa --- /dev/null +++ b/databases/mysql41-server/pkg-plist.client @@ -0,0 +1,23 @@ +bin/mysql +bin/mysqladmin +bin/mysqldump +bin/mysqlimport +bin/mysqlshow +etc/rc.d/mysql-client.sh +include/mysql/dbug.h +include/mysql/errmsg.h +include/mysql/m_ctype.h.in +include/mysql/m_string.h +include/mysql/my_list.h +include/mysql/my_sys.h +include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h +include/mysql/mysqld_error.h +lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient.so.6 +@dirrm include/mysql +@dirrm lib/mysql +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile new file mode 100644 index 00000000000..d6c33fa0022 --- /dev/null +++ b/databases/mysql50-client/Makefile @@ -0,0 +1,17 @@ +# ports collection makefile for: MySQL-client +# Version required: v3.22.x +# Date created: Thu Jun 24 00:12:22 CEST 1999 +# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# +# $Id$ +# + +PKGNAME= ${DISTNAME:S/-/-client-/g} + +MASTERDIR= ${.CURDIR}/../mysql322 +COMMENT= ${PKGDIR}/COMMENT.client +PLIST= ${PKGDIR}/PLIST.client + +CLIENT_ONLY= yes + +.include "${MASTERDIR}/Makefile" diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index 108782feabd..8e7bbe5ed1a 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -1,12 +1,13 @@ -# ports collection makefile for: MySQL -# Version required: v3.22.23b +# ports collection makefile for: MySQL-server +# Version required: v3.22.x # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.55 1999/06/22 17:01:39 steve Exp $ +# $Id: Makefile,v 1.56 1999/06/23 21:29:27 billf Exp $ # DISTNAME= mysql-3.22.23b +PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.22/ \ @@ -22,8 +23,6 @@ BROKEN= doesn\'t build on the alpha yet Y2K= http://www.tcx.se/Manual_chapter/manual_Introduction.html#Year_2000_compliance -MAN1= mysql.1 - USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ @@ -37,6 +36,9 @@ CONFIGURE_ENV+= PERL=${PERL} \ CXXFLAGS="${CFLAGS}" \ CONFIGURE_ARGS="${CONFIGURE_ARGS}" +.if !defined(CLIENT_ONLY) +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client + .include <bsd.port.pre.mk> .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -70,24 +72,21 @@ pre-fetch: pre-install: .if !defined(PACKAGE_BUILDING) - @ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version + @${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version .endif post-install: - ${MKDIR} ${PREFIX}/share/mysql/mysql .if !defined(PACKAGE_BUILDING) ${PREFIX}/bin/mysql_install_db .endif - @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh - @ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mysql @@ -98,6 +97,20 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif +.include <bsd.port.post.mk> +.else +MAN1= mysql.1 + +CONFIGURE_ARGS+=--without-server +MAKE_ENV= CLIENT_ONLY="${CLIENT_ONLY}" + +post-install: + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-client.sh + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql -.include <bsd.port.post.mk> +.include <bsd.port.mk> +.endif diff --git a/databases/mysql50-server/files/patch-Makefile.in b/databases/mysql50-server/files/patch-Makefile.in new file mode 100644 index 00000000000..ca368054999 --- /dev/null +++ b/databases/mysql50-server/files/patch-Makefile.in @@ -0,0 +1,16 @@ +--- Makefile.in.orig Sun Jun 6 04:51:50 1999 ++++ Makefile.in Sat Jun 26 08:53:51 1999 +@@ -141,8 +141,11 @@ + # These are built from source in the Docs directory + EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS + +-SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts include tests man @bench_dirs@ support-files +- ++.if defined(CLIENT_ONLY) ++SUBDIRS = @readline_dir@ client include tests man ++.else ++SUBDIRS = @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files ++.endif + + # Relink after clean + CLEANFILES = linked_client_sources diff --git a/databases/mysql50-server/pkg-comment b/databases/mysql50-server/pkg-comment index 3e40b96ed1a..a8f0f7a5e83 100644 --- a/databases/mysql50-server/pkg-comment +++ b/databases/mysql50-server/pkg-comment @@ -1 +1 @@ -A multithreaded SQL database +a multithreaded SQL database (server) diff --git a/databases/mysql50-server/pkg-comment.client b/databases/mysql50-server/pkg-comment.client new file mode 100644 index 00000000000..3af4339ad74 --- /dev/null +++ b/databases/mysql50-server/pkg-comment.client @@ -0,0 +1 @@ +a multithreaded SQL database (client) diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index 9a57fde27ae..ad8ec6d06dd 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-server/pkg-plist @@ -2,41 +2,23 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql -bin/mysql bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission bin/mysql_zap bin/mysqlaccess -bin/mysqladmin bin/mysqlbug -bin/mysqldump -bin/mysqlimport -bin/mysqlshow bin/perror bin/replace bin/resolveip bin/safe_mysqld -etc/rc.d/mysql.sh -include/mysql/dbug.h -include/mysql/errmsg.h -include/mysql/m_ctype.h.in -include/mysql/m_string.h -include/mysql/my_list.h -include/mysql/my_sys.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -include/mysql/mysqld_error.h +etc/rc.d/mysql-server.sh @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.6 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -87,8 +69,6 @@ share/mysql/spanish/errmsg.sys share/mysql/spanish/errmsg.txt share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt -@dirrm include/mysql -@dirrm lib/mysql @dirrm share/doc/mysql @dirrm share/mysql/czech @dirrm share/mysql/dutch @@ -99,7 +79,6 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/italian @dirrm share/mysql/japanese @dirrm share/mysql/korean -@dirrm share/mysql/mysql @dirrm share/mysql/norwegian @dirrm share/mysql/norwegian-ny @dirrm share/mysql/polish @@ -111,5 +90,3 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql50-server/pkg-plist.client b/databases/mysql50-server/pkg-plist.client new file mode 100644 index 00000000000..b293ad704aa --- /dev/null +++ b/databases/mysql50-server/pkg-plist.client @@ -0,0 +1,23 @@ +bin/mysql +bin/mysqladmin +bin/mysqldump +bin/mysqlimport +bin/mysqlshow +etc/rc.d/mysql-client.sh +include/mysql/dbug.h +include/mysql/errmsg.h +include/mysql/m_ctype.h.in +include/mysql/m_string.h +include/mysql/my_list.h +include/mysql/my_sys.h +include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h +include/mysql/mysqld_error.h +lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient.so.6 +@dirrm include/mysql +@dirrm lib/mysql +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile new file mode 100644 index 00000000000..d6c33fa0022 --- /dev/null +++ b/databases/mysql51-client/Makefile @@ -0,0 +1,17 @@ +# ports collection makefile for: MySQL-client +# Version required: v3.22.x +# Date created: Thu Jun 24 00:12:22 CEST 1999 +# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# +# $Id$ +# + +PKGNAME= ${DISTNAME:S/-/-client-/g} + +MASTERDIR= ${.CURDIR}/../mysql322 +COMMENT= ${PKGDIR}/COMMENT.client +PLIST= ${PKGDIR}/PLIST.client + +CLIENT_ONLY= yes + +.include "${MASTERDIR}/Makefile" diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 108782feabd..8e7bbe5ed1a 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -1,12 +1,13 @@ -# ports collection makefile for: MySQL -# Version required: v3.22.23b +# ports collection makefile for: MySQL-server +# Version required: v3.22.x # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.55 1999/06/22 17:01:39 steve Exp $ +# $Id: Makefile,v 1.56 1999/06/23 21:29:27 billf Exp $ # DISTNAME= mysql-3.22.23b +PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.22/ \ @@ -22,8 +23,6 @@ BROKEN= doesn\'t build on the alpha yet Y2K= http://www.tcx.se/Manual_chapter/manual_Introduction.html#Year_2000_compliance -MAN1= mysql.1 - USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ @@ -37,6 +36,9 @@ CONFIGURE_ENV+= PERL=${PERL} \ CXXFLAGS="${CFLAGS}" \ CONFIGURE_ARGS="${CONFIGURE_ARGS}" +.if !defined(CLIENT_ONLY) +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client + .include <bsd.port.pre.mk> .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -70,24 +72,21 @@ pre-fetch: pre-install: .if !defined(PACKAGE_BUILDING) - @ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version + @${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version .endif post-install: - ${MKDIR} ${PREFIX}/share/mysql/mysql .if !defined(PACKAGE_BUILDING) ${PREFIX}/bin/mysql_install_db .endif - @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh - @ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mysql @@ -98,6 +97,20 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif +.include <bsd.port.post.mk> +.else +MAN1= mysql.1 + +CONFIGURE_ARGS+=--without-server +MAKE_ENV= CLIENT_ONLY="${CLIENT_ONLY}" + +post-install: + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-client.sh + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql -.include <bsd.port.post.mk> +.include <bsd.port.mk> +.endif diff --git a/databases/mysql51-server/files/patch-Makefile.in b/databases/mysql51-server/files/patch-Makefile.in new file mode 100644 index 00000000000..ca368054999 --- /dev/null +++ b/databases/mysql51-server/files/patch-Makefile.in @@ -0,0 +1,16 @@ +--- Makefile.in.orig Sun Jun 6 04:51:50 1999 ++++ Makefile.in Sat Jun 26 08:53:51 1999 +@@ -141,8 +141,11 @@ + # These are built from source in the Docs directory + EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS + +-SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts include tests man @bench_dirs@ support-files +- ++.if defined(CLIENT_ONLY) ++SUBDIRS = @readline_dir@ client include tests man ++.else ++SUBDIRS = @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files ++.endif + + # Relink after clean + CLEANFILES = linked_client_sources diff --git a/databases/mysql51-server/pkg-comment b/databases/mysql51-server/pkg-comment index 3e40b96ed1a..a8f0f7a5e83 100644 --- a/databases/mysql51-server/pkg-comment +++ b/databases/mysql51-server/pkg-comment @@ -1 +1 @@ -A multithreaded SQL database +a multithreaded SQL database (server) diff --git a/databases/mysql51-server/pkg-comment.client b/databases/mysql51-server/pkg-comment.client new file mode 100644 index 00000000000..3af4339ad74 --- /dev/null +++ b/databases/mysql51-server/pkg-comment.client @@ -0,0 +1 @@ +a multithreaded SQL database (client) diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index 9a57fde27ae..ad8ec6d06dd 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -2,41 +2,23 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql -bin/mysql bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission bin/mysql_zap bin/mysqlaccess -bin/mysqladmin bin/mysqlbug -bin/mysqldump -bin/mysqlimport -bin/mysqlshow bin/perror bin/replace bin/resolveip bin/safe_mysqld -etc/rc.d/mysql.sh -include/mysql/dbug.h -include/mysql/errmsg.h -include/mysql/m_ctype.h.in -include/mysql/m_string.h -include/mysql/my_list.h -include/mysql/my_sys.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -include/mysql/mysqld_error.h +etc/rc.d/mysql-server.sh @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.6 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -87,8 +69,6 @@ share/mysql/spanish/errmsg.sys share/mysql/spanish/errmsg.txt share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt -@dirrm include/mysql -@dirrm lib/mysql @dirrm share/doc/mysql @dirrm share/mysql/czech @dirrm share/mysql/dutch @@ -99,7 +79,6 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/italian @dirrm share/mysql/japanese @dirrm share/mysql/korean -@dirrm share/mysql/mysql @dirrm share/mysql/norwegian @dirrm share/mysql/norwegian-ny @dirrm share/mysql/polish @@ -111,5 +90,3 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql51-server/pkg-plist.client b/databases/mysql51-server/pkg-plist.client new file mode 100644 index 00000000000..b293ad704aa --- /dev/null +++ b/databases/mysql51-server/pkg-plist.client @@ -0,0 +1,23 @@ +bin/mysql +bin/mysqladmin +bin/mysqldump +bin/mysqlimport +bin/mysqlshow +etc/rc.d/mysql-client.sh +include/mysql/dbug.h +include/mysql/errmsg.h +include/mysql/m_ctype.h.in +include/mysql/m_string.h +include/mysql/my_list.h +include/mysql/my_sys.h +include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h +include/mysql/mysqld_error.h +lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient.so.6 +@dirrm include/mysql +@dirrm lib/mysql +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile new file mode 100644 index 00000000000..d6c33fa0022 --- /dev/null +++ b/databases/mysql54-client/Makefile @@ -0,0 +1,17 @@ +# ports collection makefile for: MySQL-client +# Version required: v3.22.x +# Date created: Thu Jun 24 00:12:22 CEST 1999 +# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# +# $Id$ +# + +PKGNAME= ${DISTNAME:S/-/-client-/g} + +MASTERDIR= ${.CURDIR}/../mysql322 +COMMENT= ${PKGDIR}/COMMENT.client +PLIST= ${PKGDIR}/PLIST.client + +CLIENT_ONLY= yes + +.include "${MASTERDIR}/Makefile" diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 108782feabd..8e7bbe5ed1a 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -1,12 +1,13 @@ -# ports collection makefile for: MySQL -# Version required: v3.22.23b +# ports collection makefile for: MySQL-server +# Version required: v3.22.x # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.55 1999/06/22 17:01:39 steve Exp $ +# $Id: Makefile,v 1.56 1999/06/23 21:29:27 billf Exp $ # DISTNAME= mysql-3.22.23b +PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.22/ \ @@ -22,8 +23,6 @@ BROKEN= doesn\'t build on the alpha yet Y2K= http://www.tcx.se/Manual_chapter/manual_Introduction.html#Year_2000_compliance -MAN1= mysql.1 - USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ @@ -37,6 +36,9 @@ CONFIGURE_ENV+= PERL=${PERL} \ CXXFLAGS="${CFLAGS}" \ CONFIGURE_ARGS="${CONFIGURE_ARGS}" +.if !defined(CLIENT_ONLY) +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client + .include <bsd.port.pre.mk> .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -70,24 +72,21 @@ pre-fetch: pre-install: .if !defined(PACKAGE_BUILDING) - @ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version + @${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version .endif post-install: - ${MKDIR} ${PREFIX}/share/mysql/mysql .if !defined(PACKAGE_BUILDING) ${PREFIX}/bin/mysql_install_db .endif - @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh - @ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mysql @@ -98,6 +97,20 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif +.include <bsd.port.post.mk> +.else +MAN1= mysql.1 + +CONFIGURE_ARGS+=--without-server +MAKE_ENV= CLIENT_ONLY="${CLIENT_ONLY}" + +post-install: + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-client.sh + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql -.include <bsd.port.post.mk> +.include <bsd.port.mk> +.endif diff --git a/databases/mysql54-server/files/patch-Makefile.in b/databases/mysql54-server/files/patch-Makefile.in new file mode 100644 index 00000000000..ca368054999 --- /dev/null +++ b/databases/mysql54-server/files/patch-Makefile.in @@ -0,0 +1,16 @@ +--- Makefile.in.orig Sun Jun 6 04:51:50 1999 ++++ Makefile.in Sat Jun 26 08:53:51 1999 +@@ -141,8 +141,11 @@ + # These are built from source in the Docs directory + EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS + +-SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts include tests man @bench_dirs@ support-files +- ++.if defined(CLIENT_ONLY) ++SUBDIRS = @readline_dir@ client include tests man ++.else ++SUBDIRS = @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files ++.endif + + # Relink after clean + CLEANFILES = linked_client_sources diff --git a/databases/mysql54-server/pkg-comment b/databases/mysql54-server/pkg-comment index 3e40b96ed1a..a8f0f7a5e83 100644 --- a/databases/mysql54-server/pkg-comment +++ b/databases/mysql54-server/pkg-comment @@ -1 +1 @@ -A multithreaded SQL database +a multithreaded SQL database (server) diff --git a/databases/mysql54-server/pkg-comment.client b/databases/mysql54-server/pkg-comment.client new file mode 100644 index 00000000000..3af4339ad74 --- /dev/null +++ b/databases/mysql54-server/pkg-comment.client @@ -0,0 +1 @@ +a multithreaded SQL database (client) diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index 9a57fde27ae..ad8ec6d06dd 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -2,41 +2,23 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql -bin/mysql bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission bin/mysql_zap bin/mysqlaccess -bin/mysqladmin bin/mysqlbug -bin/mysqldump -bin/mysqlimport -bin/mysqlshow bin/perror bin/replace bin/resolveip bin/safe_mysqld -etc/rc.d/mysql.sh -include/mysql/dbug.h -include/mysql/errmsg.h -include/mysql/m_ctype.h.in -include/mysql/m_string.h -include/mysql/my_list.h -include/mysql/my_sys.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -include/mysql/mysqld_error.h +etc/rc.d/mysql-server.sh @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.6 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -87,8 +69,6 @@ share/mysql/spanish/errmsg.sys share/mysql/spanish/errmsg.txt share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt -@dirrm include/mysql -@dirrm lib/mysql @dirrm share/doc/mysql @dirrm share/mysql/czech @dirrm share/mysql/dutch @@ -99,7 +79,6 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/italian @dirrm share/mysql/japanese @dirrm share/mysql/korean -@dirrm share/mysql/mysql @dirrm share/mysql/norwegian @dirrm share/mysql/norwegian-ny @dirrm share/mysql/polish @@ -111,5 +90,3 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql54-server/pkg-plist.client b/databases/mysql54-server/pkg-plist.client new file mode 100644 index 00000000000..b293ad704aa --- /dev/null +++ b/databases/mysql54-server/pkg-plist.client @@ -0,0 +1,23 @@ +bin/mysql +bin/mysqladmin +bin/mysqldump +bin/mysqlimport +bin/mysqlshow +etc/rc.d/mysql-client.sh +include/mysql/dbug.h +include/mysql/errmsg.h +include/mysql/m_ctype.h.in +include/mysql/m_string.h +include/mysql/my_list.h +include/mysql/my_sys.h +include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h +include/mysql/mysqld_error.h +lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient.so.6 +@dirrm include/mysql +@dirrm lib/mysql +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile new file mode 100644 index 00000000000..d6c33fa0022 --- /dev/null +++ b/databases/mysql55-client/Makefile @@ -0,0 +1,17 @@ +# ports collection makefile for: MySQL-client +# Version required: v3.22.x +# Date created: Thu Jun 24 00:12:22 CEST 1999 +# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# +# $Id$ +# + +PKGNAME= ${DISTNAME:S/-/-client-/g} + +MASTERDIR= ${.CURDIR}/../mysql322 +COMMENT= ${PKGDIR}/COMMENT.client +PLIST= ${PKGDIR}/PLIST.client + +CLIENT_ONLY= yes + +.include "${MASTERDIR}/Makefile" diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 108782feabd..8e7bbe5ed1a 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -1,12 +1,13 @@ -# ports collection makefile for: MySQL -# Version required: v3.22.23b +# ports collection makefile for: MySQL-server +# Version required: v3.22.x # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.55 1999/06/22 17:01:39 steve Exp $ +# $Id: Makefile,v 1.56 1999/06/23 21:29:27 billf Exp $ # DISTNAME= mysql-3.22.23b +PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.22/ \ @@ -22,8 +23,6 @@ BROKEN= doesn\'t build on the alpha yet Y2K= http://www.tcx.se/Manual_chapter/manual_Introduction.html#Year_2000_compliance -MAN1= mysql.1 - USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ @@ -37,6 +36,9 @@ CONFIGURE_ENV+= PERL=${PERL} \ CXXFLAGS="${CFLAGS}" \ CONFIGURE_ARGS="${CONFIGURE_ARGS}" +.if !defined(CLIENT_ONLY) +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client + .include <bsd.port.pre.mk> .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -70,24 +72,21 @@ pre-fetch: pre-install: .if !defined(PACKAGE_BUILDING) - @ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version + @${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version .endif post-install: - ${MKDIR} ${PREFIX}/share/mysql/mysql .if !defined(PACKAGE_BUILDING) ${PREFIX}/bin/mysql_install_db .endif - @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh - @ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mysql @@ -98,6 +97,20 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif +.include <bsd.port.post.mk> +.else +MAN1= mysql.1 + +CONFIGURE_ARGS+=--without-server +MAKE_ENV= CLIENT_ONLY="${CLIENT_ONLY}" + +post-install: + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-client.sh + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql -.include <bsd.port.post.mk> +.include <bsd.port.mk> +.endif diff --git a/databases/mysql55-server/files/patch-Makefile.in b/databases/mysql55-server/files/patch-Makefile.in new file mode 100644 index 00000000000..ca368054999 --- /dev/null +++ b/databases/mysql55-server/files/patch-Makefile.in @@ -0,0 +1,16 @@ +--- Makefile.in.orig Sun Jun 6 04:51:50 1999 ++++ Makefile.in Sat Jun 26 08:53:51 1999 +@@ -141,8 +141,11 @@ + # These are built from source in the Docs directory + EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS + +-SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts include tests man @bench_dirs@ support-files +- ++.if defined(CLIENT_ONLY) ++SUBDIRS = @readline_dir@ client include tests man ++.else ++SUBDIRS = @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files ++.endif + + # Relink after clean + CLEANFILES = linked_client_sources diff --git a/databases/mysql55-server/pkg-comment b/databases/mysql55-server/pkg-comment index 3e40b96ed1a..a8f0f7a5e83 100644 --- a/databases/mysql55-server/pkg-comment +++ b/databases/mysql55-server/pkg-comment @@ -1 +1 @@ -A multithreaded SQL database +a multithreaded SQL database (server) diff --git a/databases/mysql55-server/pkg-comment.client b/databases/mysql55-server/pkg-comment.client new file mode 100644 index 00000000000..3af4339ad74 --- /dev/null +++ b/databases/mysql55-server/pkg-comment.client @@ -0,0 +1 @@ +a multithreaded SQL database (client) diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index 9a57fde27ae..ad8ec6d06dd 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -2,41 +2,23 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql -bin/mysql bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission bin/mysql_zap bin/mysqlaccess -bin/mysqladmin bin/mysqlbug -bin/mysqldump -bin/mysqlimport -bin/mysqlshow bin/perror bin/replace bin/resolveip bin/safe_mysqld -etc/rc.d/mysql.sh -include/mysql/dbug.h -include/mysql/errmsg.h -include/mysql/m_ctype.h.in -include/mysql/m_string.h -include/mysql/my_list.h -include/mysql/my_sys.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -include/mysql/mysqld_error.h +etc/rc.d/mysql-server.sh @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.6 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -87,8 +69,6 @@ share/mysql/spanish/errmsg.sys share/mysql/spanish/errmsg.txt share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt -@dirrm include/mysql -@dirrm lib/mysql @dirrm share/doc/mysql @dirrm share/mysql/czech @dirrm share/mysql/dutch @@ -99,7 +79,6 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/italian @dirrm share/mysql/japanese @dirrm share/mysql/korean -@dirrm share/mysql/mysql @dirrm share/mysql/norwegian @dirrm share/mysql/norwegian-ny @dirrm share/mysql/polish @@ -111,5 +90,3 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client new file mode 100644 index 00000000000..b293ad704aa --- /dev/null +++ b/databases/mysql55-server/pkg-plist.client @@ -0,0 +1,23 @@ +bin/mysql +bin/mysqladmin +bin/mysqldump +bin/mysqlimport +bin/mysqlshow +etc/rc.d/mysql-client.sh +include/mysql/dbug.h +include/mysql/errmsg.h +include/mysql/m_ctype.h.in +include/mysql/m_string.h +include/mysql/my_list.h +include/mysql/my_sys.h +include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h +include/mysql/mysqld_error.h +lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient.so.6 +@dirrm include/mysql +@dirrm lib/mysql +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile new file mode 100644 index 00000000000..d6c33fa0022 --- /dev/null +++ b/databases/mysql60-client/Makefile @@ -0,0 +1,17 @@ +# ports collection makefile for: MySQL-client +# Version required: v3.22.x +# Date created: Thu Jun 24 00:12:22 CEST 1999 +# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# +# $Id$ +# + +PKGNAME= ${DISTNAME:S/-/-client-/g} + +MASTERDIR= ${.CURDIR}/../mysql322 +COMMENT= ${PKGDIR}/COMMENT.client +PLIST= ${PKGDIR}/PLIST.client + +CLIENT_ONLY= yes + +.include "${MASTERDIR}/Makefile" diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 108782feabd..8e7bbe5ed1a 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -1,12 +1,13 @@ -# ports collection makefile for: MySQL -# Version required: v3.22.23b +# ports collection makefile for: MySQL-server +# Version required: v3.22.x # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.55 1999/06/22 17:01:39 steve Exp $ +# $Id: Makefile,v 1.56 1999/06/23 21:29:27 billf Exp $ # DISTNAME= mysql-3.22.23b +PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.22/ \ @@ -22,8 +23,6 @@ BROKEN= doesn\'t build on the alpha yet Y2K= http://www.tcx.se/Manual_chapter/manual_Introduction.html#Year_2000_compliance -MAN1= mysql.1 - USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ @@ -37,6 +36,9 @@ CONFIGURE_ENV+= PERL=${PERL} \ CXXFLAGS="${CFLAGS}" \ CONFIGURE_ARGS="${CONFIGURE_ARGS}" +.if !defined(CLIENT_ONLY) +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client + .include <bsd.port.pre.mk> .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -70,24 +72,21 @@ pre-fetch: pre-install: .if !defined(PACKAGE_BUILDING) - @ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version + @${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version .endif post-install: - ${MKDIR} ${PREFIX}/share/mysql/mysql .if !defined(PACKAGE_BUILDING) ${PREFIX}/bin/mysql_install_db .endif - @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh - @ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mysql @@ -98,6 +97,20 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif +.include <bsd.port.post.mk> +.else +MAN1= mysql.1 + +CONFIGURE_ARGS+=--without-server +MAKE_ENV= CLIENT_ONLY="${CLIENT_ONLY}" + +post-install: + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-client.sh + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql -.include <bsd.port.post.mk> +.include <bsd.port.mk> +.endif diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in new file mode 100644 index 00000000000..ca368054999 --- /dev/null +++ b/databases/mysql60-server/files/patch-Makefile.in @@ -0,0 +1,16 @@ +--- Makefile.in.orig Sun Jun 6 04:51:50 1999 ++++ Makefile.in Sat Jun 26 08:53:51 1999 +@@ -141,8 +141,11 @@ + # These are built from source in the Docs directory + EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS + +-SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts include tests man @bench_dirs@ support-files +- ++.if defined(CLIENT_ONLY) ++SUBDIRS = @readline_dir@ client include tests man ++.else ++SUBDIRS = @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files ++.endif + + # Relink after clean + CLEANFILES = linked_client_sources diff --git a/databases/mysql60-server/pkg-comment b/databases/mysql60-server/pkg-comment index 3e40b96ed1a..a8f0f7a5e83 100644 --- a/databases/mysql60-server/pkg-comment +++ b/databases/mysql60-server/pkg-comment @@ -1 +1 @@ -A multithreaded SQL database +a multithreaded SQL database (server) diff --git a/databases/mysql60-server/pkg-comment.client b/databases/mysql60-server/pkg-comment.client new file mode 100644 index 00000000000..3af4339ad74 --- /dev/null +++ b/databases/mysql60-server/pkg-comment.client @@ -0,0 +1 @@ +a multithreaded SQL database (client) diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index 9a57fde27ae..ad8ec6d06dd 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -2,41 +2,23 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql -bin/mysql bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission bin/mysql_zap bin/mysqlaccess -bin/mysqladmin bin/mysqlbug -bin/mysqldump -bin/mysqlimport -bin/mysqlshow bin/perror bin/replace bin/resolveip bin/safe_mysqld -etc/rc.d/mysql.sh -include/mysql/dbug.h -include/mysql/errmsg.h -include/mysql/m_ctype.h.in -include/mysql/m_string.h -include/mysql/my_list.h -include/mysql/my_sys.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -include/mysql/mysqld_error.h +etc/rc.d/mysql-server.sh @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.6 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -87,8 +69,6 @@ share/mysql/spanish/errmsg.sys share/mysql/spanish/errmsg.txt share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt -@dirrm include/mysql -@dirrm lib/mysql @dirrm share/doc/mysql @dirrm share/mysql/czech @dirrm share/mysql/dutch @@ -99,7 +79,6 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/italian @dirrm share/mysql/japanese @dirrm share/mysql/korean -@dirrm share/mysql/mysql @dirrm share/mysql/norwegian @dirrm share/mysql/norwegian-ny @dirrm share/mysql/polish @@ -111,5 +90,3 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client new file mode 100644 index 00000000000..b293ad704aa --- /dev/null +++ b/databases/mysql60-server/pkg-plist.client @@ -0,0 +1,23 @@ +bin/mysql +bin/mysqladmin +bin/mysqldump +bin/mysqlimport +bin/mysqlshow +etc/rc.d/mysql-client.sh +include/mysql/dbug.h +include/mysql/errmsg.h +include/mysql/m_ctype.h.in +include/mysql/m_string.h +include/mysql/my_list.h +include/mysql/my_sys.h +include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h +include/mysql/mysqld_error.h +lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient.so.6 +@dirrm include/mysql +@dirrm lib/mysql +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile new file mode 100644 index 00000000000..d6c33fa0022 --- /dev/null +++ b/databases/percona55-client/Makefile @@ -0,0 +1,17 @@ +# ports collection makefile for: MySQL-client +# Version required: v3.22.x +# Date created: Thu Jun 24 00:12:22 CEST 1999 +# Whom: Dirk Froemberg <dirk@FreeBSD.org> +# +# $Id$ +# + +PKGNAME= ${DISTNAME:S/-/-client-/g} + +MASTERDIR= ${.CURDIR}/../mysql322 +COMMENT= ${PKGDIR}/COMMENT.client +PLIST= ${PKGDIR}/PLIST.client + +CLIENT_ONLY= yes + +.include "${MASTERDIR}/Makefile" diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 108782feabd..8e7bbe5ed1a 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -1,12 +1,13 @@ -# ports collection makefile for: MySQL -# Version required: v3.22.23b +# ports collection makefile for: MySQL-server +# Version required: v3.22.x # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.55 1999/06/22 17:01:39 steve Exp $ +# $Id: Makefile,v 1.56 1999/06/23 21:29:27 billf Exp $ # DISTNAME= mysql-3.22.23b +PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.22/ \ @@ -22,8 +23,6 @@ BROKEN= doesn\'t build on the alpha yet Y2K= http://www.tcx.se/Manual_chapter/manual_Introduction.html#Year_2000_compliance -MAN1= mysql.1 - USE_PERL5= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ @@ -37,6 +36,9 @@ CONFIGURE_ENV+= PERL=${PERL} \ CXXFLAGS="${CFLAGS}" \ CONFIGURE_ARGS="${CONFIGURE_ARGS}" +.if !defined(CLIENT_ONLY) +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client + .include <bsd.port.pre.mk> .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -70,24 +72,21 @@ pre-fetch: pre-install: .if !defined(PACKAGE_BUILDING) - @ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version + @${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version .endif post-install: - ${MKDIR} ${PREFIX}/share/mysql/mysql .if !defined(PACKAGE_BUILDING) ${PREFIX}/bin/mysql_install_db .endif - @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh - @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh - @ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql-server.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mysql @@ -98,6 +97,20 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif +.include <bsd.port.post.mk> +.else +MAN1= mysql.1 + +CONFIGURE_ARGS+=--without-server +MAKE_ENV= CLIENT_ONLY="${CLIENT_ONLY}" + +post-install: + @${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql-client.sh + @/bin/chmod 750 ${PREFIX}/etc/rc.d/mysql-client.sh + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql -.include <bsd.port.post.mk> +.include <bsd.port.mk> +.endif diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in new file mode 100644 index 00000000000..ca368054999 --- /dev/null +++ b/databases/percona55-server/files/patch-Makefile.in @@ -0,0 +1,16 @@ +--- Makefile.in.orig Sun Jun 6 04:51:50 1999 ++++ Makefile.in Sat Jun 26 08:53:51 1999 +@@ -141,8 +141,11 @@ + # These are built from source in the Docs directory + EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS + +-SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts include tests man @bench_dirs@ support-files +- ++.if defined(CLIENT_ONLY) ++SUBDIRS = @readline_dir@ client include tests man ++.else ++SUBDIRS = @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files ++.endif + + # Relink after clean + CLEANFILES = linked_client_sources diff --git a/databases/percona55-server/pkg-comment b/databases/percona55-server/pkg-comment index 3e40b96ed1a..a8f0f7a5e83 100644 --- a/databases/percona55-server/pkg-comment +++ b/databases/percona55-server/pkg-comment @@ -1 +1 @@ -A multithreaded SQL database +a multithreaded SQL database (server) diff --git a/databases/percona55-server/pkg-comment.client b/databases/percona55-server/pkg-comment.client new file mode 100644 index 00000000000..3af4339ad74 --- /dev/null +++ b/databases/percona55-server/pkg-comment.client @@ -0,0 +1 @@ +a multithreaded SQL database (client) diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index 9a57fde27ae..ad8ec6d06dd 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -2,41 +2,23 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql -bin/mysql bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission bin/mysql_zap bin/mysqlaccess -bin/mysqladmin bin/mysqlbug -bin/mysqldump -bin/mysqlimport -bin/mysqlshow bin/perror bin/replace bin/resolveip bin/safe_mysqld -etc/rc.d/mysql.sh -include/mysql/dbug.h -include/mysql/errmsg.h -include/mysql/m_ctype.h.in -include/mysql/m_string.h -include/mysql/my_list.h -include/mysql/my_sys.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -include/mysql/mysqld_error.h +etc/rc.d/mysql-server.sh @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.6 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -87,8 +69,6 @@ share/mysql/spanish/errmsg.sys share/mysql/spanish/errmsg.txt share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt -@dirrm include/mysql -@dirrm lib/mysql @dirrm share/doc/mysql @dirrm share/mysql/czech @dirrm share/mysql/dutch @@ -99,7 +79,6 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/italian @dirrm share/mysql/japanese @dirrm share/mysql/korean -@dirrm share/mysql/mysql @dirrm share/mysql/norwegian @dirrm share/mysql/norwegian-ny @dirrm share/mysql/polish @@ -111,5 +90,3 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client new file mode 100644 index 00000000000..b293ad704aa --- /dev/null +++ b/databases/percona55-server/pkg-plist.client @@ -0,0 +1,23 @@ +bin/mysql +bin/mysqladmin +bin/mysqldump +bin/mysqlimport +bin/mysqlshow +etc/rc.d/mysql-client.sh +include/mysql/dbug.h +include/mysql/errmsg.h +include/mysql/m_ctype.h.in +include/mysql/m_string.h +include/mysql/my_list.h +include/mysql/my_sys.h +include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h +include/mysql/mysqld_error.h +lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient.so.6 +@dirrm include/mysql +@dirrm lib/mysql +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R |