Upgrade to 0.9.5.1

5 files changed, 41 insertions, 33 deletions

diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index 245eefafb215..bf7ec6bc48e5 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql-navigator
-PORTVERSION=	0.7.5
+PORTVERSION=	0.9.5.1
 CATEGORIES=	databases kde
 MASTER_SITES=	http://sql.kldp.org/snapshots/ \
 		ftp://sise15.mizi.com/pub/
@@ -21,6 +21,6 @@ INSTALLS_SHLIB=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/mysql_navigator ${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/lib/libmysqlnavigator.* ${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/lib/libmysqlui.* ${PREFIX}/lib/
 
 .include <bsd.port.mk>
diff --git a/databases/mysql-navigator/distinfo b/databases/mysql-navigator/distinfo
index ee86d75d25d7..acaa0df20526 100644
--- a/databases/mysql-navigator/distinfo
+++ b/databases/mysql-navigator/distinfo
@@ -1 +1 @@
-MD5 (mysql_navigator_0.7.5.tar.gz) = 833ef825cb30189f5afbbf080cdcad64
+MD5 (mysql_navigator_0.9.5.1.tar.gz) = 391a29544112148beb30ec849f422071
diff --git a/databases/mysql-navigator/files/patch-ab b/databases/mysql-navigator/files/patch-ab
index ddbadb29d395..0df8770d8515 100644
--- a/databases/mysql-navigator/files/patch-ab
+++ b/databases/mysql-navigator/files/patch-ab
@@ -1,5 +1,5 @@
---- src/main/Makefile.orig	Fri Mar 30 13:37:05 2001
-+++ src/main/Makefile	Fri Mar 30 13:38:31 2001
+--- src/main/Makefile.orig	Thu May  3 12:13:20 2001
++++ src/main/Makefile	Thu May  3 12:19:41 2001
 @@ -7,15 +7,15 @@
  
  ####### Compiler, tools and options
@@ -13,13 +13,13 @@
 +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
++INCPATH	=	-I../../include -I${LOCALBASE}/include/mysql -I$(X11BASE)/include/qt2
  LINK	=	g++
  LFLAGS	=	
--LIBS	=	-L$(QTDIR)/lib -L/usr/X11R6/lib -L../../lib -lmysqlnavigator -lqt -lXext -lX11 -lm
+-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 -lmysqlnavigator -lqt2 -lXext -lX11 -lm
-+MOC	=	$(QTDIR)/bin/moc2
++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
index 94eeb7728a87..85695e83ba54 100644
--- a/databases/mysql-navigator/files/patch-ac
+++ b/databases/mysql-navigator/files/patch-ac
@@ -1,5 +1,5 @@
---- src/mysql/Makefile.orig	Fri Mar 23 03:50:33 2001
-+++ src/mysql/Makefile	Fri Mar 30 14:13:30 2001
+--- 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
@@ -13,11 +13,11 @@
 +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
++INCPATH	=	-I../../pics -I../../include -I${LOCALBASE}/include/mysql -I${X11BASE}/include/qt2
  LINK	=	g++
- LFLAGS	=	-shared -Wl,-soname,libmysqlnavigator.so.1
+ 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
++LIBS	=	-L${LOCALBASE}/lib/mysql -L${X11BASE}/lib -lmysqlclient -lqt2 -lXext -lX11 -lm
  AR	=	ar cqs
  RANLIB	=	
 -MOC	=	$(QTDIR)/bin/moc
@@ -25,34 +25,42 @@
  
  TAR	=	tar -cf
  GZIP	=	gzip -9f
-@@ -215,12 +215,10 @@
- 		../../include/moc_xport.o \
- 		../../include/moc_querylistview.o
+@@ -225,12 +225,10 @@
+ 		../../include/moc_popupcombobox.o \
+ 		../../include/moc_field.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
+-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
  
-@@ -246,13 +244,10 @@
- all: $(TARGET)
+@@ -253,19 +251,15 @@
  
- $(TARGET): $(OBJECTS) $(OBJMOC) 
+ ####### 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)
--	-cp -df libmysqlnavigator* ../../lib
--	-rm -rf libmysqlnavigator*
-+	-cp libmysqlnavigator* ../../lib
+ 	-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/pkg-plist b/databases/mysql-navigator/pkg-plist
index 38f2f43d42e5..404484160884 100644
--- a/databases/mysql-navigator/pkg-plist
+++ b/databases/mysql-navigator/pkg-plist
@@ -1,3 +1,3 @@
 bin/mysql_navigator
-lib/libmysqlnavigator.so
-lib/libmysqlnavigator.so.1
+lib/libmysqlui.so
+lib/libmysqlui.so.1