undo s/forms/xforms/ patches

This commit is contained in:
naddy 2002-05-26 15:09:07 +00:00
parent b8f8ca54e2
commit 7039ee8496
5 changed files with 29 additions and 25 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2002/03/21 20:46:24 espie Exp $
# $OpenBSD: Makefile,v 1.16 2002/05/26 15:09:07 naddy Exp $
# $FreeBSD: ports/databases/xmysql/Makefile,v 1.22 1999/08/31 06:41:26 mharo Exp $
COMMENT= "X11 front end to the MySQL database engine"
@ -6,18 +6,20 @@ COMMENT= "X11 front end to the MySQL database engine"
DISTNAME= xmysql-1.9
CATEGORIES= databases
NEED_VERSION= 1.515
MASTER_SITES= http://www.tcx.se/Contrib/ \
http://www.buoy.com/mysql/Contrib/ \
http://web.tryc.on.ca/mysql/Downloads/Contrib/
LIB_DEPENDS= xforms.0::x11/xforms \
lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.tcx.se/Contrib/ \
http://www.buoy.com/mysql/Contrib/ \
http://web.tryc.on.ca/mysql/Downloads/Contrib/
LIB_DEPENDS= forms.0::x11/xforms \
lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql
FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX}
USE_X11= yes

View File

@ -1,5 +1,6 @@
--- Makefile.orig Thu Oct 22 19:35:51 1998
+++ Makefile Sun Apr 9 02:55:37 2000
$OpenBSD: patch-Makefile,v 1.3 2002/05/26 15:09:07 naddy Exp $
--- Makefile.orig Fri Oct 23 03:35:51 1998
+++ Makefile Sun May 26 16:59:50 2002
@@ -31,24 +31,23 @@
PROGRAM = xmysql
@ -35,7 +36,7 @@
# objects needed for the program
OBJS = Xmysql.o \
@@ -57,20 +56,23 @@
@@ -57,20 +56,23 @@ OBJS = Xmysql.o \
XmysqlDB.o \
XmysqlErr.o
@ -44,8 +45,7 @@
${PROGRAM}: $(OBJS)
$(CC) -o ${PROGRAM} $(OBJS) $(MYSQLINC) $(XFORMINCDIR) \
$(XINC) $(STDLFLAGS) $(MYSQLLOAD) \
- $(XLOAD) $(XFORMLIBDIR) -lforms -lXpm -lm
+ $(XLOAD) $(XFORMLIBDIR) -lxforms -lXpm -lm
$(XLOAD) $(XFORMLIBDIR) -lforms -lXpm -lm
.c.o:
- $(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(XINC)

View File

@ -1,8 +1,7 @@
# $OpenBSD: patch-XmysqlDB.c,v 1.1 2000/04/09 09:13:22 turan Exp $
$OpenBSD: patch-XmysqlDB.c,v 1.2 2002/05/26 15:09:07 naddy Exp $
--- XmysqlDB.c.orig Wed Oct 21 05:05:07 1998
+++ XmysqlDB.c Fri Dec 25 16:27:36 1998
@@ -26,7 +26,7 @@
+++ XmysqlDB.c Sun May 26 16:59:24 2002
@@ -26,7 +26,7 @@ int XmysqlDB(int dbaction, int results_t
unsigned long rows_affected = 0;
char *semicolon = 0;
char *pos = 0, *r, *r_end;

View File

@ -1,23 +1,25 @@
# $FreeBSD: ports/databases/xmysqladmin/Makefile,v 1.25 1999/11/23 02:59:09 billf Exp $
# $OpenBSD: Makefile,v 1.15 2002/03/21 20:46:24 espie Exp $
# $OpenBSD: Makefile,v 1.16 2002/05/26 15:09:07 naddy Exp $
COMMENT= "X11 front end to the mysqladmin command"
DISTNAME= xmysqladmin-1.0
CATEGORIES= databases
NEED_VERSION= 1.515
MASTER_SITES= http://www.tcx.se/Contrib/ \
http://www.buoy.com/mysql/Contrib/ \
http://web.tryc.on.ca/mysql/Downloads/Contrib/
LIB_DEPENDS= xforms.0::x11/xforms \
lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql
# public domain
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.tcx.se/Contrib/ \
http://www.buoy.com/mysql/Contrib/ \
http://web.tryc.on.ca/mysql/Downloads/Contrib/
LIB_DEPENDS= forms.0::x11/xforms \
lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql
FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX}
USE_X11= yes

View File

@ -1,5 +1,6 @@
$OpenBSD: patch-Makefile,v 1.3 2002/05/26 15:09:07 naddy Exp $
--- Makefile.orig Mon Dec 7 12:52:39 1998
+++ Makefile Thu Feb 8 21:11:30 2001
+++ Makefile Sun May 26 17:04:14 2002
@@ -34,7 +34,7 @@ INSTALL = install
# This is used by 'make install' command
#-------------------------------------------------------
@ -90,7 +91,7 @@
$(XINC) $(STDLFLAGS) $(MYSQLLOAD) \
- $(XLOAD) $(XFORMLIBDIR) -lforms $(LIBS)
- ./$(PROGRAM)
+ $(XLOAD) $(XFORMLIBDIR) -lxforms -lXpm $(LIBS)
+ $(XLOAD) $(XFORMLIBDIR) -lforms -lXpm $(LIBS)
.c.o:
$(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(MYSQLDBDIR) $(XINC)