head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.54 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.52 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.50 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.48 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.46 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.44 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.42 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.40 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.38 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.36 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.34 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.32 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.30 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.28 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.26 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.24 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.22 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.20 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.18 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.16 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.14 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.12 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.10 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.8 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.6 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.4 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 buildlink2-base:1.7 netbsd-1-4-RELEASE:1.6 netbsd-1-3-PATCH003:1.3; locks; strict; comment @# @; 1.7 date 99.05.06.23.38.39; author tv; state dead; branches; next 1.6; 1.6 date 99.04.09.15.39.38; author bad; state Exp; branches; next 1.5; 1.5 date 99.04.08.21.52.21; author bad; state Exp; branches; next 1.4; 1.4 date 99.02.04.21.35.01; author frueauf; state Exp; branches; next 1.3; 1.3 date 98.08.07.10.40.18; author agc; state Exp; branches; next 1.2; 1.2 date 98.07.20.14.49.51; author tv; state Exp; branches; next 1.1; 1.1 date 98.06.22.10.55.21; author frueauf; state Exp; branches; next ; desc @@ 1.7 log @Nuke mysql; it's now mysql-server and mysql-client. @ text @$NetBSD: patch-aa,v 1.6 1999/04/09 15:39:38 bad Exp $ --- client/Makefile.in.orig Mon Mar 15 15:49:57 1999 +++ client/Makefile.in Sun Mar 21 23:11:42 1999 @@@@ -181,7 +181,7 @@@@ libmysqlclient_la_LDFLAGS = -version-info @@SHARED_LIB_VERSION@@ CLEANFILES = $(libmysqlclient_la_LIBADD) $(SHLIBOBJS) \ libmysqclient.la -DEFS = -DUNDEF_THREADS_HACK +DEFS = -DUNDEF_THREADS_HACK -Dunix mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @ 1.6 log @Update to mysql-3.22.21. There are way too many changes and new features to list them here. The most notable change is the introduction of the GRANT system which requires fixing the privilege tables when upgrading. See the mysql manual. XXX Todo: fix installation of mysql.server script. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Use the correct variable when setting the -rpath. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 1999/02/04 21:35:01 frueauf Exp $ d3 6 a8 44 --- client/Makefile.in.orig Wed Jul 8 11:10:53 1998 +++ client/Makefile.in Thu Feb 4 17:12:10 1999 @@@@ -42,8 +42,8 @@@@ AUTOHEADER = @@AUTOHEADER@@ INSTALL = @@INSTALL@@ -INSTALL_PROGRAM = @@INSTALL_PROGRAM@@ -INSTALL_DATA = @@INSTALL_DATA@@ +INSTALL_PROGRAM = $(LIBTOOL) --mode=install @@INSTALL_PROGRAM@@ +INSTALL_DATA = $(LIBTOOL) --mode=install @@INSTALL_DATA@@ INSTALL_SCRIPT = @@INSTALL_SCRIPT@@ transform = @@program_transform_name@@ @@@@ -115,21 +115,21 @@@@ mystrings_charset = @@mystrings_charset@@ perl_dirs = @@perl_dirs@@ readline_dir = @@readline_dir@@ -readline_link = @@readline_link@@ +readline_link = ../readline/libreadline.a server_scripts = @@server_scripts@@ sql_server_dirs = @@sql_server_dirs@@ INCLUDES = -I$(srcdir)/../include -I../include \ -I$(srcdir)/.. -I$(top_srcdir) -I.. LIBS = @@CLIENT_LIBS@@ -LDADD = -L. -lmysqlclient -pkglib_LIBRARIES = libmysqlclient.a -LIBFILES = libmysqlclient.a @@shlib@@ +LDADD = libmysqlclient.la +pkglib_LIBRARIES = libmysqlclient.la +LIBFILES = libmysqlclient.la bin_PROGRAMS = mysql mysqladmin mysqlshow mysqldump mysqlimport noinst_PROGRAMS = insert_test select_test noinst_HEADERS = sql_string.h completion_hash.h mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc -mysql_LDADD = @@readline_link@@ @@TERMCAP_LIB@@ $(LDADD) +mysql_LDADD = $(readline_link) @@TERMCAP_LIB@@ $(LDADD) mysql_DEPENDENCIES= $(LIBRARIES) mysqladmin_DEPENDENCIES= $(LIBRARIES) mysqlshow_DEPENDENCIES= $(LIBRARIES) @@@@ -167,7 +167,7 @@@@ CLEANFILES = $(libmysqlclient_a_LIBADD) $(SHLIBOBJS) \ libmysqlclient.so libmysqlclient.so.@@VERSION@@ a13 41 @@@@ -218,10 +218,10 @@@@ select_test_LDFLAGS = CXXFLAGS = @@CXXFLAGS@@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) -CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@@ +CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@@ CFLAGS = @@CFLAGS@@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@@ +COMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@@ HEADERS = $(noinst_HEADERS) DIST_COMMON = Makefile.am Makefile.in @@@@ -265,12 +265,6 @@@@ else :; fi; \ done @@$(POST_INSTALL) - @@list='$(pkglib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(RANLIB) $(pkglibdir)/$$p"; \ - $(RANLIB) $(pkglibdir)/$$p; \ - else :; fi; \ - done uninstall-pkglibLIBRARIES: $(NORMAL_UNINSTALL) @@@@ -291,10 +285,9 @@@@ maintainer-clean-compile: -libmysqlclient.a: $(libmysqlclient_a_OBJECTS) $(libmysqlclient_a_DEPENDENCIES) - rm -f libmysqlclient.a - $(AR) cru libmysqlclient.a $(libmysqlclient_a_OBJECTS) $(libmysqlclient_a_LIBADD) - $(RANLIB) libmysqlclient.a +libmysqlclient.la: $(libmysqlclient_a_OBJECTS) $(libmysqlclient_a_DEPENDENCIES) + $(LIBTOOL) --mode=link $(CC) -o libmysqlclient.la $(libmysqlclient_a_OBJECTS:.o=.lo) $(libmysqlclient_a_LIBADD:.o=.lo) \ + -rpath $(pkglibdir) -version-info 321:33 mostlyclean-binPROGRAMS: @ 1.4 log @Some cleanups: - add -Dunix for some files which relied on it to be defined - run `mysqladmin shutdown` right after mysql_install_db to prevent blind running mysql daemon, pointed out in pr 6533 by Matthew Green - set NO_PACKAGE if we build/install the server case - mysql_install_db needs the data dir from the source distribution to work - this never worked for binary packages! Remove the bogus exec in PLIST-server too as consequence. @ text @d1 1 a1 1 $NetBSD$ d89 1 a89 1 + -rpath $(prefix)/lib -version-info 321:33 @ 1.3 log @Add NetBSD RCS Ids. @ text @d3 2 a4 2 --- client/Makefile.in.orig Tue Jun 30 08:14:37 1998 +++ client/Makefile.in Fri Jul 17 12:20:34 1998 d43 9 @ 1.2 log @Update to use libtool to build the clients' shared library. Add support for client-only setups on all architectures other than those the server's threads support (i386 and alpha). @ text @d1 2 @ 1.1 log @Initial addition of MySQL, a free SQL database server. Based on pr 5601 by Ty Sarna, enhancement and upgrade to 3.21.31 by me. @ text @d1 80 a80 52 --- client/Makefile.in.orig Sun May 10 17:25:18 1998 +++ client/Makefile.in Sun Jun 14 20:15:50 1998 @@@@ -149,16 +149,18 @@@@ libmysqlclient_a_LIBADD = $(mysysobjects) $(mystringsobjects) $(dbugobjects) # Dirty hack to generate names for shared objects (requires GNUmake) -SHLIBOBJS = ${libmysqlclient_a_SOURCES:.c=.o} ${libmysqlclient_a_LIBADD} +SHLIBOBJS = ${libmysqlclient_a_SOURCES:.c=.so} ${libmysqlclient_a_LIBADD:.o=.so} + +SHVERSION = 321.30 CLEANFILES = $(libmysqlclient_a_LIBADD) $(SHLIBOBJS) \ - libmysqlclient.so libmysqlclient.so.@@VERSION@@ + libmysqlclient.so libmysqlclient.so.${SHVERSION} DEFS = -DUNDEF_THREADS_HACK mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = -LIBRARIES = $(pkglib_LIBRARIES) +LIBRARIES = $(pkglib_LIBRARIES) libmysqlclient.so CPPFLAGS = @@CPPFLAGS@@ LDFLAGS = @@LDFLAGS@@ @@@@ -540,18 +542,22 @@@@ shlib: libmysqlclient.so -libmysqlclient.so: libmysqlclient.so.@@VERSION@@ +libmysqlclient.so: libmysqlclient.so.${SHVERSION} -rm -f $@@ ln -s $< $@@ -libmysqlclient.so.@@VERSION@@: $(SHLIBOBJS) - $(CC) -shared -Wl,-h,libmysqlclient.so.@@SHARED_LIB_VERSION@@ -o $@@ \ - $(SHLIBOBJS) $(LIBS) +libmysqlclient.so.${SHVERSION}: libmysqlclient_pic.a + $(LD) -x -Bshareable -Bforcearchive libmysqlclient_pic.a -o $@@ $(LIBS) + +libmysqlclient_pic.a: $(SHLIBOBJS) + ${AR} cru $@@ $(SHLIBOBJS) + ${RANLIB} $@@ install_shlib: libmysqlclient.so - $(INSTALL) libmysqlclient.so.@@VERSION@@ $(libdir) + $(INSTALL) libmysqlclient_pic.a $(libdir) + $(INSTALL) libmysqlclient.so.${SHVERSION} $(libdir) -rm -f $(libdir)/libmysqlclient.so - ln -s libmysqlclient.so.@@VERSION@@ $(libdir)/libmysqlclient.so + ln -s libmysqlclient.so.${SHVERSION} $(libdir)/libmysqlclient.so @@echo "ensure $(libdir) is in your LD_LIBRARY_PATH" @@echo "and run ldconfig" @