fix to build again: some sub-build tries to be clever and generate

BSD-makefile syntax on *BSD, but since the pkg is built with gmake this
fails (the pkg appearently didn't change for a while, some infrastructure
change must have triggered this)

5 files changed, 89 insertions, 9 deletions

diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 133d28a6a51..4fd459509c7 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/08/26 19:57:37 sno Exp $
+# $NetBSD: Makefile,v 1.25 2009/12/22 15:42:20 drochner Exp $
 
 DISTNAME=	cinepaint-0.22-1
 PKGNAME=	cinepaint-0.22.1
@@ -32,4 +32,5 @@ BUILDLINK_API_DEPENDS.lcms+=	lcms>=1.13 # needs _cmsLCMScolorSpace
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cinepaint/PLIST b/graphics/cinepaint/PLIST
index 91ab9a84193..56ca53ce551 100644
--- a/graphics/cinepaint/PLIST
+++ b/graphics/cinepaint/PLIST
@@ -1,9 +1,64 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 20:05:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/12/22 15:42:20 drochner Exp $
 bin/cinepaint
 bin/cinepaint-remote
 bin/cinepainttool
 include/cinepaint/app/errors.h
 include/cinepaint/app/trace.h
+include/cinepaint/chainbutton.h
+include/cinepaint/channelops_pdb.h
+include/cinepaint/compat.h
+include/cinepaint/config.h
+include/cinepaint/convert_pdb.h
+include/cinepaint/dialog.h
+include/cinepaint/dll_api.h
+include/cinepaint/edit_pdb.h
+include/cinepaint/export.h
+include/cinepaint/fileops_pdb.h
+include/cinepaint/fl_i18n_cinepaint.h
+include/cinepaint/float16.h
+include/cinepaint/gtkdirtree.h
+include/cinepaint/guides_pdb.h
+include/cinepaint/helpui.h
+include/cinepaint/image_convert.h
+include/cinepaint/image_limits.h
+include/cinepaint/image_pdb.h
+include/cinepaint/intl.h
+include/cinepaint/libgimp/gimp.h
+include/cinepaint/libgimp/gimp1.2.h
+include/cinepaint/libgimp/gimpcompat.h
+include/cinepaint/libgimp/gimpintl.h
+include/cinepaint/libgimp/gimpmath.h
+include/cinepaint/libgimp/gimpui.h
+include/cinepaint/libgimp/stdplugins-intl.h
+include/cinepaint/matrix.h
+include/cinepaint/menu.h
+include/cinepaint/pdb.h
+include/cinepaint/pixmap.h
+include/cinepaint/plugin_main.h
+include/cinepaint/plugin_pdb.h
+include/cinepaint/rint.h
+include/cinepaint/selection_pdb.h
+include/cinepaint/size_entry.h
+include/cinepaint/ui.h
+include/cinepaint/undo_pdb.h
+include/cinepaint/unit.h
+include/cinepaint/unit_pdb.h
+include/cinepaint/unitmenu.h
+include/cinepaint/version.h
+include/cinepaint/widgets.h
+include/cinepaint/wire/c_typedefs.h
+include/cinepaint/wire/datadir.h
+include/cinepaint/wire/dl_list.h
+include/cinepaint/wire/enums.h
+include/cinepaint/wire/event.h
+include/cinepaint/wire/iodebug.h
+include/cinepaint/wire/libtile.h
+include/cinepaint/wire/precision.h
+include/cinepaint/wire/protocol.h
+include/cinepaint/wire/taskswitch.h
+include/cinepaint/wire/wire.h
+include/cinepaint/wire/wire_types.h
+include/cinepaint/wire/wirebuffer.h
 lib/cinepaint/0.22-1/extra/dcraw
 lib/cinepaint/0.22-1/extra/jhead
 lib/cinepaint/0.22-1/plug-ins/blur
diff --git a/graphics/cinepaint/distinfo b/graphics/cinepaint/distinfo
index 14f6199248a..a589d0d7e5d 100644
--- a/graphics/cinepaint/distinfo
+++ b/graphics/cinepaint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2009/04/28 11:43:31 hasso Exp $
+$NetBSD: distinfo,v 1.13 2009/12/22 15:42:20 drochner Exp $
 
 SHA1 (cinepaint-0.22-1.tar.gz) = 717580b9b8b1044d76f1f0e4330e1c8104e2a206
 RMD160 (cinepaint-0.22-1.tar.gz) = 1f8e06486ed5e74ad483abec305d4fcef0538572
