From 097977c2b785b955b9b1282278ea79bb0f90855c Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Sat, 11 Jul 2009 09:11:13 +0000
Subject: Fixed some pkglint warnings for qt3-docs.

---
 x11/qt3-docs/Makefile         |  8 +++++---
 x11/qt3-libs/Makefile.common  |  3 ++-
 x11/qt3-libs/distinfo         | 16 ++++++++--------
 x11/qt3-libs/patches/patch-ca |  3 +--
 x11/qt3-libs/patches/patch-cb |  4 +---
 x11/qt3-libs/patches/patch-cc |  4 +---
 x11/qt3-libs/patches/patch-cd |  4 +---
 x11/qt3-libs/patches/patch-ce |  4 +---
 x11/qt3-libs/patches/patch-cf |  4 +---
 x11/qt3-libs/patches/patch-cg |  3 +--
 x11/qt3/Makefile.common       |  3 ++-
 11 files changed, 24 insertions(+), 32 deletions(-)

(limited to 'x11')

diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile
index 1942f8cc84f..e76b7ee3ed7 100644
--- a/x11/qt3-docs/Makefile
+++ b/x11/qt3-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/07/07 18:10:58 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/11 09:11:13 rillig Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -15,18 +15,20 @@ NO_BUILD=	yes
 INSTALLATION_DIRS=	${QTPREFIX}/doc/html ${QTPREFIX}/man/man3
 
 do-install:
