6 files changed, 98 insertions, 32 deletions

diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index 7363b9d647ac..2e9cec59c9c9 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -6,21 +6,22 @@
 #
 
 PORTNAME=	mysql-navigator
-PORTVERSION=	0.3.2
-CATEGORIES=	databases gnome
-MASTER_SITES=	http://sql.kldp.org/source/
-DISTNAME=	mysql_navigator_ver_${PORTVERSION}
+PORTVERSION=	0.7.0
+CATEGORIES=	databases kde
+MASTER_SITES=	http://sql.kldp.org/snapshots/ \
+		ftp://sise15.mizi.com/pub/
+DISTNAME=	mysql_navigator_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client \
+		kdecore.4:${PORTSDIR}/x11/kdelibs2
 
-USE_X_PREFIX=	yes
-USE_GNOME=	yes
-
-ALL_TARGET=
+USE_QT2=	yes
+INSTALLS_SHLIB=	yes
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mn ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/mysql_navigator ${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/lib/libmysqlnavigator.* ${PREFIX}/lib/
 
 .include <bsd.port.mk>
diff --git a/databases/mysql-navigator/distinfo b/databases/mysql-navigator/distinfo
index 3f03f9e0b3db..a71203d83c31 100644
--- a/databases/mysql-navigator/distinfo
+++ b/databases/mysql-navigator/distinfo
@@ -1 +1 @@
-MD5 (mysql_navigator_ver_0.3.2.tar.gz) = 792375fe37e1e1374db43b89c3d5551f
+MD5 (mysql_navigator_0.7.0.tar.gz) = b33a710a8c8eccecbf801c5010e35e7e
diff --git a/databases/mysql-navigator/files/patch-aa b/databases/mysql-navigator/files/patch-aa
deleted file mode 100644
index 2781f9d6d967..000000000000
--- a/databases/mysql-navigator/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	Sun May 28 10:32:49 2000
-+++ Makefile	Sat Jun  3 11:51:08 2000
-@@ -1,9 +1,13 @@
--CFLAGS = -I/usr/local/mysql/include/mysql/ `gtk-config --cflags` `gnome-config --cflags gnome gnomeui` 
--LIBS = -L/usr/local/mysql/lib/mysql/ -lmysqlclient `gtk-config --libs` `gnome-config --libs gnome gnomeui` 
--CC = gcc 
-+CFLAGS = -I$(LOCALBASE)/include/mysql `$(GTK_CONFIG) --cflags` \
-+	`$(X11BASE)/bin/gnome-config --cflags gnome gnomeui` 
-+LIBS = -L$(LOCALBASE)/lib/mysql -lmysqlclient `$(GTK_CONFIG) --libs` \
-+	`$(X11BASE)/bin/gnome-config --libs gnome gnomeui` 
-+#CC = gcc 
- OUTFILE = mn 
- 
- OBJECTS = mn.o 
- 
--$(OUTFILE): $(OBJECTS) $(CC) $(CFLAGS) $(OBJECTS) -o $(OUTFILE) $(LIBS) 
-+$(OUTFILE): $(OBJECTS)
-+	$(CC) $(CFLAGS) $(OBJECTS) -o $(OUTFILE) $(LIBS) 
-+
- clean: rm $(OBJECTS) $(OUTFILE)                                                                                                                                                                                                                                                                                         
diff --git a/databases/mysql-navigator/files/patch-ab b/databases/mysql-navigator/files/patch-ab
new file mode 100644
index 000000000000..ddbadb29d395
--- /dev/null
+++ b/databases/mysql-navigator/files/patch-ab
@@ -0,0 +1,25 @@
+--- src/main/Makefile.orig	Fri Mar 30 13:37:05 2001
++++ src/main/Makefile	Fri Mar 30 13:38:31 2001
+@@ -7,15 +7,15 @@
+ 
+ ####### Compiler, tools and options
+ 
+-CC	=	gcc
+-CXX	=	g++
+-CFLAGS	=	-pipe -Wall -W -O2 -DNO_DEBUG
+-CXXFLAGS=	-pipe -Wall -W -O2 -DNO_DEBUG
+-INCPATH	=	-I../../include -I/usr/local/mysql/include/mysql -I$(QTDIR)/include
++CC	?=	gcc
++CXX	?=	g++
++CFLAGS	?=	-pipe -Wall -W -O2 -DNO_DEBUG
++CXXFLAGS?=	-pipe -Wall -W -O2 -DNO_DEBUG
++INCPATH	=	-I../../include -I/${LOCALBASE}/include/mysql -I$(QTDIR)/include -I${X11BASE}/include/qt2
+ LINK	=	g++
+ LFLAGS	=	
+-LIBS	=	-L$(QTDIR)/lib -L/usr/X11R6/lib -L../../lib -lmysqlnavigator -lqt -lXext -lX11 -lm
+-MOC	=	$(QTDIR)/bin/moc
++LIBS	=	-L$(LOCALBASE)/lib/mysql -L${X11BASE}/lib -L../../lib -lmysqlnavigator -lqt2 -lXext -lX11 -lm
++MOC	=	$(QTDIR)/bin/moc2
+ 
+ TAR	=	tar -cf
+ GZIP	=	gzip -9f
diff --git a/databases/mysql-navigator/files/patch-ac b/databases/mysql-navigator/files/patch-ac
new file mode 100644
index 000000000000..c3be8f2b0697
--- /dev/null
+++ b/databases/mysql-navigator/files/patch-ac
@@ -0,0 +1,58 @@
+--- src/mysqlnavigator/Makefile.orig	Fri Mar 23 03:50:33 2001
++++ src/mysqlnavigator/Makefile	Fri Mar 30 14:13:30 2001
+@@ -7,17 +7,17 @@
+ 
+ ####### Compiler, tools and options
+ 
+-CC	=	gcc
+-CXX	=	g++
+-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
+-CXXFLAGS=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
+-INCPATH	=	-I../../pics -I../../include -I/usr/local/mysql/include/mysql -I$(QTDIR)/include
++CC	?=	gcc
++CXX	?=	g++
++CFLAGS	?=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
++CXXFLAGS?=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
++INCPATH	=	-I../../pics -I../../include -I${LOCALBASE}/include/mysql -I$(QTDIR)/include -I${X11BASE}/include/qt2
+ LINK	=	g++
+ LFLAGS	=	-shared -Wl,-soname,libmysqlnavigator.so.1
+-LIBS	=	-L$(QTDIR)/lib -L/usr/X11R6/lib -lmysqlclient -lqt -lXext -lX11 -lm
++LIBS	=	-L$(LOCALBASE)/lib/mysql -L${X11BASE}/lib -lmysqlclient -lqt2 -lXext -lX11 -lm
+ AR	=	ar cqs
+ RANLIB	=	
+-MOC	=	$(QTDIR)/bin/moc
++MOC	=	$(X11BASE)/bin/moc2
+ 
+ TAR	=	tar -cf
+ GZIP	=	gzip -9f
+@@ -215,12 +215,10 @@
+ 		../../include/moc_xport.o \
+ 		../../include/moc_querylistview.o
+ DIST	=	
+-TARGET	=	libmysqlnavigator.so.1.0.0
++TARGET	=	libmysqlnavigator.so.1
++TARGETD	=	libmysqlnavigator.so.1
+ TARGETA	=	libmysqlnavigator.a
+-TARGETD	=	libmysqlnavigator.so.1.0.0
+ TARGET0	=	libmysqlnavigator.so
+-TARGET1	=	libmysqlnavigator.so.1
+-TARGET2	=	libmysqlnavigator.so.1.0
+ 
+ ####### Implicit rules
+ 
+@@ -246,13 +244,10 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJECTS) $(OBJMOC) 
+-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
++	-rm -f $(TARGET) $(TARGET0)
+ 	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
+ 	-ln -s $(TARGET) $(TARGET0)
+-	-ln -s $(TARGET) $(TARGET1)
+-	-ln -s $(TARGET) $(TARGET2)
+-	-cp -df libmysqlnavigator* ../../lib
+-	-rm -rf libmysqlnavigator*
++	-cp libmysqlnavigator* ../../lib
+ 
+ staticlib: $(TARGETA)
+ 
diff --git a/databases/mysql-navigator/pkg-plist b/databases/mysql-navigator/pkg-plist
index 0e80a6955b22..38f2f43d42e5 100644
--- a/databases/mysql-navigator/pkg-plist
+++ b/databases/mysql-navigator/pkg-plist
@@ -1 +1,3 @@
-bin/mn
+bin/mysql_navigator
+lib/libmysqlnavigator.so
+lib/libmysqlnavigator.so.1