Updated to latest release, 2.0beta1. Now based on Qt4.6. No ChangeLog in

distfile. pkgsrc changes: Added LICENSE. Fixed typo in COMMENT. Added
patch to make this work with Qt>4.6. Use qt4-{libs,tools} instead of Qt3.

3 files changed, 47 insertions, 14 deletions

diff --git a/databases/sqlitebrowser/Makefile b/databases/sqlitebrowser/Makefile
index b93a3f97f7d..4af82894c91 100644
--- a/databases/sqlitebrowser/Makefile
+++ b/databases/sqlitebrowser/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:20:41 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/05/26 12:14:56 rodent Exp $
 
-DISTNAME=	sqlitebrowser-1.3-src
-PKGNAME=	sqlitebrowser-1.3
-PKGREVISION=	7
+DISTNAME=	sqlitebrowser_200_b1_src
+PKGNAME=	${DISTNAME:S/_200_b1_src/-2.0beta1/1}
 CATEGORIES=	databases x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sqlitebrowser/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-COMMENT=	QT3 lightweight GUI editor/viewer for SQLite Databases
+COMMENT=	Qt4 lightweight GUI editor/viewer for SQLite Databases
 HOMEPAGE=	http://sqlitebrowser.sourceforge.net/
+LICENSE=	public-domain
 
-WRKSRC=		${WRKDIR}/sqlitebrowser
+WRKSRC=		${WRKDIR}/trunk/sqlitebrowser
 
 USE_LANGUAGES=	c c++
 QMAKE=		${QTDIR}/bin/qmake
 
 INSTALLATION_DIRS=	bin
 
-BUILDLINK_DEPMETHOD.qt3-tools=	build
+BUILDLINK_DEPMETHOD.qt4-tools=	build
 
 do-configure:
 	cd ${WRKSRC} && ${QMAKE} QMAKE=${QMAKE:Q} sqlitedbbrowser.pro
@@ -25,6 +25,6 @@ do-configure:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sqlitebrowser/sqlitebrowser ${DESTDIR}${PREFIX}/bin
 
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqlitebrowser/distinfo b/databases/sqlitebrowser/distinfo
index 3b12b49967b..f6797316247 100644
--- a/databases/sqlitebrowser/distinfo
+++ b/databases/sqlitebrowser/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2011/07/19 00:34:16 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2013/05/26 12:14:56 rodent Exp $
 
-SHA1 (sqlitebrowser-1.3-src.tar.gz) = 5defc7965e352bcaf8c763b76b2cfe11360b68f9
-RMD160 (sqlitebrowser-1.3-src.tar.gz) = 884330dd595ec091f1aab885cb845dd19adeb189
-Size (sqlitebrowser-1.3-src.tar.gz) = 563588 bytes
-SHA1 (patch-sqlitebrowser_sqlbrowser__util.c) = 5f864ab81ce70d9ed34b27b7d6234612fc6c07d4
+SHA1 (sqlitebrowser_200_b1_src.tar.gz) = e8e1a08a0f728df0984f0c08577c91863bf91b62
+RMD160 (sqlitebrowser_200_b1_src.tar.gz) = f5f1cf3f5d300a80a1cfec31a0f1631801f35ec3
+Size (sqlitebrowser_200_b1_src.tar.gz) = 1136660 bytes
+SHA1 (patch-sqlitebrowser_sqlitedb.h) = a9e9a727fb1152ded78669ae76e7df9fa363646f
diff --git a/databases/sqlitebrowser/patches/patch-sqlitebrowser_sqlitedb.h b/databases/sqlitebrowser/patches/patch-sqlitebrowser_sqlitedb.h
new file mode 100644
index 00000000000..44c14c850d5
--- /dev/null
+++ b/databases/sqlitebrowser/patches/patch-sqlitebrowser_sqlitedb.h
@@ -0,0 +1,33 @@
+$NetBSD: patch-sqlitebrowser_sqlitedb.h,v 1.1 2013/05/26 12:14:56 rodent Exp $
+
+Fixes "call of overloaded 'QString(int)' is ambiguous" error.
+
+--- sqlitebrowser/sqlitedb.h.orig	2009-12-02 17:26:58.000000000 +0000
++++ sqlitebrowser/sqlitedb.h
+@@ -41,7 +41,7 @@ typedef QMap<int, QString> resultMap;
+ class DBBrowserField
+     {    
+     public:
+-        DBBrowserField() : name( 0 ) { }
++        DBBrowserField() : name( ) { }
+         DBBrowserField( const QString& wname,const QString& wtype )
+             : name( wname), type( wtype )
+         { }
+@@ -55,7 +55,7 @@ class DBBrowserField
+ class DBBrowserIndex
+     {    
+     public:
+-        DBBrowserIndex() : name( 0 ) { }
++        DBBrowserIndex() : name( ) { }
+        DBBrowserIndex( const QString& wname,const QString& wsql )
+             : name( wname), sql( wsql )
+         { }
+@@ -70,7 +70,7 @@ private:
+ class DBBrowserTable
+     {    
+     public:
+-        DBBrowserTable() : name( 0 ) { }
++        DBBrowserTable() : name( ) { }
+         DBBrowserTable( const QString& wname,const QString& wsql )
+             : name( wname), sql( wsql )
+         { }