pkg/32774: package update (fix pkglint complaints)

[plunky%rya-online.net@localhost]

>Number:         32774
>Category:       pkg
>Synopsis:       package update (fix: pkglint warnings, qt3-tools dependency, 
>compiler warnings)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Wed Feb 08 11:35:01 +0000 2006
>Originator:     Iain Hibbert
>Release:        NetBSD 3.99.15
>Organization:
http://maps.google.com/maps?q=ireland&ll=52.2711,-9.8630&spn=0.0244,0.0822&t=k
>Environment:
        
        
System: NetBSD galant 3.99.15 NetBSD 3.99.15 (GALANT) #49: Mon Feb 6 21:24:32 
GMT 2006 plunky@galant:/home/plunky/src/sys/arch/i386/compile/GALANT i386
Architecture: i386
Machine: i386
>Description:
This is an update for the wm/icecc package, to correct several errors pointed
out by pkglint

Also, this removes the runtime dependency on qt3-tools; although the python
scripts do use qt3 it is not necessary here as it the dependency is brought
in by the <x11/py-qt3-base/buildlink3.mk> inclusion.

Below is patch and a shar archive

The Makefile is updated to fix the warnings

I added a couple of patches to remove some compiler warnings

I used mkpatches to generate the new patches - it changed the format slightly,
so there are some non functional changes in the old patches which I decided
to leave in as it makes it easier to maintain in future.

so, distfiles is updated.

I incremented PKGREVISION as requested for the qt3-tools issue, though I dont
think it was especially necesary since qt3-tools dependency has not gone away

>How-To-Repeat:
        
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/icecc/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile    5 Jan 2006 10:09:00 -0000       1.3
+++ Makefile    8 Feb 2006 10:33:01 -0000
@@ -3,7 +3,7 @@
 # Package version reflects icecc version, with PKGREVISION incremented
 # for any tool updates, according to the authors scheme.
 DISTNAME=              icecc-2.9
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            wm
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=icecc/}
 DISTFILES=             icecc-2.9.tar.bz2               \
@@ -29,8 +29,8 @@
 
 WRKSRC=                        ${WRKDIR}
 