-	@cd ${WRKSRC}/doc/man/man3; PAGES="`ls -1 | ${SED} -e 's,3qt$$,3,'`"; \
+	set -e; \
+	cd ${WRKSRC}/doc/man/man3; PAGES="`ls -1 | ${SED} -e 's,3qt$$,3,'`"; \
 	(for PAGE in $$PAGES; do \
 	    ${ECHO} installing ${DESTDIR}${QTPREFIX}/man/man3/$${PAGE}; \
 	    set - X `head -1 $${PAGE}qt`; \
 	    if [ $$# -eq 3 ] && [ "$$2" = .so ]; then \
-		${LN} -fs `basename $$3 | ${SED} s/qt$$//` \
+		${LN} -fs `basename $$3 | ${SED} 's/qt$$//'` \
 		  ${DESTDIR}${QTPREFIX}/man/man3/$${PAGE}; \
 	    else \
 		${INSTALL_MAN} $${PAGE}qt ${DESTDIR}${QTPREFIX}/man/man3/$${PAGE}; \
 	    fi; \
 	 done)
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README-QT.TXT ${DESTDIR}${QTPREFIX}/doc/html
+	set -e; \
 	cd ${WRKSRC};  \
 	DOCDIRS="`${FIND} doc/html -type d -print | ${SORT}`"; \
 	(for d in $${DOCDIRS}; do \
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index e6f43f7512c..6f1f30ad2d5 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.common,v 1.70 2008/02/16 22:41:31 tnn Exp $
+# $NetBSD: Makefile.common,v 1.71 2009/07/11 09:11:13 rillig Exp $
+# used by x11/qt3-docs/Makefile
 
 DISTNAME=	qt-x11-free-${QTVERSION}
 CATEGORIES=	x11
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index cfa08df80a4..ca430337abe 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2009/05/20 01:00:40 wiz Exp $
+$NetBSD: distinfo,v 1.51 2009/07/11 09:11:13 rillig Exp $
 
 SHA1 (qt-x11-free-3.3.8.tar.bz2) = 91b192cb8e80679607d24ae35d6e20ed68d149d7
 RMD160 (qt-x11-free-3.3.8.tar.bz2) = 7b8e4e35f49014eac4fcfe91b7ec0a45c5569cf4
@@ -24,12 +24,12 @@ SHA1 (patch-ar) = 84c0d7153feabcab6558ba84fbaa723f1c238e40
 SHA1 (patch-bb) = b6a15a4b2b7b83b89bd3610cf2e48c242dbce2e5
 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41
 SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830
-SHA1 (patch-ca) = ea01baa00b69f51ee8a8b9d22fda0e73ef72c568
-SHA1 (patch-cb) = 5503e04dc0446253fdedd07b34abb15d9c4cceeb
-SHA1 (patch-cc) = 1df4209b939c881f5aa294a6b02e6f8aa3a6fb72
-SHA1 (patch-cd) = 28fee429d9dd6c24a2e82b7bf87f913c85f5d6f1
-SHA1 (patch-ce) = d99fad12c395eecb34c5cddbcfe583426e91edb0
-SHA1 (patch-cf) = bb9d3dc04bb0bc3b9a089104a61f22a31f57c2c0
-SHA1 (patch-cg) = 28a663c77b1f72b5750445a010de932850d7c1c5
+SHA1 (patch-ca) = 2b568a6de41ca4ec263643cdd9c434be1c7350ba
+SHA1 (patch-cb) = 1c68df20f6cbc11eabeb7842bc4fb9cea0fc8de1
+SHA1 (patch-cc) = 256a960bd316f62176417e5355b376173b97a7c2
+SHA1 (patch-cd) = bb03346ccd04374c3baa33bc1922fe4a3bb99ada
+SHA1 (patch-ce) = 6dbf1d619782be1c4522ec019df3936a2538ea39
+SHA1 (patch-cf) = 4a38cf1a82ef03a85ecb5787e5954f0c8a0afbda
+SHA1 (patch-cg) = 4ae34d2556314e6bf35160c018987a453055a0eb
 SHA1 (patch-ia) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
 SHA1 (patch-ib) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
diff --git a/x11/qt3-libs/patches/patch-ca b/x11/qt3-libs/patches/patch-ca
index 919d7b499f4..7c44a38ba4e 100644
--- a/x11/qt3-libs/patches/patch-ca
+++ b/x11/qt3-libs/patches/patch-ca
@@ -1,8 +1,7 @@
-$NetBSD: patch-ca,v 1.1 2007/08/01 20:51:23 tron Exp $
+$NetBSD: patch-ca,v 1.2 2009/07/11 09:11:13 rillig Exp $
 
 --- src/widgets/qtextedit.cpp	Mon Jul 16 10:44:40 CEST 2007
 +++ src/widgets/qtextedit.cpp	Mon Jul 16 10:44:40 CEST 2007
-
 @@ -6349,7 +6349,7 @@
  		    cur = tag->prev;
  		    if ( !cur ) {
diff --git a/x11/qt3-libs/patches/patch-cb b/x11/qt3-libs/patches/patch-cb
index ae5081b957c..c9cbbd3013d 100644
--- a/x11/qt3-libs/patches/patch-cb
+++ b/x11/qt3-libs/patches/patch-cb
@@ -1,8 +1,7 @@
-$NetBSD: patch-cb,v 1.1 2007/08/01 20:51:24 tron Exp $
+$NetBSD: patch-cb,v 1.2 2009/07/11 09:11:13 rillig Exp $
 
 --- src/sql/qdatatable.cpp	Mon Jul 16 10:45:03 CEST 2007
 +++ src/sql/qdatatable.cpp	Mon Jul 16 10:45:03 CEST 2007
-
 @@ -1043,8 +1043,8 @@
  	return FALSE;
      if ( !sqlCursor()->canInsert() ) {
@@ -46,4 +45,3 @@ $NetBSD: patch-cb,v 1.1 2007/08/01 20:51:24 tron Exp $
  #endif
  	return FALSE;
      }
-
diff --git a/x11/qt3-libs/patches/patch-cc b/x11/qt3-libs/patches/patch-cc
index 4fc6c633229..0439f841264 100644
--- a/x11/qt3-libs/patches/patch-cc
+++ b/x11/qt3-libs/patches/patch-cc
@@ -1,8 +1,7 @@
-$NetBSD: patch-cc,v 1.1 2007/08/01 20:51:24 tron Exp $
+$NetBSD: patch-cc,v 1.2 2009/07/11 09:11:13 rillig Exp $
 
 --- src/sql/qsqldatabase.cpp	Mon Jul 16 10:45:03 CEST 2007
 +++ src/sql/qsqldatabase.cpp	Mon Jul 16 10:45:03 CEST 2007
-
 @@ -234,7 +234,8 @@
  	db->open();
  #ifdef QT_CHECK_RANGE
@@ -22,4 +21,3 @@ $NetBSD: patch-cc,v 1.1 2007/08/01 20:51:24 tron Exp $
  #endif
  	d->driver = new QNullDriver();
  	d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
-
diff --git a/x11/qt3-libs/patches/patch-cd b/x11/qt3-libs/patches/patch-cd
index d7600139f5d..bc53d29b20d 100644
--- a/x11/qt3-libs/patches/patch-cd
+++ b/x11/qt3-libs/patches/patch-cd
@@ -1,8 +1,7 @@
-$NetBSD: patch-cd,v 1.1 2007/08/01 20:51:24 tron Exp $
+$NetBSD: patch-cd,v 1.2 2009/07/11 09:11:13 rillig Exp $
 
 --- src/sql/qsqlindex.cpp	Mon Jul 16 10:45:03 CEST 2007
 +++ src/sql/qsqlindex.cpp	Mon Jul 16 10:45:03 CEST 2007
-
 @@ -273,7 +273,7 @@
  	if ( field )
  	    newSort.append( *field, desc );
@@ -12,4 +11,3 @@ $NetBSD: patch-cd,v 1.1 2007/08/01 20:51:24 tron Exp $
      }
      return newSort;
  }
-
diff --git a/x11/qt3-libs/patches/patch-ce b/x11/qt3-libs/patches/patch-ce
index f6a656e15ab..1d63e36f2ff 100644
--- a/x11/qt3-libs/patches/patch-ce
+++ b/x11/qt3-libs/patches/patch-ce
@@ -1,8 +1,7 @@
-$NetBSD: patch-ce,v 1.1 2007/08/01 20:51:25 tron Exp $
+$NetBSD: patch-ce,v 1.2 2009/07/11 09:11:13 rillig Exp $
 
 --- src/sql/qsqlrecord.cpp	Mon Jul 16 10:45:03 CEST 2007
 +++ src/sql/qsqlrecord.cpp	Mon Jul 16 10:45:03 CEST 2007
-
 @@ -298,7 +298,7 @@
  	    return i;
      }
