Add mysql-gui, a graphical SQL client for MySQL.

PR:		ports/29862
Submitted by:	Cyrille Lefevre <clefevre@citeweb.net>

12 files changed, 201 insertions, 0 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 77064b8bcc3d..d698d9c68f37 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -35,6 +35,7 @@
     SUBDIR += myodbc
     SUBDIR += mysql++
     SUBDIR += mysql-editor
+    SUBDIR += mysql-gui
     SUBDIR += mysql-jdbc-mm
     SUBDIR += mysql-navigator
     SUBDIR += mysql2pgsql
diff --git a/databases/mysql-gui/Makefile b/databases/mysql-gui/Makefile
new file mode 100644
index 000000000000..f9ef67430a20
--- /dev/null
+++ b/databases/mysql-gui/Makefile
@@ -0,0 +1,50 @@
+# New ports collection makefile for:    mysql-gui
+# Date created:				August 17 2001
+# Whom:	      				Cyrille Lefevre <clefevre@citeweb.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mysql-gui
+PORTVERSION=	1.7.5
+CATEGORIES=	databases
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	mirrors/mysql/Downloads/mysqlgui
+DISTNAME=	${PORTNAME:S/-//}-${PORTVERSION}
+
+MAINTAINER=	clefevre@citeweb.net
+
+LIB_DEPENDS=	sqlplus.1:${PORTSDIR}/databases/mysql++ \
+ 		intl.1:${PORTSDIR}/devel/gettext \
+ 		glut.3:${PORTSDIR}/graphics/Mesa3 \
+ 		jpeg.9:${PORTSDIR}/graphics/jpeg \
+ 		fleditor.1:${PORTSDIR}/x11-toolkits/fl_editor \
+		flvw.1:${PORTSDIR}/x11-toolkits/flvw
+
+USE_X_PREFIX=	yes
+USE_MESA=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-/-src-/}
+MAKE_ARGS=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+OLD_FILES=	Fl_Editor.h Fl_FancyEditor.h Fl_ProgressBox.h \
+		Fl_StatusPanel.h Flv_CStyle.H Flv_List.H Flv_Style.H \
+		Flv_Table.H Flve_Check_Button.H Flve_Combo.H Flve_Input.H \
+		editor.h math.h strings.h vartypes.h wstrings.h
+NEW_FILES=	Fl_Editor.H editengine.h
+
+post-extract: remove-inc
+
+remove-inc:
+.for file in ${OLD_FILES}
+	@${RM} -f ${WRKSRC}/FL/${file}
+.endfor
+
+pre-patch: copy-inc
+
+copy-inc:
+.for file in ${NEW_FILES}
+	@${CP} ${PREFIX}/include/FL/${file} ${WRKSRC}/FL/
+.endfor
+
+.include <bsd.port.mk>
diff --git a/databases/mysql-gui/distinfo b/databases/mysql-gui/distinfo
new file mode 100644
index 000000000000..2fa0d3f7f9f5
--- /dev/null
+++ b/databases/mysql-gui/distinfo
@@ -0,0 +1 @@
+MD5 (mysqlgui-1.7.5.tar.gz) = 94781b272263abb5fdfe6a429b4aead8
diff --git a/databases/mysql-gui/files/patch-FL-Fl_Editor.H b/databases/mysql-gui/files/patch-FL-Fl_Editor.H
new file mode 100644
index 000000000000..f2fe5cdea533
--- /dev/null
+++ b/databases/mysql-gui/files/patch-FL-Fl_Editor.H
@@ -0,0 +1,10 @@
+--- FL/Fl_Editor.H.orig	Sat Aug 18 18:19:48 2001
++++ FL/Fl_Editor.H	Sat Aug 18 17:32:18 2001
+@@ -186,6 +186,7 @@
+ 	Fl_Color textcolor() const { return(Fl_Color)textcolor_; }
+ 	void textcolor(uchar n) { textcolor_ = n; }
+ 	void LoadFrom(FILE *file) { engine->LoadFrom(file); ShowCursor(CURSOR_UNHIDE); SyncDisplay(); }
++	void LoadSQL (const char *query) { engine->LoadSQL(query); ShowCursor(CURSOR_UNHIDE); SyncDisplay(); }
+ 	void SaveTo(FILE *file) { engine->SaveTo(file); }
+ 	void LoadFrom(const char *buffer) { engine->LoadFrom(buffer); ShowCursor(CURSOR_UNHIDE); SyncDisplay(); }
+ 	void SaveTo(char *buffer) { engine->SaveTo(buffer); }
diff --git a/databases/mysql-gui/files/patch-FL-editengine.h b/databases/mysql-gui/files/patch-FL-editengine.h
new file mode 100644
index 000000000000..1fc0d512fd58
--- /dev/null
+++ b/databases/mysql-gui/files/patch-FL-editengine.h
@@ -0,0 +1,10 @@
+--- FL/editengine.h.orig	Sat Aug 18 18:19:59 2001
++++ FL/editengine.h	Sat Aug 18 17:12:48 2001
+@@ -113,6 +113,7 @@
+   rclError SetTabs(short *tabs);
+   rclError ChangeWidth(short newwidth)      { Width = newwidth; return Command(REFORMAT,(long)newwidth); };
+   rclError LoadFrom(const char *buffer);
++  rclError LoadSQL(const char *query);
+   rclError SaveTo(char *buffer);
+   rclError LoadFrom(FILE *infile);
+   rclError SaveTo(FILE *outfile);
diff --git a/databases/mysql-gui/files/patch-Makefile b/databases/mysql-gui/files/patch-Makefile
new file mode 100644
index 000000000000..650f4728a62f
--- /dev/null
+++ b/databases/mysql-gui/files/patch-Makefile
@@ -0,0 +1,74 @@
+--- Makefile.orig	Wed Apr 11 21:12:20 2001
++++ Makefile	Sun Aug 19 03:41:52 2001
+@@ -1,27 +1,51 @@
+ # --------------------- M a c r o s -------------------------------
+-CC          = gcc
+-CXX         = g++
+-#CFLAGS = -O0 -g -pipe -fno-default-inline
+-CFLAGS      = -O3 -g -pipe -fforce-mem -fforce-addr
+-#CFLAGS = -g -pipe
+-#CFLAGS      =  -c -O2 -fstrength-reduce -finline-functions 
+-INCLUDE1    = -I. -I../mysql++-1.7/sqlplusint -I/usr/local/include/mysql 
+-LIBS =  -L. -L/usr/X11R6/lib -lrcl -lrcledit -lsqlplus /usr/local/lib/mysql/libmysqlclient.a -lm -lflvw  -lfltk -lXext -ljpeg 
+-#LIBS = -L. -L/usr/X11R6/lib -lrcl -lrcledit /home/Sinisa/guiclient/libsqlplus.a /usr/local/lib/mysql/libmysqlclient.a -lfltk /usr/X11R6/lib/libXext.a /usr/X11R6/lib/libX11.a /usr/lib/libstdc++.a /usr/lib/libm.a /usr/lib/libc.a xx.o
+-OBJS =  edfile.o about.o db_tree.o Fl_NSlider.o getvars.o qsort.o queries.o bebac.o main.o do_sql.o tables.o dodatni.o status.o process.o grant.o password.o get_table.o admin.o  single.o zoom.o sin_jpeg.o jmemsrc.o options.o Fl_File_Dialog.o Fl_Dir.o Fl_Input_File.o Fl_Toggle_Tree.o Fl_Toggle_Node.o Fl_Toggle_Tree_Base.o Fl_Toggle_Node_Base.o Animated_Icon.o  Fl_Help.o Fl_Envelope.o Fl_Envelope_Scroll.o Selection.o gif.o 
++
++PREFIX?=	/usr/X11R6
++LOCALBASE?=	/usr/local
++X11BASE?=	/usr/X11R6
++BSD_INSTALL_PROGRAM?= install -C -c -s -o root -g wheel -m 555
++PTHREAD_CFLAGS?= -D_THREAD_SAFE
++PTHREAD_LIBS?=	-pthread
++CPPFLAGS=	${PTHREAD_CFLAGS} \
++		-I. \
++		-I${LOCALBASE}/include \
++		-I${LOCALBASE}/include/mysql \
++		-I${X11BASE}/include
++LDFLAGS=	-L${LOCALBASE}/lib \
++		-L${LOCALBASE}/lib/mysql \
++		-L${X11BASE}/lib
++LIBS=		-lsqlplus -lmysqlclient -lfleditor -lflvw -lfltk \
++		-ljpeg -lGLU -lGL -lXext -lX11 -lintl -lm -lz ${PTHREAD_LIBS}
++
++TARGET=		mysqlgui
++OBJS =		Fl_Dir.o Fl_Envelope.o Fl_Envelope_Scroll.o \
++		Fl_File_Dialog.o Fl_Help.o Fl_Input_File.o \
++		Fl_NSlider.o Fl_Toggle_Node.o Fl_Toggle_Node_Base.o \
++		Fl_Toggle_Tree.o Fl_Toggle_Tree_Base.o \
++		Animated_Icon.o Selection.o \
++		about.o admin.o bebac.o db_tree.o do_sql.o \
++		dodatni.o get_table.o getvars.o gif.o grant.o \
++		jmemsrc.o main.o options.o password.o process.o \
++		qsort.o queries.o sin_jpeg.o single.o status.o \
++		tables.o zoom.o
+ 
+ # --------------------  R u l e s ---------------------------------
+-default: all
+-all:        mysqlgui
++
++all:        $(TARGET)
++
++install:	$(TARGET)
++	${BSD_INSTALL_PROGRAM} $(TARGET) ${PREFIX}/bin
++
+ clean : 
+-	/bin/rm *.o mysqlgui
++	rm -f *.o
+ 
++clobber: clean
++	rm -f $(TARGET)
+ 
+-mysqlgui: $(OBJS)
+-#	$(CC) $(OBJS) $(LIBS) -o mysqlgui  "-Wl,-rpath,../mysql++-1.7/sqlplusint/.libs"
+-	$(CXX)  -o mysqlgui $(OBJS) $(LIBS) /usr/lib/libz.a
++$(TARGET): $(OBJS)
++	$(CXX) $(LDFLAGS) -o mysqlgui $(OBJS) $(LIBS)
+ 
+-%.o : %.cc
+-	$(CXX) $(CFLAGS) $(INCLUDE1) -c $<
+-%.o : %.c
+-	gcc $(CFLAGS) $(INCLUDE1) -c $<
++.c.o:
++	${CC} ${CFLAGS} ${CPPFLAGS} -c $<
++.cc.o:
++	${CXX} ${CXXFLAGS} ${CPPFLAGS} -c $<
diff --git a/databases/mysql-gui/files/patch-dodatni.cc b/databases/mysql-gui/files/patch-dodatni.cc
new file mode 100644
index 000000000000..a016648b4686
--- /dev/null
+++ b/databases/mysql-gui/files/patch-dodatni.cc
@@ -0,0 +1,9 @@
+--- dodatni.cc.orig	Sat Aug 18 18:18:15 2001
++++ dodatni.cc	Sat Aug 18 09:51:00 2001
+@@ -1,5 +1,6 @@
+ // generated by Fast Light User Interface Designer (fluid) version 1.00
+ #include "bebac.h"
++#include <stdarg.h>
+ #ifdef __WIN32__
+ extern "C" {
+ #define errno WSAGetLastError()
diff --git a/databases/mysql-gui/files/patch-main.cc b/databases/mysql-gui/files/patch-main.cc
new file mode 100644
index 000000000000..5469c1db5ca6
--- /dev/null
+++ b/databases/mysql-gui/files/patch-main.cc
@@ -0,0 +1,20 @@
+--- main.cc.orig	Sat Aug 18 18:18:16 2001
++++ main.cc	Sat Aug 18 09:57:03 2001
+@@ -461,7 +461,7 @@
+ }
+ 
+ static void if_conn (void) {
+-  unsigned int j = 0, counter = 0;  c_info=con->clinet_info(); s_info=con->server_info();
++  unsigned int j = 0, counter = 0;  c_info=con->client_info(); s_info=con->server_info();
+   try {
+ 		Query query = con->query(); if (ldb) {ddd=(string)ldb; ldb=(char*)ddd.c_str();}
+     query << "show databases";
+@@ -526,7 +526,7 @@
+ 			tables.insert(tables.end(),xx);
+ 		}
+ 		qSortHelp (0, (size_t) tables.size(), Fcmp, Exchange); 	
+-		ldb = (char *)databases[j].c_str(); c_info=con->clinet_info(); s_info=con->server_info();
++		ldb = (char *)databases[j].c_str(); c_info=con->client_info(); s_info=con->server_info();
+ 		b_connect->set();    down_group->activate();  query_browser->activate();
+ 		if (databases.size()) choice_db->activate();  choice_db->redraw(); 
+ 		; if (query_menus) hier->activate();
diff --git a/databases/mysql-gui/files/patch-single.cc b/databases/mysql-gui/files/patch-single.cc
new file mode 100644
index 000000000000..595b52f2f999
--- /dev/null
+++ b/databases/mysql-gui/files/patch-single.cc
@@ -0,0 +1,20 @@
+--- single.cc.orig	Sat Aug 18 18:18:16 2001
++++ single.cc	Sat Aug 18 18:17:24 2001
+@@ -1,16 +1,13 @@
+ // generated by Fast Light User Interface Designer (fluid) version 1.00
+-
+ #include <client.h>
+ #include <sqlplus.hh>
++#undef Time
+ //
+ //	This file implements the file I/O routines for the editor engine.
+ //	These are simple ASCII I/O routines, just for getting text out of
+ //	a file, or putting it into one.
+ //
+ #include "single.h"
+-#include <FL/vartypes.h>
+-#include <FL/strings.h>
+-#include <FL/editor.h>
+ 
+ extern Connection *con;
+ 
diff --git a/databases/mysql-gui/pkg-comment b/databases/mysql-gui/pkg-comment
new file mode 100644
index 000000000000..c13e1bb1c963
--- /dev/null
+++ b/databases/mysql-gui/pkg-comment
@@ -0,0 +1 @@
+A graphical SQL client for MySQL
diff --git a/databases/mysql-gui/pkg-descr b/databases/mysql-gui/pkg-descr
new file mode 100644
index 000000000000..28a07d49eb7f
--- /dev/null
+++ b/databases/mysql-gui/pkg-descr
@@ -0,0 +1,3 @@
+A graphical SQL client for MySQL.
+
+WWW: http://www.mysql.com/downloads/gui-mysqlgui.html
diff --git a/databases/mysql-gui/pkg-plist b/databases/mysql-gui/pkg-plist
new file mode 100644
index 000000000000..3a2f992e108d
--- /dev/null
+++ b/databases/mysql-gui/pkg-plist
@@ -0,0 +1,2 @@
+@comment $FreeBSD$
+bin/mysqlgui