-QSRC=                  icecc-2.9 icebgset-1.3 iceked-1.5 icemc-2.1
-QSRC+=                 icesndcfg-1.3 icets-1.4 icewoed-1.8
+QSRC=                  icecc-2.9 icebgset-1.3 iceked-1.5 icemc-2.1     \
+                       icesndcfg-1.3 icets-1.4 icewoed-1.8
 
 BUILD_DIRS=            ${QSRC:S/^/${WRKSRC}\//}
 
@@ -45,34 +45,30 @@
 SUBST_FILES.path+=     icewoed-1.8/icewoed.pro
 SUBST_FILES.path+=     icecursorscfg-0.6/icecurcfg.py 
iceiconcvt-1.0/iceiconcvt.py
 SUBST_FILES.path+=     icemergeprefs-0.5/icemergeprefs.py
-SUBST_SED.path=                "s|/usr/local|${PREFIX}|g"
-SUBST_MESSAGE.path=    "Fixing hardcoded paths."
+SUBST_SED.path=                s%/usr/local%${PREFIX:Q}%g
+SUBST_MESSAGE.path=    Fixing hardcoded paths.
 
 # VIM_SUBDIR comes from "editors/vim-share/version.mk"
 PLIST_SUBST+=          VIM_SUBDIR=${VIM_SUBDIR:Q}
 
 do-configure:
 .   for dir in ${QSRC}
-       cd ${WRKSRC}/${dir} && ${QTDIR}/bin/qmake "QMAKE_MKDIR=${MKDIR}" 
"QMAKE_CHK_DIR_EXISTS=${TEST} -d"
+       cd ${WRKSRC:Q}/${dir:Q} && ${QTDIR:Q}/bin/qmake QMAKE_MKDIR=${MKDIR:Q} 
QMAKE_CHK_DIR_EXISTS=${TEST:Q}\ -d
 .   endfor
 
 post-build:
-       cd ${WRKSRC}/icewm4vim && ${GMAKE} QTDIR=${QTDIR}
+       cd ${WRKSRC:Q}/icewm4vim && ${GMAKE:Q} QTDIR=${QTDIR:Q}
 
 post-install:
 .   for script in ${PYTHON_PATCH_SCRIPTS}
-       ${INSTALL_SCRIPT} ${WRKSRC}/${script} ${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC:Q}/${script} ${PREFIX:Q}/bin
 .   endfor
-       ${INSTALL_PROGRAM} ${WRKSRC}/icewm4vim/icecolsel ${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/icewm4vim/icefonsel ${PREFIX}/bin
-       ${INSTALL_DATA} ${WRKSRC}/icewm4vim/icewm.vim 
${PREFIX}/share/vim/${VIM_SUBDIR}/ftplugin/iceprefs.vim
-       ${INSTALL_DATA} ${WRKSRC}/icewm4vim/syntax/icewm.vim 
${PREFIX}/share/vim/${VIM_SUBDIR}/syntax/iceprefs.vim
+       ${INSTALL_PROGRAM} ${WRKSRC:Q}/icewm4vim/icecolsel ${PREFIX:Q}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC:Q}/icewm4vim/icefonsel ${PREFIX:Q}/bin
+       ${INSTALL_DATA} ${WRKSRC:Q}/icewm4vim/icewm.vim 
${PREFIX:Q}/share/vim/${VIM_SUBDIR:Q}/ftplugin/iceprefs.vim
+       ${INSTALL_DATA} ${WRKSRC:Q}/icewm4vim/syntax/icewm.vim 
${PREFIX:Q}/share/vim/${VIM_SUBDIR:Q}/syntax/iceprefs.vim
 
 .include "../../editors/vim-share/version.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/py-qt3-base/buildlink3.mk"
-# XXX Please verify whether qt3-tools is really needed at run-time.
-# If it is, then remove this comment.  If it is not, then remove
-# this comment and the line below, and bump PKGREVISION.
-BUILDLINK_DEPMETHOD.qt3-tools= full
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/icecc/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo    25 Jun 2005 01:55:08 -0000      1.1.1.1
+++ distinfo    8 Feb 2006 10:33:01 -0000
@@ -36,6 +36,8 @@
 SHA1 (icewoed-1.8.tar.bz2) = ca58b5769c27ee587458c12c285e231b990c3da9
 RMD160 (icewoed-1.8.tar.bz2) = 51cf2873f005e8c74239b138d6e5b9f8a1505047
 Size (icewoed-1.8.tar.bz2) = 21955 bytes
-SHA1 (patch-aa) = 5cb9125f34c6adb949aad6806560d1fca0916dae
-SHA1 (patch-ab) = e4cefad52c55b548e1e59dd40799d5cbee9477fe
-SHA1 (patch-ac) = d695ab2fe41c6eba3e827a0f7db59fbf4b376805
+SHA1 (patch-aa) = fedaa883817e2303b2e73a11eb9d9bea29ca513e
+SHA1 (patch-ab) = faaa2bf09109558eab9abd46f04ca91a8edb2e03
+SHA1 (patch-ac) = 90417abb61921232889cc9fcf74cd386b4d91c7a
+SHA1 (patch-ad) = 2b1756705418b23ffd5914d4be6e135eab7d17bc
+SHA1 (patch-ae) = e29b9e20bd5a2c0e58a664e362f0f153e5fc1c64
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/wm/icecc/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patches/patch-aa    25 Jun 2005 01:55:08 -0000      1.1.1.1
+++ patches/patch-aa    8 Feb 2006 10:33:01 -0000
@@ -2,8 +2,8 @@
 
 these utilities were written with qt2 but they still ok with qt3
 
---- icewm4vim/Makefile.orig    2005-03-07 15:55:33.000000000 +0000
-+++ icewm4vim/Makefile 2005-03-07 15:54:07.000000000 +0000
+--- icewm4vim/Makefile.orig    2003-01-01 19:54:29.000000000 +0000
++++ icewm4vim/Makefile
 @@ -1,10 +1,10 @@
  INCLUDE_QT = -I$(QTDIR)/include
 -LIB_QT = -L$(QTDIR)/lib
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/wm/icecc/patches/patch-ab,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ab
--- patches/patch-ab    25 Jun 2005 01:55:09 -0000      1.1.1.1
+++ patches/patch-ab    8 Feb 2006 10:33:01 -0000
@@ -2,9 +2,9 @@
 
 the font descriptor strings have * in them, they need to be quoted
 
---- icewm4vim/icewm.vim.orig   2005-03-13 13:21:06.000000000 +0000
-+++ icewm4vim/icewm.vim        2005-03-13 13:21:28.000000000 +0000
-@@ -20,7 +20,7 @@
+--- icewm4vim/icewm.vim.orig   2003-01-04 21:53:03.000000000 +0000
++++ icewm4vim/icewm.vim
+@@ -20,7 +20,7 @@ function SelectFont()
        if stridx(font, "Font") != -1
                let font = substitute(font, "\"", "", "g")
                let font = substitute(font, ".*=", "", "")
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/wm/icecc/patches/patch-ac,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ac
--- patches/patch-ac    25 Jun 2005 01:55:09 -0000      1.1.1.1
+++ patches/patch-ac    8 Feb 2006 10:33:01 -0000
@@ -2,9 +2,9 @@
 
 make gvim default to using the right filetype syntax/ftplugin
 
---- icecc-2.9/tools.cpp.orig   2005-03-13 15:23:37.000000000 +0000
-+++ icecc-2.9/tools.cpp        2005-03-13 15:24:21.000000000 +0000
-@@ -33,7 +33,7 @@
+--- icecc-2.9/tools.cpp.orig   2003-06-18 20:45:13.000000000 +0100
++++ icecc-2.9/tools.cpp
+@@ -33,7 +33,7 @@ int rectCoords[COUNTTOOLS][4] =
  
  const char *tools[] = {
                          "icemc ~/.icewm/menu",

================================================================================
================================================================================
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#       patches/patch-ad
#       patches/patch-ae
#
echo x - patches/patch-ad
sed 's/^X//' >patches/patch-ad << 'END-of-patches/patch-ad'
X$NetBSD$
X
Xfix compiler warnings
X
X--- icewm4vim/icecolsel.cpp.orig       2006-02-03 14:56:17.000000000 +0000
X+++ icewm4vim/icecolsel.cpp
X@@ -1,3 +1,5 @@
X+#include <sys/stat.h>
X+#include <dirent.h>
X #include <stdio.h>
X 
X #include <qapplication.h>
END-of-patches/patch-ad
echo x - patches/patch-ae
sed 's/^X//' >patches/patch-ae << 'END-of-patches/patch-ae'
X$NetBSD$
X
Xfix compiler warnings
X
X--- icewm4vim/icefonsel.cpp.orig       2006-02-03 14:56:21.000000000 +0000
X+++ icewm4vim/icefonsel.cpp
X@@ -1,3 +1,5 @@
X+#include <sys/stat.h>
X+#include <dirent.h>
X #include <stdio.h>
X 
X #include <qapplication.h>
END-of-patches/patch-ae
exit

>Unformatted: