Remove xmysql. Old long unmaintained cruft that does not build with modern

MySQL.

ok sthen@
This commit is contained in:
brad 2013-03-27 11:35:51 +00:00
parent be91d058db
commit f64fc1c8e0
9 changed files with 1 additions and 148 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.238 2013/03/26 05:28:30 jmatthew Exp $
# $OpenBSD: Makefile,v 1.239 2013/03/27 11:35:51 brad Exp $
SUBDIR =
SUBDIR += apache-couchdb
@ -246,6 +246,5 @@
SUBDIR += tdbc-sqlite3
SUBDIR += tinycdb
SUBDIR += xapian-core
SUBDIR += xmysql
.include <bsd.port.subdir.mk>

View File

@ -1,22 +0,0 @@
# $OpenBSD: Makefile,v 1.33 2013/03/11 02:52:09 espie Exp $
COMMENT= X11 front end to the MySQL database engine
DISTNAME= xmysql-1.10
REVISION = 3
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_BACKUP}
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= GL X11 Xext Xpm c m
LIB_DEPENDS= x11/xforms \
databases/mysql \
graphics/jpeg
WANTLIB += forms mysqlclient>=10 jpeg>=62
NO_TEST= Yes
.include <bsd.port.mk>

View File

@ -1,5 +0,0 @@
MD5 (xmysql-1.10.tar.gz) = c0WPu/sVmOp/oZX+ndwYTw==
RMD160 (xmysql-1.10.tar.gz) = BlW6yTVWfHk/pMitpl7ZDNvm8Ms=
SHA1 (xmysql-1.10.tar.gz) = JBhgssRVD3CsvX72zzJ8td9AO3g=
SHA256 (xmysql-1.10.tar.gz) = 6pIf6yNdY8CWyHSzlHgq56JC5JjyranTltkJp+zjfxo=
SIZE (xmysql-1.10.tar.gz) = 187321

View File

