From owner-freebsd-ports-bugs Mon Feb 3 9:20:33 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B085337B413 for ; Mon, 3 Feb 2003 09:20:16 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08F8243FA7 for ; Mon, 3 Feb 2003 09:20:10 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h13HKANS009391 for ; Mon, 3 Feb 2003 09:20:10 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h13HKArL009390; Mon, 3 Feb 2003 09:20:10 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C033337B401 for ; Mon, 3 Feb 2003 09:17:33 -0800 (PST) Received: from smtp.noos.fr (nan-smtp-04.noos.net [212.198.2.73]) by mx1.FreeBSD.org (Postfix) with ESMTP id 903D243F93 for ; Mon, 3 Feb 2003 09:17:32 -0800 (PST) (envelope-from root@gits.dyndns.org) Received: (qmail 21806305 invoked by uid 0); 3 Feb 2003 17:17:30 -0000 Received: from unknown (HELO mail.gits.dyndns.org) ([212.198.231.27]) (envelope-sender ) by 212.198.2.73 (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 3 Feb 2003 17:17:30 -0000 Received: from mail.gits.dyndns.org (qhs7fnhli587yvwz@localhost [127.0.0.1]) by mail.gits.dyndns.org (8.12.6/8.12.6) with ESMTP id h13HHO94086998; Mon, 3 Feb 2003 18:17:24 +0100 (CET) (envelope-from root@gits.dyndns.org) Received: (from root@localhost) by mail.gits.dyndns.org (8.12.6/8.12.6/Submit) id h13HHOdH086997; Mon, 3 Feb 2003 18:17:24 +0100 (CET) (envelope-from root) Message-Id: <200302031717.h13HHOdH086997@mail.gits.dyndns.org> Date: Mon, 3 Feb 2003 18:17:24 +0100 (CET) From: Cyrille Lefevre Reply-To: Cyrille Lefevre To: FreeBSD-gnats-submit@FreeBSD.org Cc: Albert X-Send-Pr-Version: 3.113 Subject: ports/47862: Maintainer update: databases/mysql-gui (build fix) Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 47862 >Category: ports >Synopsis: Maintainer update: databases/mysql-gui (build fix) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Feb 03 09:20:10 PST 2003 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 4.7-STABLE i386 >Organization: ACME >Environment: System: FreeBSD gits 4.7-STABLE FreeBSD 4.7-STABLE #32: Thu Jan 23 00:09:17 CET 2003 root@gits:/disk2/freebsd/stable/src/sys/compile/CUSTOM i386 >Description: mysqlgui doesn't build anymore. this PR fix the build. please, commit x11-toolkits/fl_editor and x11-toolkits/flvw PRs before to commit this one. thanks in advance. Makefile PORTREVISION bumped files/patch-FL-Fl_Editor.H files/patch-Makefile files/patch-main.cc files/patch-single.cc updated files files/patch-Fl_NSlider.cc files/patch-admin.h files/patch-bebac.h files/patch-db_tree.cc files/patch-do_sql.cc files/patch-get_table.cc files/patch-gif.cc files/patch-grant.cc files/patch-password.cc files/patch-process.cc files/patch-status.cc new files >How-To-Repeat: cd /usr/ports/databases/mysql-gui; make >Fix: take care, this patch set is in two parts. the first one is a diff against /dev/null and the second one a cvs diff. -----=====-----====----- diff /dev/null -----=====-----====----- --- /dev/null Mon Feb 3 17:15:49 2003 +++ files/patch-Fl_NSlider.cc Mon Feb 3 02:18:11 2003 @@ -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 ++#include + + static uchar isHoz = 0; //for image draw setup + static uchar r1, g1, b1; //for color ramp --- /dev/null Mon Feb 3 17:15:49 2003 +++ files/patch-admin.h Mon Feb 3 02:23:14 2003 @@ -0,0 +1,10 @@ +--- admin.h.orig Wed Apr 11 21:12:25 2001 ++++ admin.h Mon Feb 3 02:23:04 2003 +@@ -10,6 +10,7 @@ + #include + #include + #include ++#undef Success + #include + extern Connection *con; + extern void do_process_b(Fl_Button*, void*); --- /dev/null Mon Feb 3 17:15:49 2003 +++ files/patch-bebac.h Mon Feb 3 02:29:26 2003 @@ -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 + #include + #include "client.h" ++#undef Success + #include + extern Connection *con; + extern void do_exit(Fl_Double_Window*, void*); --- /dev/null Mon Feb 3 17:15:49 2003 +++ files/patch-db_tree.cc Mon Feb 3 02:32:41 2003 @@ -0,0 +1,10 @@ +--- 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 + #include ++#undef Success + #include + #include "client.h" + --- /dev/null Mon Feb 3 17:15:49 2003 +++ files/patch-do_sql.cc Mon Feb 3 04:27:44 2003 @@ -0,0 +1,16 @@ +--- do_sql.cc.orig Wed Apr 11 21:12:19 2001 ++++ do_sql.cc Mon Feb 3 04:27:06 2003 +@@ -1,3 +1,5 @@ ++#include ++#undef frame + #include + #include + #include +@@ -5,6 +7,7 @@ + #include + #include + #include ++#define filename_setext fl_filename_setext + #include "bebac.h" + #include + #include --- /dev/null Mon Feb 3 17:15:49 2003 +++ files/patch-get_table.cc Mon Feb 3 03:49:57 2003 @@ -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 + #include "get_table.h" ++#undef Success + #include + #include "client.h" + #include --- /dev/null Mon Feb 3 17:15:49 2003 +++ files/patch-gif.cc Mon Feb 3 03:46:45 2003 @@ -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); + } --- /dev/null Mon Feb 3 17:15:49 2003 +++ files/patch-grant.cc Mon Feb 3 03:47:51 2003 @@ -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 + #include ++#undef Success + #include + + #define REFRESH_GRANT 1 /* Refresh grant tables */ --- /dev/null Mon Feb 3 17:15:49 2003 +++ files/patch-password.cc Mon Feb 3 03:58:47 2003 @@ -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 + #include "password.h" ++#undef Success + #include + #include "client.h" + #include --- /dev/null Mon Feb 3 17:15:49 2003 +++ files/patch-process.cc Mon Feb 3 04:00:55 2003 @@ -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 + extern char *pass; extern int w7_x, w7_y, server_version; extern Connection *con; + #include --- /dev/null Mon Feb 3 17:15:49 2003 +++ files/patch-status.cc Mon Feb 3 04:11:23 2003 @@ -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 + extern char *pass; extern int w8_x, w8_y; + #include -----=====-----====----- cvs diff -----=====-----====----- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/databases/mysql-gui/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- Makefile 1 Aug 2002 16:22:05 -0000 1.8 +++ Makefile 3 Feb 2003 16:58:45 -0000 @@ -7,7 +7,7 @@ PORTNAME= mysql-gui PORTVERSION= 1.7.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://www.mysql.com/Downloads/%SUBDIR%/ \ ftp://mysql.nixc.net/pub/mysql/Downloads/%SUBDIR%/ \ Index: files/patch-FL-Fl_Editor.H =================================================================== RCS file: /home/ncvs/ports/databases/mysql-gui/files/patch-FL-Fl_Editor.H,v retrieving revision 1.1 diff -u -r1.1 patch-FL-Fl_Editor.H --- files/patch-FL-Fl_Editor.H 3 Sep 2001 18:54:20 -0000 1.1 +++ files/patch-FL-Fl_Editor.H 3 Feb 2003 01:05:24 -0000 @@ -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); } Index: files/patch-Makefile =================================================================== RCS file: /home/ncvs/ports/databases/mysql-gui/files/patch-Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-Makefile --- files/patch-Makefile 3 Sep 2001 18:54:20 -0000 1.1 +++ files/patch-Makefile 3 Feb 2003 16:58:20 -0000 @@ -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 17:57:41 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} \ ++CFLAGS+= -DFLTK_1_0_COMPAT ++CPPFLAGS+= ${PTHREAD_CFLAGS} \ + -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 \ Index: files/patch-main.cc =================================================================== RCS file: /home/ncvs/ports/databases/mysql-gui/files/patch-main.cc,v retrieving revision 1.1 diff -u -r1.1 patch-main.cc --- files/patch-main.cc 3 Sep 2001 18:54:20 -0000 1.1 +++ files/patch-main.cc 3 Feb 2003 02:53:48 -0000 @@ -1,6 +1,11 @@ ---- 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 Mon Feb 3 03:53:01 2003 +@@ -1,3 +1,4 @@ ++#define filename_setext fl_filename_setext + #include "bebac.h" + #include "qsort.h" + #include "komande.h" +@@ -461,7 +462,7 @@ } static void if_conn (void) { @@ -9,7 +14,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); Index: files/patch-single.cc =================================================================== RCS file: /home/ncvs/ports/databases/mysql-gui/files/patch-single.cc,v retrieving revision 1.1 diff -u -r1.1 patch-single.cc --- files/patch-single.cc 3 Sep 2001 18:54:20 -0000 1.1 +++ files/patch-single.cc 3 Feb 2003 03:07:27 -0000 @@ -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 ++#undef Success #include +#undef Time // -----=====-----====----- eof -----=====-----====----- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message