Remove a number of spurious semicolons, rename a variable shadowing

itself and fix include of fnmatch.h, which can be obtained from
Heimdal. The latter can go away after the branch, when Heimdal itself
is fixed.

10 files changed, 142 insertions, 4 deletions

diff --git a/graphics/pixieplus/distinfo b/graphics/pixieplus/distinfo
index 21196ada5e3..c8f41313cef 100644
--- a/graphics/pixieplus/distinfo
+++ b/graphics/pixieplus/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/11/14 08:42:44 markd Exp $
+$NetBSD: distinfo,v 1.8 2006/06/21 21:00:49 joerg Exp $
 
 SHA1 (pixieplus-0.5.4.tar.gz) = bea6ce3e030fecb9ecceaaf85d155ccc9a4550d5
 RMD160 (pixieplus-0.5.4.tar.gz) = 73c164e8bd66f045c09b9396e2ce777d6daca363
@@ -6,6 +6,14 @@ Size (pixieplus-0.5.4.tar.gz) = 2297945 bytes
 SHA1 (patch-aa) = e9383e025b871ce6629f5924eec3f2bf305c0df4
 SHA1 (patch-ab) = 8b8530ad5d0827504947d9c798efda2e11e0f415
 SHA1 (patch-ac) = 38824b02aba0695e025fe3995f31bc376dd44518
-SHA1 (patch-ad) = 7deca58da1d8e181bf62c39f598f696584a1ed26
+SHA1 (patch-ad) = fea08f39973b532be38b758ce697ac139c708bd3
 SHA1 (patch-ae) = e9d4ca1bede5f07d79d2d6a5bc5b2d97f298a93f
 SHA1 (patch-af) = 42b4d4dfef5c286ae703ed6b4ce7813865142bf1
+SHA1 (patch-ag) = d3ab5cf53d4ad22b08e14dc4d0e763d1ea962159
+SHA1 (patch-ah) = a06fe1e575892283441c8399b95c5d8b314d3af7
+SHA1 (patch-ai) = 143a146e0e8544f9fa95c7a2d7ebdc08ee1855ab
+SHA1 (patch-aj) = 84d0813e3d1a90aad583efa5f018a2fccf6a2f10
+SHA1 (patch-ak) = d1f5dd591396c6cdcc1a54297875424fb9883995
+SHA1 (patch-al) = f0239380ce03e3d9d83b6905e8bebfbfbded9849
+SHA1 (patch-am) = 0333d1c6d7476c5da6fb30c2aee957427f3973e4
+SHA1 (patch-an) = 0d0f560fe4c23857f3c816324b52f7ed8e882527
diff --git a/graphics/pixieplus/patches/patch-ad b/graphics/pixieplus/patches/patch-ad
index 4a4419e1a02..3111b57f39e 100644
--- a/graphics/pixieplus/patches/patch-ad
+++ b/graphics/pixieplus/patches/patch-ad
@@ -1,7 +1,25 @@
-$NetBSD: patch-ad,v 1.1 2004/09/11 12:11:53 markd Exp $
+$NetBSD: patch-ad,v 1.2 2006/06/21 21:00:49 joerg Exp $
 
---- app/batch.cpp.orig	2004-09-11 23:18:29.000000000 +1200
+--- app/batch.cpp.orig	2003-02-09 04:56:49.000000000 +0000
 +++ app/batch.cpp
