6 files changed, 22 insertions, 122 deletions

diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index 8c45cd8ec667..8a1c907d8714 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql-navigator
-PORTVERSION=	1.2.4
+PORTVERSION=	1.3.3.6
 CATEGORIES=	databases kde
 MASTER_SITES=	http://sql.kldp.org/snapshots/ \
 		ftp://sise15.mizi.com/pub/
@@ -18,15 +18,12 @@ LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_KDELIBS_VER=2
 INSTALLS_SHLIB=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-mysql-includes=${LOCALBASE}/include/mysql \
+		--with-mysql-libraries=${LOCALBASE}/lib/mysql
 
-MYSQL_NAV_HOME=	${PREFIX}/share/mysql_navigator
-
-do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/bin/mysql_navigator ${PREFIX}/bin/
-	@ ${INSTALL_DATA} ${WRKSRC}/lib/libmysqlui.* ${PREFIX}/lib/
-	@ ${MKDIR} ${MYSQL_NAV_HOME}/po
-	@ ${INSTALL_DATA} ${WRKSRC}/po/* ${MYSQL_NAV_HOME}/po/
-	@ ${MKDIR} ${MYSQL_NAV_HOME}/pics
-	@ ${INSTALL_DATA} ${WRKSRC}/pics/* ${MYSQL_NAV_HOME}/pics/
+post-patch:
+	@ ${PERL} -pi -e 's#-O2#$(CXXFLAGS)#g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/databases/mysql-navigator/distinfo b/databases/mysql-navigator/distinfo
index eeafe062b27d..d2c0c962550b 100644
--- a/databases/mysql-navigator/distinfo
+++ b/databases/mysql-navigator/distinfo
@@ -1 +1 @@
-MD5 (mysqlnavigator-1.2.4.tar.gz) = 01c197c8f97e6ea0da7f8918e5d5057f
+MD5 (mysqlnavigator-1.3.3.6.tar.gz) = 24ee1efcfb47741baf0dac853542859a
diff --git a/databases/mysql-navigator/files/patch-ab b/databases/mysql-navigator/files/patch-ab
deleted file mode 100644
index 4b1461108aef..000000000000
--- a/databases/mysql-navigator/files/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/main/Makefile.orig	Thu Aug  2 06:58:04 2001
-+++ src/main/Makefile	Thu Aug  2 07:01:04 2001
-@@ -7,15 +7,15 @@
- 
- ####### Compiler, tools and options
- 
--CC	=	gcc
--CXX	=	g++
--CXXFLAGS=	-pipe -Wall -W -O2 -DNO_DEBUG -DMYSQL_NAVIGATOR_HOME=\"/usr/local/share/mysql_navigator\"
--CXXFLAGS=	-pipe -Wall -W -O2 -DNO_DEBUG -DMYSQL_NAVIGATOR_HOME=\"/usr/local/share/mysql_navigator\"
--INCPATH	=	-I../../include -I/usr/local/mysql/include/mysql -I$(QTDIR)/include
-+CC	?=	gcc
-+CXX	?=	g++
-+#CXXFLAGS=	-pipe -Wall -W -O2 -DNO_DEBUG -DMYSQL_NAVIGATOR_HOME=\"/usr/local/share/mysql_navigator\"
-+CXXFLAGS+=	-DNO_DEBUG -DMYSQL_NAVIGATOR_HOME=\"${PREFIX}/share/mysql_navigator\"
-+INCPATH	=	-I../../include -I${LOCALBASE}/include/mysql -I$(X11BASE)/include/qt2
- LINK	=	g++
- LFLAGS	=	
--LIBS	=	-L$(QTDIR)/lib -L/usr/X11R6/lib -L../../lib -lmysqlui -lqt -lXext -lX11 -lm
--MOC	=	$(QTDIR)/bin/moc
-+LIBS	=	-L$(LOCALBASE)/lib/mysql -L${X11BASE}/lib -L../../lib -lmysqlui -lqt2 -lXext -lX11 -lm
-+MOC	=	$(X11BASE)/bin/moc2
- 
- TAR	=	tar -cf
- GZIP	=	gzip -9f
diff --git a/databases/mysql-navigator/files/patch-ac b/databases/mysql-navigator/files/patch-ac
deleted file mode 100644
index 85695e83ba54..000000000000
--- a/databases/mysql-navigator/files/patch-ac
+++ /dev/null
@@ -1,66 +0,0 @@
---- src/mysql/Makefile.orig	Thu May  3 12:20:10 2001
-+++ src/mysql/Makefile	Thu May  3 12:24:04 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${X11BASE}/include/qt2
- LINK	=	g++
- LFLAGS	=	-shared -Wl,-soname,libmysqlui.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
-@@ -225,12 +225,10 @@
- 		../../include/moc_popupcombobox.o \
- 		../../include/moc_field.o
- DIST	=	
--TARGET	=	libmysqlui.so.1.0.0
-+TARGET	=	libmysqlui.so.1
- TARGETA	=	../../lib/libmysqlui.a
--TARGETD	=	libmysqlui.so.1.0.0
-+TARGETD	=	libmysqlui.so.1
- TARGET0	=	libmysqlui.so
--TARGET1	=	libmysqlui.so.1
--TARGET2	=	libmysqlui.so.1.0
- 
- ####### Implicit rules
- 
-@@ -253,19 +251,15 @@
- 
- ####### Build rules
- 
--all: ../../lib/libmysqlui.so.1.0.0
-+all: ../../lib/libmysqlui.so.1
- 
--../../lib/libmysqlui.so.1.0.0: $(OBJECTS) $(OBJMOC) 
--	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-+../../lib/libmysqlui.so.1: $(OBJECTS) $(OBJMOC) 
-+	-rm -f $(TARGET) $(TARGET0)
- 	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
- 	-ln -s $(TARGET) $(TARGET0)
--	-ln -s $(TARGET) $(TARGET1)
--	-ln -s $(TARGET) $(TARGET2)
- 	-rm -f ../../lib/$(TARGET)
- 	-rm -f ../../lib/$(TARGET0)
--	-rm -f ../../lib/$(TARGET1)
--	-rm -f ../../lib/$(TARGET2)
--	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) ../../lib/
-+	-mv $(TARGET) $(TARGET0) ../../lib/
- 
- staticlib: $(TARGETA)
- 
diff --git a/databases/mysql-navigator/files/patch-src-main-Makefile.in b/databases/mysql-navigator/files/patch-src-main-Makefile.in
new file mode 100644
index 000000000000..820d833cb6a3
--- /dev/null
+++ b/databases/mysql-navigator/files/patch-src-main-Makefile.in
@@ -0,0 +1,11 @@
+--- src/main/Makefile.in.orig	Tue Jan  1 03:23:14 2002
++++ src/main/Makefile.in	Tue Jan  1 03:25:07 2002
+@@ -95,7 +95,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ CPPFLAGS = @CPPFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(LDFLAGS) -lqt2 -lmysqlclient
+ mysqlnavigator_OBJECTS =  main.$(OBJEXT)
+ mysqlnavigator_LDADD = $(LDADD)
+ mysqlnavigator_DEPENDENCIES = 
diff --git a/databases/mysql-navigator/pkg-plist b/databases/mysql-navigator/pkg-plist
index f40a9cb5e466..d9f31840fb4e 100644
--- a/databases/mysql-navigator/pkg-plist
+++ b/databases/mysql-navigator/pkg-plist
@@ -1,22 +1,5 @@
-bin/mysql_navigator
+bin/mysqlnavigator
+lib/libmysqlui.a
+lib/libmysqlui.la
 lib/libmysqlui.so
 lib/libmysqlui.so.1
-share/mysql_navigator/po/mysql_navigator.ts
-share/mysql_navigator/pics/background.xpm
-share/mysql_navigator/pics/close.xpm
-share/mysql_navigator/pics/db.xpm
-share/mysql_navigator/pics/document.xpm
-share/mysql_navigator/pics/down.xpm
-share/mysql_navigator/pics/drop.xpm
-share/mysql_navigator/pics/edit.xpm
-share/mysql_navigator/pics/field.xpm
-share/mysql_navigator/pics/new.xpm
-share/mysql_navigator/pics/run.xpm
-share/mysql_navigator/pics/save.xpm
-share/mysql_navigator/pics/server.xpm
-share/mysql_navigator/pics/table.xpm
-share/mysql_navigator/pics/up.xpm
-share/mysql_navigator/pics/window.xpm
-@dirrm share/mysql_navigator/pics
-@dirrm share/mysql_navigator/po
-@dirrm share/mysql_navigator