mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-28 10:08:24 +00:00
Code Issues Releases Activity

- Fix patching

Browse Source 
- Fix build on 4.x
- Add patches to build on 5.x from edwin
  Note this does not build on 5.x, my C++ fu is not good enough to overcome
  iterator usage in admin.cc. Patches are welcomed.

PR:		ports/47862
Submitted by:	Cyrille Lefevre <cyrille.lefevre@laposte.net> (maintainer)
This commit is contained in:
Pav Lucistnik 2003-12-14 18:03:48 +00:00
parent c36bd24ce7
commit e4b8424f33
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=95806
19 changed files with 207 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
databases/mysql-gui/Makefile
View File

@ -7,33 +7,27 @@
PORTNAME= mysql-gui
PORTVERSION= 1.7.5
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= databases
MASTER_SITES= http://www.mysql.com/Downloads/%SUBDIR%/ \
ftp://mysql.nixc.net/pub/mysql/Downloads/%SUBDIR%/ \
ftp://sunsite.dk/ftp/mirrors/mysql/Downloads/%SUBDIR%/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/%SUBDIR%/
MASTER_SITES= http://mysql.ftp.cvut.cz/Downloads/%SUBDIR%/ \
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/%SUBDIR%/ \
http://mysql.he.net/Downloads/%SUBDIR%/
MASTER_SITE_SUBDIR= mysqlgui
DISTNAME= ${PORTNAME:S/-//}-${PORTVERSION}
MAINTAINER= cyrille.lefevre@laposte.net
COMMENT= A graphical SQL client for MySQL
BROKEN= Does not patch
# Global variables
#
LIB_DEPENDS= sqlplus.1:${PORTSDIR}/databases/mysql++ \
intl.5:${PORTSDIR}/devel/gettext \
glut.3:${PORTSDIR}/graphics/libglut \
jpeg.9:${PORTSDIR}/graphics/jpeg \
fleditor.1:${PORTSDIR}/x11-toolkits/fl_editor \
flvw.1:${PORTSDIR}/x11-toolkits/flvw
PATCH_DEPENDS= ${X11BASE}/include/FL/Fl_Editor.H:${PORTSDIR}/x11-toolkits/fl_editor
USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_MESA= yes
WRKSRC= ${WRKDIR}/${DISTNAME:S/-/-src-/}
MAKE_ARGS= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
@ -47,6 +41,12 @@ OLD_FILES= Fl_Editor.h Fl_FancyEditor.h Fl_ProgressBox.h \
editor.h math.h strings.h vartypes.h wstrings.h
NEW_FILES= Fl_Editor.H editengine.h
.include <bsd.port.pre.mk>
.if (${OSVERSION} >= 500000)
BROKEN= Does not build
.endif
# Post-extract
#
@ -66,7 +66,7 @@ pre-patch: copy-inc
copy-inc:
.for file in ${NEW_FILES}
@${CP} ${PREFIX}/include/FL/${file} ${WRKSRC}/FL/
@${CP} ${X11BASE}/include/FL/${file} ${WRKSRC}/FL/
.endfor
.include <bsd.port.mk>
.include <bsd.port.post.mk>

11
databases/mysql-gui/files/patch-Animated_Icon.cc Normal file
View File

@ -0,0 +1,11 @@
--- Animated_Icon.cc.orig Wed Sep 3 19:04:06 2003
+++ Animated_Icon.cc Wed Sep 3 19:04:14 2003
@@ -1,7 +1,7 @@
#include <FL/Fl.H>
#include <FL/Animated_Icon.h>
-Animated_Icon::Animated_Icon(int x, int y, int w, int h, const char *l = 0) :
+Animated_Icon::Animated_Icon(int x, int y, int w, int h, const char *l) :
Fl_Box(x, y, w, h, l)
{
first = current = 0;

10
databases/mysql-gui/files/patch-FL-Fl_Editor.H
View File

@ -1,10 +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/Fl_Editor.H.orig Mon Feb 3 01:53:09 2003
+++ FL/Fl_Editor.H Mon Feb 3 02:04:37 2003
@@ -210,6 +210,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 LoadFrom(FILE *file) { engine->LoadFrom(file); engine->Command(MOVE_BOF); SyncDisplay(); ShowCursor(CURSOR_UNHIDE); }
+ 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 LoadFrom(const char *buffer) { engine->LoadFrom(buffer); SyncDisplay(); ShowCursor(CURSOR_UNHIDE); }
void SaveTo(char *buffer) { engine->SaveTo(buffer); }

11
databases/mysql-gui/files/patch-FL-Selection.H Normal file
View File

@ -0,0 +1,11 @@
--- FL/Selection.H.orig Wed Sep 3 19:03:20 2003
+++ FL/Selection.H Wed Sep 3 19:03:27 2003
@@ -17,7 +17,7 @@
private:
class SelectionRange
{
- friend Selection;
+ friend class Selection;
private:
int mFrom;
int mTo;

10
databases/mysql-gui/files/patch-Fl_NSlider.cc Normal file
View File

@ -0,0 +1,10 @@
--- Fl_NSlider.cc.orig Mon Feb 3 02:17:30 2003
+++ Fl_NSlider.cc Mon Feb 3 02:16:37 2003
@@ -9,6 +9,7 @@
* provided "as is" without express or implied warranty.
*/
#include <FL/Fl_NSlider.H>
+#include <FL/Fl_Group.H>
static uchar isHoz = 0; //for image draw setup
static uchar r1, g1, b1; //for color ramp

10
databases/mysql-gui/files/patch-Makefile
View File

@ -1,6 +1,6 @@
--- Makefile.orig Wed Apr 11 21:12:20 2001
+++ Makefile Sun Aug 19 03:41:52 2001
@@ -1,27 +1,51 @@
+++ Makefile Mon Feb 3 18:19:49 2003
@@ -1,27 +1,53 @@
# --------------------- M a c r o s -------------------------------
-CC = gcc
-CXX = g++
@ -19,7 +19,8 @@
+BSD_INSTALL_PROGRAM?= install -C -c -s -o root -g wheel -m 555
+PTHREAD_CFLAGS?= -D_THREAD_SAFE
+PTHREAD_LIBS?= -pthread
+CPPFLAGS= ${PTHREAD_CFLAGS} \
+CPPFLAGS+= ${PTHREAD_CFLAGS} \
+ -DFLTK_1_0_COMPAT \
+ -I. \
+ -I${LOCALBASE}/include \
+ -I${LOCALBASE}/include/mysql \
@ -28,7 +29,8 @@
+ -L${LOCALBASE}/lib/mysql \
+ -L${X11BASE}/lib
+LIBS= -lsqlplus -lmysqlclient -lfleditor -lflvw -lfltk \
+ -ljpeg -lGLU -lGL -lXext -lX11 -lintl -lm -lz ${PTHREAD_LIBS}
+ -ljpeg -lGLU -lGL -lXext -lX11 -lintl -lm -lz ${PTHREAD_LIBS} \
+ -lcipher
+
+TARGET= mysqlgui
+OBJS = Fl_Dir.o Fl_Envelope.o Fl_Envelope_Scroll.o \

10
databases/mysql-gui/files/patch-about.cc Normal file
View File

@ -0,0 +1,10 @@
--- about.cc.orig Wed Sep 3 19:04:33 2003
+++ about.cc Wed Sep 3 19:04:46 2003
@@ -11,6 +11,7 @@
#include <stdio.h>
#endif
#include <string>
+using namespace std;
extern string c_info,s_info;
static Fl_Double_Window *xxx=(Fl_Double_Window *)0;
Fl_Window *splash=(Fl_Window *)0;

10
databases/mysql-gui/files/patch-bebac.h Normal file
View File

@ -0,0 +1,10 @@
--- bebac.h.orig Wed Apr 11 21:12:19 2001
+++ bebac.h Mon Feb 3 02:28:44 2003
@@ -5,6 +5,7 @@
#include <FL/Fl.H>
#include <FL/Fl_Double_Window.H>
#include "client.h"
+#undef Success
#include <mysql++>
extern Connection *con;
extern void do_exit(Fl_Double_Window*, void*);

10
databases/mysql-gui/files/patch-client.h Normal file
View File

@ -0,0 +1,10 @@
--- client.h.orig Wed Sep 3 19:05:06 2003
+++ client.h Wed Sep 3 19:05:21 2003
@@ -45,6 +45,7 @@
typedef long ssize_t;
#endif
#include <vector>
+using namespace std;
class store_query {
public:

9
databases/mysql-gui/files/patch-db_tree.cc Normal file
View File

@ -0,0 +1,9 @@
--- db_tree.cc.orig Wed Apr 11 21:12:19 2001
+++ db_tree.cc Mon Feb 3 02:32:09 2003
@@ -28,6 +28,7 @@
#endif
#include <iomanip>
#include <string>
+#undef Success
#include <sqlplus.hh>
#include "client.h"

25
databases/mysql-gui/files/patch-do_sql.cc Normal file
View File

@ -0,0 +1,25 @@
--- do_sql.cc.orig Wed Apr 11 12:12:19 2001
+++ do_sql.cc Thu Sep 4 02:17:56 2003
@@ -1,3 +1,5 @@
+#include <FL/Enumerations.H>
+#undef frame
#include <FL/Flv_Table.H>
#include <FL/Flve_Input.H>
#include <FL/Fl_Window.H>
@@ -5,10 +7,15 @@
#include <FL/Fl_Pixmap.H>
#include <FL/Fl_Check_Button.H>
#include <FL/Fl_Round_Button.H>
+#define filename_setext fl_filename_setext
#include "bebac.h"
#include <sqlplus.hh>
#include <ctype.h>
-extern string real_sql; extern enum ios::open_mode how_to_open; extern char *pass;
+#include <iostream>
+using namespace std;
+extern string real_sql;
+extern enum ios::open_mode how_to_open;
+extern char *pass;
#define depth 18
#define minmin 5
#define fontsize 14

10
databases/mysql-gui/files/patch-get_table.cc Normal file
View File

@ -0,0 +1,10 @@
--- get_table.cc.orig Wed Apr 11 21:12:25 2001
+++ get_table.cc Mon Feb 3 03:40:34 2003
@@ -1,6 +1,7 @@
// generated by Fast Light User Interface Designer (fluid) version 1.00
#include <FL/Fl_Menu_.H>
#include "get_table.h"
+#undef Success
#include <sqlplus.hh>
#include "client.h"
#include <FL/Fl_Pixmap.H>

17
databases/mysql-gui/files/patch-gif.cc Normal file
View File

@ -0,0 +1,17 @@
--- gif.cc.orig Wed Apr 11 21:12:24 2001
+++ gif.cc Mon Feb 3 03:46:27 2003
@@ -107,11 +107,11 @@
box(FL_NO_BOX); end(); show();
}
~gif_window () {
- if (p && p->data) {
- char** real_data = (char**)(p->data);
+ if (p && p->alloc_data) {
+ char** real_data = (char**)(p->alloc_data);
for (int i = 0; i < 3; i++) delete[] real_data[i];
delete[] real_data;
- p->data = 0; delete p; p = 0;
+ p->alloc_data = 0; delete p; p = 0;
}
if (linelength) free((void*)linelength);
}

10
databases/mysql-gui/files/patch-grant.cc Normal file
View File

@ -0,0 +1,10 @@
--- grant.cc.orig Wed Apr 11 21:12:24 2001
+++ grant.cc Mon Feb 3 03:47:34 2003
@@ -23,6 +23,7 @@
#endif
#include <iomanip>
#include <string>
+#undef Success
#include <sqlplus.hh>
#define REFRESH_GRANT 1 /* Refresh grant tables */

22
databases/mysql-gui/files/patch-main.cc
View File

@ -1,6 +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 @@
--- main.cc.orig Wed Apr 11 21:12:20 2001
+++ main.cc Sun Dec 14 18:17:33 2003
@@ -1,3 +1,4 @@
+#define filename_setext fl_filename_setext
#include "bebac.h"
#include "qsort.h"
#include "komande.h"
@@ -18,7 +19,7 @@
extern "C" {
char *intern_filename(char *,const char *); extern char *home_dir;
char *fn_format(char *to,const char *name,const char *dsk,const char *form,int flag);
- void load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv);
+ int load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv);
void free_defaults(char **argv);
void mysql_read_default_options(struct st_mysql_options *options, const char *filename,const char *group);
int strcasecmp(const char *,const char *);
@@ -461,7 +462,7 @@
}
static void if_conn (void) {
@ -9,7 +23,7 @@
try {
Query query = con->query(); if (ldb) {ddd=(string)ldb; ldb=(char*)ddd.c_str();}
query << "show databases";
@@ -526,7 +526,7 @@
@@ -526,7 +527,7 @@
tables.insert(tables.end(),xx);
}
qSortHelp (0, (size_t) tables.size(), Fcmp, Exchange);

10
databases/mysql-gui/files/patch-password.cc Normal file
View File

@ -0,0 +1,10 @@
--- password.cc.orig Wed Apr 11 21:12:25 2001
+++ password.cc Mon Feb 3 03:58:35 2003
@@ -1,6 +1,7 @@
// generated by Fast Light User Interface Designer (fluid) version 1.00
#include <FL/Fl_Menu_.H>
#include "password.h"
+#undef Success
#include <sqlplus.hh>
#include "client.h"
#include <FL/Fl_Pixmap.H>

10
databases/mysql-gui/files/patch-process.cc Normal file
View File

@ -0,0 +1,10 @@
--- process.cc.orig Wed Apr 11 21:12:24 2001
+++ process.cc Mon Feb 3 04:00:41 2003
@@ -1,6 +1,7 @@
// generated by Fast Light User Interface Designer (fluid) version 1.00
#include "process.h"
+#undef Success
#include <sqlplus.hh>
extern char *pass; extern int w7_x, w7_y, server_version; extern Connection *con;
#include <FL/Fl_Pixmap.H>

8
databases/mysql-gui/files/patch-single.cc
View File

@ -1,9 +1,10 @@
--- single.cc.orig Sat Aug 18 18:18:16 2001
+++ single.cc Sat Aug 18 18:17:24 2001
@@ -1,16 +1,13 @@
--- single.cc.orig Wed Apr 11 21:12:23 2001
+++ single.cc Mon Feb 3 04:05:55 2003
@@ -1,16 +1,14 @@
// generated by Fast Light User Interface Designer (fluid) version 1.00
-
#include <client.h>
+#undef Success
#include <sqlplus.hh>
+#undef Time
//
@ -17,4 +18,3 @@
-#include <FL/editor.h>
extern Connection *con;

8
databases/mysql-gui/files/patch-status.cc Normal file
View File

@ -0,0 +1,8 @@
--- status.cc.orig Wed Apr 11 21:12:24 2001
+++ status.cc Mon Feb 3 04:10:54 2003
@@ -1,4 +1,5 @@
#include "status.h"
+#undef Success
#include <sqlplus.hh>
extern char *pass; extern int w8_x, w8_y;
#include <FL/Fl_Pixmap.H>