+@@ -196,7 +196,7 @@ frequency of the sine wave."), this);
+     connect(bbox->addButton(i18n("Cancel")), SIGNAL(clicked()), this,
+             SLOT(reject()));
+     layout->addWidget(bbox);
+-};
++}
+ 
+ KIFShadeDialog::KIFShadeDialog(QWidget *parent, const char *name)
+     : QDialog(parent, name, true)
+@@ -228,7 +228,7 @@ KIFShadeDialog::KIFShadeDialog(QWidget *
+     connect(bbox->addButton(i18n("Cancel")), SIGNAL(clicked()), this,
+             SLOT(reject()));
+     layout->addWidget(bbox);
+-};
++}
+ 
+ KIFTextDialog::KIFTextDialog(QWidget *parent, const char *name)
+     : QDialog(parent, name, true)
 @@ -618,9 +618,9 @@ bool BatchEffect::applyMagickEffect(cons
      else if(type == Equalize)
          EqualizeImage(img);
diff --git a/graphics/pixieplus/patches/patch-ag b/graphics/pixieplus/patches/patch-ag
new file mode 100644
index 00000000000..d9feae4b53c
--- /dev/null
+++ b/graphics/pixieplus/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.1 2006/06/21 21:00:49 joerg Exp $
+
+--- misc/qxcfi.cpp.orig	2006-06-21 19:17:12.000000000 +0000
++++ misc/qxcfi.cpp
+@@ -1342,7 +1342,11 @@ void XCFImageFormat::assignMaskBytes ( L
+ bool XCFImageFormat::loadProperty ( QDataStream& xcf_io, PropType& type,
+ 				    QByteArray& bytes )
+ {
+-  xcf_io >> (Q_UINT32)type;
++  {
++    Q_UINT32 type_tmp = type;
++    xcf_io >> type_tmp;
++    type = (PropType)type_tmp;
++  }
+ 
+   if ( xcf_io.device()->status() != IO_Ok ) {
+     qDebug( "XCF: read failure on property type" );
diff --git a/graphics/pixieplus/patches/patch-ah b/graphics/pixieplus/patches/patch-ah
new file mode 100644
index 00000000000..7f68e41ce61
--- /dev/null
+++ b/graphics/pixieplus/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2006/06/21 21:00:49 joerg Exp $
+
+--- app/batch.h.orig	2006-06-21 19:24:54.000000000 +0000
++++ app/batch.h
+@@ -17,7 +17,7 @@
+ #define off_t long long
+ extern "C"{
+ #include <api.h>
+-};
++}
+ 
+ class KProgress;
+ class QLabel;
diff --git a/graphics/pixieplus/patches/patch-ai b/graphics/pixieplus/patches/patch-ai
new file mode 100644
index 00000000000..70e3c349137
--- /dev/null
+++ b/graphics/pixieplus/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2006/06/21 21:00:49 joerg Exp $
+
+--- app/ifapp.h.orig	2006-06-21 19:25:21.000000000 +0000
++++ app/ifapp.h
+@@ -14,7 +14,7 @@
+ #define off_t long long
+ extern "C"{
+ #include <api.h>
+-};
++}
+ 
+ class KIFFileList;
+ class KIFImage;
diff --git a/graphics/pixieplus/patches/patch-aj b/graphics/pixieplus/patches/patch-aj
new file mode 100644
index 00000000000..93ad8b8cc43
--- /dev/null
+++ b/graphics/pixieplus/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2006/06/21 21:00:49 joerg Exp $
+
+--- app/screengrab.cpp.orig	2006-06-21 19:34:54.000000000 +0000
++++ app/screengrab.cpp
+@@ -125,7 +125,7 @@ with your mouse."), this);
+     while(inLoop)
+         kapp->processEvents();
+     delete this;
+-};
++}
+ 
+ void KIFScreenGrab::slotCheckIfDelay()
+ {
diff --git a/graphics/pixieplus/patches/patch-ak b/graphics/pixieplus/patches/patch-ak
new file mode 100644
index 00000000000..239e7596eb7
--- /dev/null
+++ b/graphics/pixieplus/patches/patch-ak
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.1 2006/06/21 21:00:49 joerg Exp $
+
+--- app/rightclick.cpp.orig	2006-06-21 19:41:04.000000000 +0000
++++ app/rightclick.cpp
+@@ -220,9 +220,9 @@ void EditMenu::aboutToShowSlot()
+             idx = -1;
+     }
+     if(idx != -1){
+-        QStringList itemList(view->itemCatagories(&itemList[idx]));
++        QStringList itemList2(view->itemCatagories(&itemList[idx]));
+         for(it=catList.begin(), i=1000; it != catList.end(); ++it, ++i){
+-            if(itemList.findIndex((*it)) == -1)
++            if(itemList2.findIndex((*it)) == -1)
+                 addMnu->insertItem((*it), i);
+             else
+                 delMnu->insertItem((*it), i+1000);
diff --git a/graphics/pixieplus/patches/patch-al b/graphics/pixieplus/patches/patch-al
new file mode 100644
index 00000000000..05431e92742
--- /dev/null
+++ b/graphics/pixieplus/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2006/06/21 21:00:49 joerg Exp $
+
+--- app/imageutils.cpp.orig	2006-06-21 19:49:46.000000000 +0000
++++ app/imageutils.cpp
+@@ -23,7 +23,7 @@
+ #define off_t long long
+ extern "C"{
+ #include <api.h>
+-};
++}
+ 
+ // in compressedgif.cpp
+ unsigned int WriteCompressedGIFImage(const ImageInfo *image_info,
diff --git a/graphics/pixieplus/patches/patch-am b/graphics/pixieplus/patches/patch-am
new file mode 100644
index 00000000000..728d59e7a52
--- /dev/null
+++ b/graphics/pixieplus/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2006/06/21 21:00:49 joerg Exp $
+
+--- app/main.cpp.orig	2006-06-21 19:57:51.000000000 +0000
++++ app/main.cpp
+@@ -21,7 +21,7 @@
+ #define off_t long long
+ extern "C"{
+ #include <api.h>
+-};
++}
+ 
+ 
+ /* Signal handlers. We install them for pretty much everything that can
diff --git a/graphics/pixieplus/patches/patch-an b/graphics/pixieplus/patches/patch-an
new file mode 100644
index 00000000000..8666aa57e20
--- /dev/null
+++ b/graphics/pixieplus/patches/patch-an
@@ -0,0 +1,14 @@
+$NetBSD: patch-an,v 1.1 2006/06/21 21:00:49 joerg Exp $
+
+--- app/browser.cpp.orig	2006-06-21 20:23:16.000000000 +0000
++++ app/browser.cpp
+@@ -36,7 +36,9 @@
+ 
+ #include <unistd.h>
+ #include <sys/types.h>
++extern "C" {
+ #include <fnmatch.h>
++}
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <math.h>