fix broken port

- move from X11 to local broke it.  fix.
- reorder patches
This commit is contained in:
turan 2000-04-09 09:13:22 +00:00
parent b2bb4f9664
commit a3977a0c88
4 changed files with 12 additions and 11 deletions

View File

@ -1,5 +1,5 @@
# $FreeBSD: ports/databases/xmysql/Makefile,v 1.22 1999/08/31 06:41:26 mharo Exp $
# $OpenBSD: Makefile,v 1.6 2000/03/24 23:28:04 espie Exp $
# $OpenBSD: Makefile,v 1.7 2000/04/09 09:13:22 turan Exp $
DISTNAME= xmysql-1.9
CATEGORIES= databases
@ -15,6 +15,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
FAKE= Yes
FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX}
LIB_DEPENDS= xforms.0::x11/xforms \
mysqlclient.6::databases/mysql

View File

@ -1,7 +1,5 @@
# $OpenBSD: patch-aa,v 1.1.1.1 2000/01/31 06:44:11 form Exp $
--- Makefile.orig Fri Oct 23 08:35:51 1998
+++ Makefile Mon Jan 31 12:15:58 2000
--- Makefile.orig Thu Oct 22 19:35:51 1998
+++ Makefile Sun Apr 9 02:55:37 2000
@@ -31,24 +31,23 @@
PROGRAM = xmysql
@ -11,11 +9,11 @@
# pixmap location
-XMYSQL_XPMPATH = /usr/local/xmysql-1.9
+XMYSQL_XPMPATH = ${X11BASE}/include/X11/pixmaps
+XMYSQL_XPMPATH = ${PREFIX}/include/X11/pixmaps
# help path
-XMYSQL_HELPPATH = /usr/local/xmysql-1.9
+XMYSQL_HELPPATH = ${X11BASE}/lib/X11/xmysql
+XMYSQL_HELPPATH = ${PREFIX}/lib/X11/xmysql
# Compilation Details
-CC = gcc
@ -30,8 +28,8 @@
-XLOAD = -L/usr/X11R6/lib -lX11
+MYSQLINC = -I${LOCALBASE}/include/mysql
+MYSQLLOAD = -L${LOCALBASE}/lib/mysql -lmysqlclient
+XFORMLIBDIR = -L${X11BASE}/lib
+XFORMINCDIR = -I${X11BASE}/include/X11
+XFORMLIBDIR = -L${LOCALBASE}/lib
+XFORMINCDIR = -I${LOCALBASE}/include/X11
+XINC = -I${X11BASE}/include
+XLOAD = -L${X11BASE}/lib -lX11

View File

@ -1,4 +1,4 @@
# $OpenBSD: patch-ac,v 1.1.1.1 2000/01/31 06:44:11 form Exp $
# $OpenBSD: patch-XmysqlDB.c,v 1.1 2000/04/09 09:13:22 turan Exp $
--- XmysqlDB.c.orig Wed Oct 21 05:05:07 1998
+++ XmysqlDB.c Fri Dec 25 16:27:36 1998

View File

@ -1,4 +1,4 @@
# $OpenBSD: patch-ab,v 1.1.1.1 2000/01/31 06:44:11 form Exp $
# $OpenBSD: patch-Xmysql_cb.c,v 1.1 2000/04/09 09:13:22 turan Exp $
--- Xmysql_cb.c.orig Tue Sep 2 16:08:23 1997
+++ Xmysql_cb.c Tue Sep 2 16:09:08 1997