@ -1,68 +0,0 @@
$OpenBSD: patch-Makefile,v 1.6 2003/02/02 22:22:38 margarida Exp $
--- Makefile.orig Wed Nov 18 04:19:06 1998
+++ Makefile Sun Feb 2 22:08:06 2003
@@ -31,24 +31,23 @@
PROGRAM = xmysql
# PROGRAM install path
-INSTALLPATH = /usr/local/xmysql-1.10
+INSTALLPATH = ${PREFIX}/bin
# pixmap location
-XMYSQL_XPMPATH = /usr/local/xmysql-1.10
+XMYSQL_XPMPATH = ${PREFIX}/include/X11/pixmaps
# help path
-XMYSQL_HELPPATH = /usr/local/xmysql-1.10
+XMYSQL_HELPPATH = ${PREFIX}/lib/X11/xmysql
# Compilation Details
-CC = gcc
-STDCFLAGS = -g -c -O2 -Wall -DXMYSQL_XPMPATH=\"$(XMYSQL_XPMPATH)\" -DXMYSQL_HELPPATH=\"$(XMYSQL_HELPPATH)\"
+STDCFLAGS = $(CFLAGS) -DXMYSQL_XPMPATH=\"$(XMYSQL_XPMPATH)\" -DXMYSQL_HELPPATH=\"$(XMYSQL_HELPPATH)\"
STDLFLAGS =
-MYSQLINC = -I/usr/include/mysql
-MYSQLLOAD = -L/usr/lib/mysql -lmysqlclient
-XFORMLIBDIR = -L/usr/local/xforms
-XFORMINCDIR = -I/usr/local/xforms
-XINC =
-XLOAD = -L/usr/X11R6/lib -lX11
+MYSQLINC = -I${LOCALBASE}/include/mysql
+MYSQLLOAD = -L${LOCALBASE}/lib/mysql -lmysqlclient
+XFORMLIBDIR = -L${LOCALBASE}/lib
+XFORMINCDIR = -I${LOCALBASE}/include/X11
+XINC = -I${X11BASE}/include
+XLOAD = -L${X11BASE}/lib -lX11 -lGL -lXext
# objects needed for the program
OBJS = Xmysql.o \
@@ -56,21 +55,24 @@ OBJS = Xmysql.o \
Xmysql_cb.o \
XmysqlDB.o \
XmysqlErr.o
+
+all: ${PROGRAM}
${PROGRAM}: $(OBJS)
$(CC) -o ${PROGRAM} $(OBJS) $(MYSQLINC) $(XFORMINCDIR) \
$(XINC) $(STDLFLAGS) $(MYSQLLOAD) \
- $(XLOAD) $(XFORMLIBDIR) -lforms -lXpm -lm
+ $(XLOAD) $(XFORMLIBDIR) -lforms -lXpm -lm -ljpeg
.c.o:
- $(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(XINC)
+ $(CC) -c $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(XINC)
clean:
rm -f ${PROGRAM} $(OBJS)
install:
install -d $(INSTALLPATH) $(XMYSQL_XPMPATH) $(XMYSQL_HELPPATH)
- install --mode=711 $(PROGRAM) $(INSTALLPATH)
- install --mode=744 mysql.xpm $(XMYSQL_XPMPATH)
- install --mode=744 sqlhelp.txt $(XMYSQL_HELPPATH)
+ install -s -m ${BINMODE} $(PROGRAM) $(INSTALLPATH)
+ install -m 444 mysql.xpm $(XMYSQL_XPMPATH)/Mysql.xpm
+ install -d -m 755 $(XMYSQL_HELPPATH)
+ install -m 444 sqlhelp.txt $(XMYSQL_HELPPATH)

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-XmysqlDB_c,v 1.1 2012/01/18 20:01:11 naddy Exp $
--- XmysqlDB.c.orig Fri Jan 13 17:26:11 2012
+++ XmysqlDB.c Fri Jan 13 17:31:29 2012
@@ -1,10 +1,8 @@
+#include "my_global.h"
+#include "m_string.h"
#include "XmysqlDB.h"
#include "XmysqlErr.h"
#include "Xmysql_def.h"
-
-/* prototypes */
-char *strmov (char *dst, const char *src);
-char *strfill (char *s, uint len, int fill);
/* this macro is used to make sure all returns clean up resources */
#define RETURN(res) \

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Xmysql_c,v 1.1 2003/02/02 22:22:38 margarida Exp $
--- Xmysql.c.orig Sun Feb 2 22:12:45 2003
+++ Xmysql.c Sun Feb 2 22:13:05 2003
@@ -78,7 +78,7 @@ create_form_Xmysql_main (void)
fdui->image = obj = fl_add_pixmap (FL_NORMAL_PIXMAP, 700, 20, 80, 40, "");
/* pixmap */
- sprintf (pixmapName, "%s/%s", CURRENT_RD, "mysql.xpm");
+ sprintf (pixmapName, "%s/%s", CURRENT_RD, "Mysql.xpm");
fl_set_pixmap_file (obj, pixmapName);
fdui->xmysql_main_status = obj = fl_add_input (FL_NORMAL_INPUT, 10, 280, 780, 30, "Status");

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-Xmysql_cb_c,v 1.1 2011/07/08 11:32:17 jasper Exp $
--- Xmysql_cb.c.orig Sun Oct 18 18:40:19 1998
+++ Xmysql_cb.c Fri Jul 8 13:30:59 2011
@@ -1,5 +1,11 @@
#include <string.h>
+
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#include <stdlib.h>
+#else
#include <malloc.h>
+#endif
+
#include "forms.h"
#include "Xmysql.h"
#include "XmysqlDB.h"

View File

@ -1,2 +0,0 @@
XmySQL is a front end to the MySQL database engine. It allows for
simple queries and table maintenance, as well as batch queries.

View File

@ -1,6 +0,0 @@
@comment $OpenBSD: PLIST,v 1.5 2011/04/20 18:59:38 jasper Exp $
@bin bin/xmysql
include/X11/pixmaps/
include/X11/pixmaps/Mysql.xpm
lib/X11/xmysql/
lib/X11/xmysql/sqlhelp.txt