Sat Apr 19 15:00:09 2014 UTC ()
Some needed inttypes.h for intptr_t. Don't add /usr/include/g++ to
search path.


(joerg)
diff -r1.19 -r1.20 pkgsrc/graphics/cinepaint/distinfo
diff -r1.5 -r1.6 pkgsrc/graphics/cinepaint/patches/patch-ag
diff -r0 -r1.1 pkgsrc/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__modell__beobachter.cpp
diff -r0 -r1.1 pkgsrc/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__thread__daten.cpp
cvs diff -r1.19 -r1.20 pkgsrc/graphics/cinepaint/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/cinepaint/distinfo 2013/10/20 18:08:07 1.19
+++ pkgsrc/graphics/cinepaint/distinfo 2014/04/19 15:00:09 1.20
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1$NetBSD: distinfo,v 1.19 2013/10/20 18:08:07 joerg Exp $ 1$NetBSD: distinfo,v 1.20 2014/04/19 15:00:09 joerg Exp $
2 2
3SHA1 (cinepaint-0.22-1.tar.gz) = 717580b9b8b1044d76f1f0e4330e1c8104e2a206 3SHA1 (cinepaint-0.22-1.tar.gz) = 717580b9b8b1044d76f1f0e4330e1c8104e2a206
4RMD160 (cinepaint-0.22-1.tar.gz) = 1f8e06486ed5e74ad483abec305d4fcef0538572 4RMD160 (cinepaint-0.22-1.tar.gz) = 1f8e06486ed5e74ad483abec305d4fcef0538572
5Size (cinepaint-0.22-1.tar.gz) = 12380745 bytes 5Size (cinepaint-0.22-1.tar.gz) = 12380745 bytes
6SHA1 (patch-aa) = a9a08e9ee48d235a7b862ee660af64afb77036e3 6SHA1 (patch-aa) = a9a08e9ee48d235a7b862ee660af64afb77036e3
7SHA1 (patch-ab) = 601c0cb6dabacb4d88120a6b2784588bcf06b8b5 7SHA1 (patch-ab) = 601c0cb6dabacb4d88120a6b2784588bcf06b8b5
8SHA1 (patch-ac) = 819bd88a7ed2a321d1ae7b1a37ac3e2551ff916d 8SHA1 (patch-ac) = 819bd88a7ed2a321d1ae7b1a37ac3e2551ff916d
9SHA1 (patch-ad) = 643ad8210fa479d4f2c3b83cebc5af92c9a310a1 9SHA1 (patch-ad) = 643ad8210fa479d4f2c3b83cebc5af92c9a310a1
10SHA1 (patch-ae) = 37d0b131dc19406add4bde0af5affbcec7f5930d 10SHA1 (patch-ae) = 37d0b131dc19406add4bde0af5affbcec7f5930d
11SHA1 (patch-af) = 2e6f01e2b246570f1e8fda375a2f1e779d4c47da 11SHA1 (patch-af) = 2e6f01e2b246570f1e8fda375a2f1e779d4c47da
12SHA1 (patch-ag) = cf0f50e7570a62d81c60cc0c05dc576675829a51 12SHA1 (patch-ag) = 76a0058b08c93091f2da9cd6aab7d834e0c0e35f
13SHA1 (patch-ah) = 3415f2b6f775a7b66b9d443cab94757b3b378928 13SHA1 (patch-ah) = 3415f2b6f775a7b66b9d443cab94757b3b378928
14SHA1 (patch-app_gradient.c) = 9b6d38f1d3a5c417b3f69f4107637ec1ec33da0c 14SHA1 (patch-app_gradient.c) = 9b6d38f1d3a5c417b3f69f4107637ec1ec33da0c
15SHA1 (patch-app_layers__dialog.c) = a9c4459edc83bd7e3faf1c90d9f4cff5d5e69a19 15SHA1 (patch-app_layers__dialog.c) = a9c4459edc83bd7e3faf1c90d9f4cff5d5e69a19
16SHA1 (patch-plug-ins_bracketing__to__hdr_br__core_ResponseSolver.hpp) = e5e457d8f8ceb0ae3b4b965cbc740969b4ed81d4 16SHA1 (patch-plug-ins_bracketing__to__hdr_br__core_ResponseSolver.hpp) = e5e457d8f8ceb0ae3b4b965cbc740969b4ed81d4
17SHA1 (patch-plug-ins_bracketing__to__hdr_br__core_br__Image.cpp) = a369c351d8bb05e79afa6c19592fbc148143d985 17SHA1 (patch-plug-ins_bracketing__to__hdr_br__core_br__Image.cpp) = a369c351d8bb05e79afa6c19592fbc148143d985
18SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__examin.h) = eb4dba58efd6ff19c5eae770361b49fdacd4b375 18SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__examin.h) = eb4dba58efd6ff19c5eae770361b49fdacd4b375
 19SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__modell__beobachter.cpp) = 0aad88391642a9bacafee8e39116a98c7523d815
19SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__oyranos.h) = a5a72d106b655f79932b0d2d032136a32acbeafb 20SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__oyranos.h) = a5a72d106b655f79932b0d2d032136a32acbeafb
20SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__oyranos__extern.cpp) = 2e733a0c557236a735b97a7174795965b4bd4e0c 21SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__oyranos__extern.cpp) = 2e733a0c557236a735b97a7174795965b4bd4e0c
21SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__speicher.h) = 1eef5be81fe36c2eb9ecf50606ecb294644e15f4 22SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__speicher.h) = 1eef5be81fe36c2eb9ecf50606ecb294644e15f4
 23SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__thread__daten.cpp) = 66398aa3b06cc65017ec957e36579accd82df117
22SHA1 (patch-plug-ins_pdf_pdf.cpp) = e0af79a6f2e8962edc90d53ceef1b521aacb8e55 24SHA1 (patch-plug-ins_pdf_pdf.cpp) = e0af79a6f2e8962edc90d53ceef1b521aacb8e55
23SHA1 (patch-plug-ins_png_png.c) = 2420634637b44756b8e545efd3274fe469bbb3fa 25SHA1 (patch-plug-ins_png_png.c) = 2420634637b44756b8e545efd3274fe469bbb3fa
cvs diff -r1.5 -r1.6 pkgsrc/graphics/cinepaint/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/graphics/cinepaint/patches/Attic/patch-ag 2013/10/20 18:08:07 1.5
+++ pkgsrc/graphics/cinepaint/patches/Attic/patch-ag 2014/04/19 15:00:09 1.6
@@ -1,29 +1,38 @@ @@ -1,29 +1,38 @@
1$NetBSD: patch-ag,v 1.5 2013/10/20 18:08:07 joerg Exp $ 1$NetBSD: patch-ag,v 1.6 2014/04/19 15:00:09 joerg Exp $
2 2
3--- plug-ins/icc_examin/icc_examin/configure.orig 2007-05-10 15:48:30.000000000 +0000 3--- plug-ins/icc_examin/icc_examin/configure.orig 2007-05-10 15:48:30.000000000 +0000
4+++ plug-ins/icc_examin/icc_examin/configure 4+++ plug-ins/icc_examin/icc_examin/configure
5@@ -207,9 +207,9 @@ else 5@@ -207,9 +207,9 @@ else
6 echo "SunOS detected" 6 echo "SunOS detected"
7 OSUNAME=SunOS 7 OSUNAME=SunOS
8 else 8 else
9- if [ $UNAME_ = "OpenBSD" ] || [ $UNAME_ = "NetBSD" ] || [ $UNAME_ = "FreeBSD" ]; then 9- if [ $UNAME_ = "OpenBSD" ] || [ $UNAME_ = "NetBSD" ] || [ $UNAME_ = "FreeBSD" ]; then
10+ if [ $UNAME_ = "OpenBSD" ] || [ $UNAME_ = "NetBSD" ] || [ $UNAME_ = "FreeBSD" ] || [ $UNAME_ = "DragonFly" ]; then 10+ if [ $UNAME_ = "OpenBSD" ] || [ $UNAME_ = "NetBSD" ] || [ $UNAME_ = "FreeBSD" ] || [ $UNAME_ = "DragonFly" ]; then
11 echo "BSD = 1" >> $CONF 11 echo "BSD = 1" >> $CONF
12- OS_EXT=.bsd 12- OS_EXT=.bsd
13+# OS_EXT=.bsd 13+# OS_EXT=.bsd
14 echo "#define BSD 1" >> $CONF_H 14 echo "#define BSD 1" >> $CONF_H
15 echo "BSD $UNAME_ detected" 15 echo "BSD $UNAME_ detected"
16 OSUNAME=BSD 16 OSUNAME=BSD
 17@@ -532,7 +532,7 @@ else
 18 echo "INSTALL = install $DEBUG_SWITCH" >> $CONF
 19 else
 20 echo "COPY = cp -p" >> $CONF
 21- echo "INCL=-I\$(includedir) -I/usr/X11R6/include -I. -I/usr/include/g++ -I/usr/include" >> $CONF
 22+ echo "INCL=-I\$(includedir) -I/usr/X11R6/include -I." >> $CONF
 23 if [ $OSUNAME = "BSD" ]; then
 24 LDFLAGS="$LDFLAGS \$(iconv)"
 25 INSTALL="install $DEBUG_SWITCH"
