diff options
| -rw-r--r-- | databases/xmysqladmin/Makefile | 7 | ||||
| -rw-r--r-- | databases/xmysqladmin/distinfo | 2 | ||||
| -rw-r--r-- | databases/xmysqladmin/files/patch-aa | 50 |
3 files changed, 23 insertions, 36 deletions
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index cce8c9112653..69c7d763bba2 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -1,12 +1,12 @@ # ports collection makefile for: xmysqladmin -# Version required: 0.2.0 +# Version required: 1.0 # Date created: Di 2 Sep 1997 16:29:27 CEST # Whom: Andreas Klemm <andreas@klemm.gtn.com> # -# $Id: Makefile,v 1.20 1999/07/01 09:06:36 dirk Exp $ +# $Id: Makefile,v 1.21 1999/07/01 09:11:16 dirk Exp $ # -DISTNAME= xmysqladmin-0.4.4 +DISTNAME= xmysqladmin-1.0 CATEGORIES= databases MASTER_SITES= http://www.tcx.se/Contrib/ \ http://www.buoy.com/mysql/Contrib/ \ @@ -19,7 +19,6 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ xforms.0:${PORTSDIR}/x11-toolkits/xforms \ mysqlclient.6:${PORTSDIR}/databases/mysql322-client -WRKSRC= ${WRKDIR}/xmysqladmin USE_X_PREFIX= yes ALL_TARGET= xmysqladmin diff --git a/databases/xmysqladmin/distinfo b/databases/xmysqladmin/distinfo index 0595e6e3699e..e354ae1cfc83 100644 --- a/databases/xmysqladmin/distinfo +++ b/databases/xmysqladmin/distinfo @@ -1 +1 @@ -MD5 (xmysqladmin-0.4.4.tar.gz) = ae04bff6543899487810bfaf30c7d635 +MD5 (xmysqladmin-1.0.tar.gz) = d02b7e52d034f2f41b6f43ced3cb8e21 diff --git a/databases/xmysqladmin/files/patch-aa b/databases/xmysqladmin/files/patch-aa index a2f085f18848..53d21c7528f4 100644 --- a/databases/xmysqladmin/files/patch-aa +++ b/databases/xmysqladmin/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Jan 10 18:17:46 1998 -+++ Makefile Wed Feb 3 14:14:54 1999 +--- Makefile.orig Mon Dec 7 12:52:39 1998 ++++ Makefile Thu Jul 1 16:43:57 1999 @@ -34,7 +34,7 @@ # This is used by 'make install' command #------------------------------------------------------- @@ -18,56 +18,44 @@ ######################################################## -@@ -55,8 +55,8 @@ - # mysql version - # mysql_reload() on 3.20, mysql_refresh() on 3.21 - #------------------------------------------------------- --#MYSQL_VERSION = 320 # for versions 3.20.# --MYSQL_VERSION = 321 # for versions 3.21.# -+MYSQL_VERSION = 320 # for versions 3.20.# -+#MYSQL_VERSION = 321 # for versions 3.21.# - - - -@@ -93,8 +93,8 @@ +@@ -80,8 +80,7 @@ # Compilation Details # hum... I think you dont need to change this #------------------------------------------------------- -CC = gcc -STDCFLAGS = -g -c -O2 -Wall -DPIXMAPFILE=\"$(PIXMAPPATH)/mysql.xpm\" \ -+# CC = gcc +STDCFLAGS = $(CFLAGS) -c -DPIXMAPFILE=\"$(PIXMAPPATH)/mysql.xpm\" \ -DBACKUP=\"$(BACKUP)\" -DBACKUPDIR=\"$(BACKUPDIR)\" \ -DBACKUPSUFFIX=\"$(BACKUPSUFFIX)\" \ -DMYSQL_VERSION=$(MYSQL_VERSION) -@@ -109,7 +109,7 @@ +@@ -95,7 +94,7 @@ + ######################################################## # mysql include dir #------------------------------------------------------- - #MYSQLINC = -I/opt/local/include/mysql --MYSQLINC = -I/usr/local/include/mysql +-MYSQLINC = -I/usr/local/mysql/include/mysql +MYSQLINC = -I${LOCALBASE}/include/mysql ######################################################## -@@ -121,7 +121,7 @@ +@@ -107,7 +106,7 @@ # mysql database dir #------------------------------------------------------- #MYSQLDBDIR = -DMYSQLDBDIR="\"/var/lib/mysql/\"" --MYSQLDBDIR = -DMYSQLDBDIR="\"/usr/local/var/\"" +-MYSQLDBDIR = -DMYSQLDBDIR="\"/usr/local/mysql/var/\"" +MYSQLDBDIR = -DMYSQLDBDIR="\"/var/db/mysql/\"" ######################################################## -@@ -133,7 +133,7 @@ +@@ -118,7 +117,7 @@ + ######################################################## # mysql library dir #------------------------------------------------------- - #MYSQLLOAD = -L/opt/local/i386/lib/mysql -lmysqlclient -lmysys -ldbug -lmystrings --MYSQLLOAD = -L/usr/local/lib/mysql -lmysqlclient -lmysys -ldbug -lmystrings -+MYSQLLOAD = -L${LOCALBASE}/lib/mysql -lmysqlclient -lmysys -ldbug -lmystrings +-MYSQLLOAD = -Wl,-R/usr/local/mysql/lib/mysql -L/usr/local/mysql/lib/mysql -lmysqlclient ++MYSQLLOAD = -Wl,-R${LOCALBASE}/lib/mysql -L${LOCALBASE}/lib/mysql -lmysqlclient ######################################################## -@@ -144,7 +144,7 @@ +@@ -129,7 +128,7 @@ # xforms librairies dir #------------------------------------------------------- #XFORMLIBDIR = -L/opt/local/i386/lib @@ -76,29 +64,29 @@ ######################################################## -@@ -156,7 +156,7 @@ +@@ -141,7 +140,7 @@ # xforms include dir (xforms.h) #------------------------------------------------------- #XFORMINCDIR = -I/opt/local/include --XFORMINCDIR = -I/usr/include +-XFORMINCDIR = -I/usr/X11R6/include +XFORMINCDIR = -I${X11BASE}/include ######################################################## -@@ -172,7 +172,7 @@ +@@ -157,7 +156,7 @@ # Use this for Linux: XINC = --XLOAD = -L/usr/X11R6/lib -lX11 +-XLOAD = -L/usr/X11R6/lib -lX11 /usr/X11R6/lib/libXpm.so.4 +XLOAD = -L${X11BASE}/lib -lX11 ######################################################## -@@ -230,8 +230,7 @@ +@@ -215,8 +214,7 @@ ${PROGRAM}: $(OBJS) $(CC) -o ${PROGRAM} $(OBJS) $(MYSQLINC) $(XFORMINCDIR) \ $(XINC) $(STDLFLAGS) $(MYSQLLOAD) \ -- $(XLOAD) $(XFORMLIBDIR) -lforms -lXpm $(LIBS) +- $(XLOAD) $(XFORMLIBDIR) -lforms $(LIBS) - ./$(PROGRAM) + $(XLOAD) $(XFORMLIBDIR) -lxforms -lXpm $(LIBS) |