@@ -30,4 +29,3 @@ $NetBSD: patch-ce,v 1.1 2007/08/01 20:51:25 tron Exp $
  #endif // QT_CHECK_RANGE
  	return 0;
      }
-
diff --git a/x11/qt3-libs/patches/patch-cf b/x11/qt3-libs/patches/patch-cf
index 1579b363bcb..648c6653b67 100644
--- a/x11/qt3-libs/patches/patch-cf
+++ b/x11/qt3-libs/patches/patch-cf
@@ -1,8 +1,7 @@
-$NetBSD: patch-cf,v 1.1 2007/08/01 20:51:25 tron Exp $
+$NetBSD: patch-cf,v 1.2 2009/07/11 09:11:13 rillig Exp $
 
 --- src/tools/qglobal.cpp	Mon Jul 16 10:45:03 CEST 2007
 +++ src/tools/qglobal.cpp	Mon Jul 16 10:45:03 CEST 2007
-
 @@ -680,7 +680,7 @@
      if ( code != -1 )
  	qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
@@ -12,4 +11,3 @@ $NetBSD: patch-cf,v 1.1 2007/08/01 20:51:25 tron Exp $
  #endif
  #else
      Q_UNUSED( msg );
-
diff --git a/x11/qt3-libs/patches/patch-cg b/x11/qt3-libs/patches/patch-cg
index e7f0218b11d..fdb2b835885 100644
--- a/x11/qt3-libs/patches/patch-cg
+++ b/x11/qt3-libs/patches/patch-cg
@@ -1,8 +1,7 @@
-$NetBSD: patch-cg,v 1.1 2007/08/01 20:51:26 tron Exp $
+$NetBSD: patch-cg,v 1.2 2009/07/11 09:11:13 rillig Exp $
 
 --- src/xml/qsvgdevice.cpp	Mon Jul 16 10:45:03 CEST 2007
 +++ src/xml/qsvgdevice.cpp	Mon Jul 16 10:45:03 CEST 2007
-
 @@ -978,7 +978,7 @@
  		// ### catch references to embedded .svg files
  		QPixmap pix;
diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common
index 3c5b85a9c14..d37e130d74b 100644
--- a/x11/qt3/Makefile.common
+++ b/x11/qt3/Makefile.common
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.common,v 1.23 2007/10/12 20:13:29 rillig Exp $
+# $NetBSD: Makefile.common,v 1.24 2009/07/11 09:11:13 rillig Exp $
+# used by x11/qt3-libs/Makefile.common
 
 QTVERSION=	3.3.8
 
-- 
cgit v1.2.3