@@ -9,4 +9,5 @@ SHA1 (patch-ac) = ac9d761565da357cb66851df97e8df1d2a599aec
 SHA1 (patch-ad) = 855b8da71b13dde96bafc61e9b4a6ea02cdadfb2
 SHA1 (patch-ae) = c7467b3bfef017e140d8d743ecea34b25418d9d7
 SHA1 (patch-af) = 6232ac8b44bb3d112f12c6354d25e35a88dbf6a0
-SHA1 (patch-ag) = a9927308bb09eb4b9cdbc3ef21eadd21b817dd30
+SHA1 (patch-ag) = 0ee39b21c552311dcaa63d801c6f2dc9c858270b
+SHA1 (patch-ah) = 3415f2b6f775a7b66b9d443cab94757b3b378928
diff --git a/graphics/cinepaint/patches/patch-ag b/graphics/cinepaint/patches/patch-ag
index 9bffc6e74a8..0f0d60cf069 100644
--- a/graphics/cinepaint/patches/patch-ag
+++ b/graphics/cinepaint/patches/patch-ag
@@ -1,13 +1,16 @@
-$NetBSD: patch-ag,v 1.3 2009/04/28 11:43:31 hasso Exp $
+$NetBSD: patch-ag,v 1.4 2009/12/22 15:42:20 drochner Exp $
 
---- plug-ins/icc_examin/icc_examin/configure.orig	2009-04-12 11:30:12 +0300
-+++ plug-ins/icc_examin/icc_examin/configure	2009-04-12 11:31:02 +0300
-@@ -207,7 +207,7 @@ else
+--- plug-ins/icc_examin/icc_examin/configure.orig	2007-05-10 15:48:30.000000000 +0000
++++ plug-ins/icc_examin/icc_examin/configure
+@@ -207,9 +207,9 @@ else
        echo "SunOS                   detected"
        OSUNAME=SunOS
      else
 -      if [ $UNAME_ = "OpenBSD" ] || [ $UNAME_ = "NetBSD" ] || [ $UNAME_ = "FreeBSD" ]; then
 +      if [ $UNAME_ = "OpenBSD" ] || [ $UNAME_ = "NetBSD" ] || [ $UNAME_ = "FreeBSD" ] || [ $UNAME_ = "DragonFly" ]; then
          echo "BSD = 1" >> $CONF
-         OS_EXT=.bsd
+-        OS_EXT=.bsd
++#        OS_EXT=.bsd
          echo "#define BSD 1" >> $CONF_H
+         echo "BSD $UNAME_             detected"
+         OSUNAME=BSD
diff --git a/graphics/cinepaint/patches/patch-ah b/graphics/cinepaint/patches/patch-ah
new file mode 100644
index 00000000000..c2dd378d887
--- /dev/null
+++ b/graphics/cinepaint/patches/patch-ah
@@ -0,0 +1,20 @@
+$NetBSD: patch-ah,v 1.3 2009/12/22 15:42:20 drochner Exp $
+
+--- plug-ins/icc_examin/icc_examin/configure.sh.orig	2007-05-10 15:45:12.000000000 +0000
++++ plug-ins/icc_examin/icc_examin/configure.sh
+@@ -398,11 +398,11 @@ if [ -n "$PREPARE_MAKEFILES" ] && [ $PRE
+   if [ -n "$MAKEFILE_DIR" ]; then
+     for i in $MAKEFILE_DIR; do
+       echo preparing Makefile in "$i/"
+-      if [ $OSUNAME = "BSD" ]; then
+-        test -f "$i/makefile".in && cat  "$i/makefile".in | sed 's/#if/.if/g ; s/#end/.end/g ; s/#else/.else/g '  >> "$i/makefile"
+-      else
++#      if [ $OSUNAME = "BSD" ]; then
++#        test -f "$i/makefile".in && cat  "$i/makefile".in | sed 's/#if/.if/g ; s/#end/.end/g ; s/#else/.else/g '  >> "$i/makefile"
++#      else
+         test -f "$i/makefile".in && cat  "$i/makefile".in | sed 's/#if/if/g ; s/#elif/elif/g ; s/#else/else/g ; s/#end/end/g '  >> "$i/makefile"
+-      fi
++#      fi
+       mv "$i/makefile" "$i/Makefile"
+     done
+   fi