aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorandreas <andreas@FreeBSD.org>1998-01-29 20:26:03 +0800
committerandreas <andreas@FreeBSD.org>1998-01-29 20:26:03 +0800
commitbe0a9918911ac3e01615f59b057e9f2e05f09ad9 (patch)
treef61ab46c4e0c0a99feef15a921017d6f30b44945 /databases
parent397f7f770c3b6d9c115864101919dbcf9cb3c8c6 (diff)
downloadfreebsd-ports-gnome-be0a9918911ac3e01615f59b057e9f2e05f09ad9.tar.gz
freebsd-ports-gnome-be0a9918911ac3e01615f59b057e9f2e05f09ad9.tar.zst
freebsd-ports-gnome-be0a9918911ac3e01615f59b057e9f2e05f09ad9.zip
Update this port to version 1.7
Diffstat (limited to 'databases')
-rw-r--r--databases/xmysql/Makefile11
-rw-r--r--databases/xmysql/distinfo2
-rw-r--r--databases/xmysql/files/patch-aa58
3 files changed, 34 insertions, 37 deletions
diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile
index 2b0e16ab9940..5fdc49920254 100644
--- a/databases/xmysql/Makefile
+++ b/databases/xmysql/Makefile
@@ -3,14 +3,15 @@
# Date created: Tue Sep 2 15:46:09 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.1.1.1 1997/09/02 14:56:43 andreas Exp $
+# $Id: Makefile,v 1.2 1997/11/26 23:48:40 jseger Exp $
#
-DISTNAME= xmysql-1.5
+DISTNAME= xmysql-1.7
CATEGORIES= databases
-MASTER_SITES= ftp://mysql.staufen.de/pub/mysql/Contrib/ \
- http://www.tcx.se/Contrib/ \
- http://www.buoy.com/mysql/Contrib/
+MASTER_SITES= http://www.tcx.se/Contrib/ \
+ http://www.buoy.com/mysql/Contrib/ \
+ http://web.tryc.on.ca/mysql/Contrib/ \
+ http://mysql.acer.net/Contrib/
MAINTAINER= andreas@FreeBSD.ORG
diff --git a/databases/xmysql/distinfo b/databases/xmysql/distinfo
index 5cc17c278cfa..5608d204a767 100644
--- a/databases/xmysql/distinfo
+++ b/databases/xmysql/distinfo
@@ -1 +1 @@
-MD5 (xmysql-1.5.tar.gz) = 6cf412e86d89b98dfc084b75fb8956c7
+MD5 (xmysql-1.7.tar.gz) = 851651f37c9981da7290bdbb7ac720f7
diff --git a/databases/xmysql/files/patch-aa b/databases/xmysql/files/patch-aa
index 9155b63f3fb6..2c90cea40835 100644
--- a/databases/xmysql/files/patch-aa
+++ b/databases/xmysql/files/patch-aa
@@ -1,51 +1,45 @@
---- Makefile.orig Mon May 12 20:19:36 1997
-+++ Makefile Tue Sep 2 16:26:44 1997
-@@ -1,5 +1,5 @@
- #
--# Makefile for XmySQL on Linux
-+# Makefile for XmySQL on FreeBSD
- #
-
- ########################################################
+--- Makefile.orig Sun Nov 16 03:23:08 1997
++++ Makefile Thu Jan 29 13:23:58 1998
@@ -36,24 +36,24 @@
PROGRAM = xmysql
# PROGRAM install path
--INSTALLPATH = /xmysql-1.4
-+INSTALLPATH = $(X11BASE)/bin
+-INSTALLPATH = /xmysql-1.7
++INSTALLPATH = ${PREFIX}/bin
# pixmap location
--XPM_PATH = /xmysql-1.4
-+XPM_PATH = $(X11BASE)/include/X11/pixmaps
+-XMYSQL_XPMPATH = /xmysql-1.7
++XMYSQL_XPMPATH = ${X11BASE}/include/X11/pixmaps
# help path
--HELP_PATH = /xmysql-1.4
-+HELP_PATH = $(X11BASE)/lib/X11/xmysql-1.5
+-XMYSQL_HELPPATH = /xmysql-1.7
++XMYSQL_HELPPATH = ${X11BASE}/lib/X11/xmysql
# Compilation Details
-CC = gcc
--STDCFLAGS = -g -c -O2 -Wall -DXPMPATH=\"$(XPM_PATH)\" -DHELPPATH=\"$(HELP_PATH)\"
-+# CC = gcc
-+STDCFLAGS = $(CFLAGS) -c -DXPMPATH=\"$(XPM_PATH)\" -DHELPPATH=\"$(HELP_PATH)\"
+-STDCFLAGS = -g -c -O2 -Wall -DXMYSQL_XPMPATH=\"$(XMYSQL_XPMPATH)\" -DXMYSQL_HELPPATH=\"$(XMYSQL_HELPPATH)\"
++#CC = gcc
++STDCFLAGS = $(CFLAGS) -DXMYSQL_XPMPATH=\"$(XMYSQL_XPMPATH)\" -DXMYSQL_HELPPATH=\"$(XMYSQL_HELPPATH)\"
STDLFLAGS =
MYSQLINC = -I/usr/local/include/mysql
MYSQLLOAD = -L/usr/local/lib/mysql -lmysqlclient -lmysys -ldbug -lmystrings
-XFORMLIBDIR = -L/usr/lib
-XFORMINCDIR = -I/usr/include
-+XFORMLIBDIR = -L$(X11BASE)/lib
-+XFORMINCDIR = -I$(X11BASE)/include
++XFORMLIBDIR = -L${X11BASE}/lib
++XFORMINCDIR = -I${X11BASE}/include
XINC =
-XLOAD = -L/usr/X11R6/lib -lX11
-+XLOAD = -L$(X11BASE)/lib -lX11
++XLOAD = -L${X11BASE}/lib -lX11
# objects needed for the program
OBJS = Xmysql.o \
-@@ -62,10 +62,12 @@
+@@ -61,20 +61,22 @@
+ Xmysql_cb.o \
XmysqlDB.o \
XmysqlErr.o
-
-+all: ${PROGRAM}
+
++all: ${PROGRAM}
+
${PROGRAM}: $(OBJS)
$(CC) -o ${PROGRAM} $(OBJS) $(MYSQLINC) $(XFORMINCDIR) \
$(XINC) $(STDLFLAGS) $(MYSQLLOAD) \
@@ -53,16 +47,18 @@
+ $(XLOAD) $(XFORMLIBDIR) -lxforms -lXpm -lm
.c.o:
- $(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(XINC)
-@@ -74,7 +76,7 @@
+- $(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(XINC)
++ $(CC) -c $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(XINC)
+
+ clean:
rm -f ${PROGRAM} $(OBJS)
install:
- install --mode=711 $(PROGRAM) $(INSTALLPATH)
-- install --mode=744 mysql.xpm $(XPM_PATH)
-- install --mode=744 sqlhelp.txt $(HELP_PATH)
+- install --mode=744 mysql.xpm $(XPMPATH)
+- install --mode=744 sqlhelp.txt $(HELPPATH)
-
+ install -s -m 511 $(PROGRAM) $(INSTALLPATH)
-+ install -m 444 mysql.xpm $(XPM_PATH)
-+ install -d -m 755 $(HELP_PATH)
-+ install -m 444 sqlhelp.txt $(HELP_PATH)
++ install -m 444 mysql.xpm $(XMYSQL_XPMPATH)
++ install -d -m 755 $(XMYSQL_HELPPATH)
++ install -m 444 sqlhelp.txt $(XMYSQL_HELPPATH)