17@@ -542,10 +542,10 @@ else 26@@ -542,10 +542,10 @@ else
18 test -n "$ECHO" && $ECHO "INSTALL = install $DEBUG_SWITCH" >> $CONF 27 test -n "$ECHO" && $ECHO "INSTALL = install $DEBUG_SWITCH" >> $CONF
19 fi 28 fi
20 if [ $OSUNAME = "SunOS" ]; then 29 if [ $OSUNAME = "SunOS" ]; then
21- LDFLAGS="$LDFLAGS -mimpure-text \$(dl) -lrt \$(iconv)" 30- LDFLAGS="$LDFLAGS -mimpure-text \$(dl) -lrt \$(iconv)"
22+ LDFLAGS="$LDFLAGS \$(dl) -lrt \$(iconv)" 31+ LDFLAGS="$LDFLAGS \$(dl) -lrt \$(iconv)"
23 INSTALL="install" 32 INSTALL="install"
24 else 33 else
25- LDFLAGS="$LDFLAGS -mimpure-text \$(dl) \$(iconv)" 34- LDFLAGS="$LDFLAGS -mimpure-text \$(dl) \$(iconv)"
26+ LDFLAGS="$LDFLAGS \$(dl) \$(iconv)" 35+ LDFLAGS="$LDFLAGS \$(dl) \$(iconv)"
27 INSTALL="install" 36 INSTALL="install"
28 echo "LINK_FLAGS = -shared \$(dl) \$(iconv)" >> $CONF 37 echo "LINK_FLAGS = -shared \$(dl) \$(iconv)" >> $CONF
29 echo "INSTALL = install" >> $CONF 38 echo "INSTALL = install" >> $CONF
File Added: pkgsrc/graphics/cinepaint/patches/Attic/patch-plug-ins_icc__examin_icc__examin_icc__modell__beobachter.cpp
$NetBSD: patch-plug-ins_icc__examin_icc__examin_icc__modell__beobachter.cpp,v 1.1 2014/04/19 15:00:09 joerg Exp $

--- plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp.orig	2014-04-19 12:18:53.000000000 +0000
+++ plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
@@ -30,6 +30,7 @@
 
 #include "icc_utils.h"
 
+#include <inttypes.h>
 #include <list>
 #include <string>
File Added: pkgsrc/graphics/cinepaint/patches/Attic/patch-plug-ins_icc__examin_icc__examin_icc__thread__daten.cpp
$NetBSD: patch-plug-ins_icc__examin_icc__examin_icc__thread__daten.cpp,v 1.1 2014/04/19 15:00:09 joerg Exp $

--- plug-ins/icc_examin/icc_examin/icc_thread_daten.cpp.orig	2014-04-19 12:19:41.000000000 +0000
+++ plug-ins/icc_examin/icc_examin/icc_thread_daten.cpp
@@ -31,6 +31,7 @@
 
 #include "icc_thread_daten.h"
 #include "threads.h"
+#include <inttypes.h>
 
 void
 icc_examin_ns::ThreadDaten::frei(int freigeben)