Revbump after Nokia has changed the distfile for Qt4

11 files changed, 29 insertions, 36 deletions

diff --git a/x11/qt4-docs/Makefile b/x11/qt4-docs/Makefile
index 5c665223623..0dce30b691b 100644
--- a/x11/qt4-docs/Makefile
+++ b/x11/qt4-docs/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2011/05/05 12:37:07 adam Exp $
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-.include "../../x11/qt4-libs/Makefile.common"
+# $NetBSD: Makefile,v 1.17 2011/09/18 09:01:30 adam Exp $
 
 PKGNAME=	qt4-docs-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	Documentation for the QT C++ X GUI toolkit
 
+.include "../../x11/qt4-libs/Makefile.common"
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 PLIST_SRC=		${WRKDIR}/PLIST
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index d941dcd5715..7dcf95cfbc5 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2011/09/04 15:42:51 adam Exp $
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+# $NetBSD: Makefile,v 1.65 2011/09/18 09:01:30 adam Exp $
 
 PKGNAME=	qt4-libs-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	C++ X GUI toolkit
 
 .include "../../x11/qt4-libs/Makefile.common"
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index ffa527c02cd..aac12602012 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2011/09/04 15:42:51 adam Exp $
+# $NetBSD: Makefile.common,v 1.29 2011/09/18 09:01:30 adam Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -11,6 +11,10 @@
 DISTNAME=	qt-everywhere-opensource-src-${QTVERSION}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.qt.nokia.com/qt/source/
+# XXX the distfile for 4.7.4 has been changed; remove this for future releases
+DIST_SUBDIR=	qt4
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4/Makefile.common"
 
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 8087eab21c0..e239278a845 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.63 2011/09/16 13:19:40 wiz Exp $
+$NetBSD: distinfo,v 1.64 2011/09/18 09:01:30 adam Exp $
 
-SHA1 (qt-everywhere-opensource-src-4.7.4.tar.gz) = ac7b4df34adaa6e9d1fb41743d1f15f5aac481db
-RMD160 (qt-everywhere-opensource-src-4.7.4.tar.gz) = 347ba2c4f855b40bf3ce90adb19c1a87925e6c61
-Size (qt-everywhere-opensource-src-4.7.4.tar.gz) = 219424772 bytes
+SHA1 (qt4/qt-everywhere-opensource-src-4.7.4.tar.gz) = af9016aa924a577f7b06ffd28c9773b56d74c939
+RMD160 (qt4/qt-everywhere-opensource-src-4.7.4.tar.gz) = 3e47b09663a89973b1c8628506c995dfc2a5387c
+Size (qt4/qt-everywhere-opensource-src-4.7.4.tar.gz) = 220388303 bytes
 SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1
 SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
 SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
diff --git a/x11/qt4-mng/Makefile b/x11/qt4-mng/Makefile
index f674e3d2642..ff2aa8b10a6 100644
--- a/x11/qt4-mng/Makefile
+++ b/x11/qt4-mng/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2011/05/05 12:37:07 adam Exp $
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-.include "../../x11/qt4-libs/Makefile.common"
+# $NetBSD: Makefile,v 1.11 2011/09/18 09:01:31 adam Exp $
 
 PKGNAME=	qt4-mng-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	QT MNG image format plugin
 
+.include "../../x11/qt4-libs/Makefile.common"
 CONFIGURE_ARGS+=	-I${QTDIR}/include
 CONFIGURE_ARGS+=	-L${QTDIR}/lib
 
diff --git a/x11/qt4-mysql/Makefile b/x11/qt4-mysql/Makefile
index fc7dcec21ac..1fde8eb7365 100644
--- a/x11/qt4-mysql/Makefile
+++ b/x11/qt4-mysql/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2011/05/05 12:37:07 adam Exp $
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+# $NetBSD: Makefile,v 1.19 2011/09/18 09:01:31 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-mysql-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	QT mysql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include
diff --git a/x11/qt4-pgsql/Makefile b/x11/qt4-pgsql/Makefile
index 9f2ebdca92b..3aad669ba55 100644
--- a/x11/qt4-pgsql/Makefile
+++ b/x11/qt4-pgsql/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2011/05/05 12:37:07 adam Exp $
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+# $NetBSD: Makefile,v 1.25 2011/09/18 09:01:31 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-pgsql-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	QT postgresql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include
diff --git a/x11/qt4-qdbus/Makefile b/x11/qt4-qdbus/Makefile
index 64dbad337d8..ab958819ac4 100644
--- a/x11/qt4-qdbus/Makefile
+++ b/x11/qt4-qdbus/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2011/05/05 12:37:08 adam Exp $
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+# $NetBSD: Makefile,v 1.21 2011/09/18 09:01:31 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-qdbus-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	QT DBus support
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
diff --git a/x11/qt4-sqlite3/Makefile b/x11/qt4-sqlite3/Makefile
index 2a2cd2f5c45..f03539a7fab 100644
--- a/x11/qt4-sqlite3/Makefile
+++ b/x11/qt4-sqlite3/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2011/09/04 15:42:52 adam Exp $
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+# $NetBSD: Makefile,v 1.21 2011/09/18 09:01:31 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-sqlite3-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	QT sqlite3 driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include
diff --git a/x11/qt4-tiff/Makefile b/x11/qt4-tiff/Makefile
index afc41b6e9b6..2d8c62a02ec 100644
--- a/x11/qt4-tiff/Makefile
+++ b/x11/qt4-tiff/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2011/09/04 15:42:52 adam Exp $
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+# $NetBSD: Makefile,v 1.20 2011/09/18 09:01:31 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-tiff-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	QT TIFF image format plugin
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index 7fba893a3db..225b60baeb3 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2011/09/14 18:12:57 hans Exp $
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+# $NetBSD: Makefile,v 1.48 2011/09/18 09:01:31 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-tools-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
 DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base