Update to 11.10

Changelog:
2011.10.01  v.11.10
+ New function: classic gamma curve edit for brightness and individual
  RGB colors. Applicable to the whole image or a selected object/area.
+ Printing was revised to work better with recent changes in HPLIP that
  made printing on small paper sizes more difficult. The paper size must
  be specified in the Printer Properties dialog (printer admin function)
  and not in the application program - otherwise the print fails with a
  "paper mismatch" error. This changed between Ubuntu 10.10 and 11.04.
+ New function: convert "tetragon" image into a rectangle. Useful for
  gallery paintings photographed from the side to avoid reflections,
  buildings photographed at an angle, etc.
+ At startup, check for new files, advise if synchronization is needed.
+ New option: warn if overwriting original (non-versioned) image file.
+ Slide Show: stop strange behavior when multiple monitors are used.
+ Slide Show: option to show only the most recent version of each image.
+ Slide Show: use spacebar to pause and resume slide show.
+ Pixel Edit: transparency adjustment steps were made finer.
+ Code cleanup for new compiler warnings from GCC 4.6 (Ubuntu 11.10).

2011.09.26  v.11.09.1
+ Bufgix: crash in Slide Show if the last transition type (jaws) is
  not included in the user preferences.

2011.09.01  v.11.09
+ Print Image File now has margin inputs and tiny margins also work.
+ The Portuguese translation was brought up to date.
+ Minor source code changes were made for better BSD compatibility.
+ Show RGB: labels on monitored image points were made optional.
+ Gallery: larger font for file names is used when thumbnails are large.
+ Edit Captions and Edit User Comments were combined into one function.
+ File Open will discard a preceding search result or named collection,
  and the user is notified and may proceed or cancel.
+ File > Open (menu and toolbar) can now be used to open a single RAW
  file (as tiff-16). A batch conversion function is also available.
+ CPU load monitor on status bar now includes spawned subprocesses.
+ Smart Erase: improved algorithm gives better results in some cases.
+ Panorama: image overlap requirement was relaxed.
+ Bugfix: Flatten: fix uneven conversion of pixels with max. brightness.
+ Bugfix: crash if Tools > Add Menu is started and then canceled.
+ Bugfix: minor memory leak.

2011.08.01  v.11.08
+ An Italian user guide has been added.
+ New function DRGB: change brightness and color balance using OD units.
+ Revise_RGB: added delta mode (show +/- changes from original image).
+ Show RGB: added EV and OD units, delta mode, and pixel labels on image.
+ Slide Show: two image transitions were added, "radar" and "jaws".
+ Slide Show: preferred transition modes can be selected and remembered.
+ Delete Area was renamed to Unselect Area (to reduce ambiguity).
+ F1 help topic is now determined by the last dialog opened OR USED.
+ Bugfix: disable a select-area if Undo/Redo changes the image size.
+ Bugfix: Create Blank Image got leftover EXIF data from a prior image.
+ Bugfix: buffer overflow crash in Russian locale. Several other risky
  places from long translation strings were identified and fixed.
+ Bug workaround: crash from GCC 4.5 optimization removing necessary
  code. Do-nothing variable references were added to prevent this.
+ Annoyance fix: rapid repetition of prev/next buttons or arrow keys
  was sometimes causing a "function still active" popup message.
+ Current bug: On Ubuntu 11.04 Fotoxx refuses to print with small paper
  formats (A5, A6). Ubuntu 10.10 works OK. I cannot fix this.

7 files changed, 50 insertions, 84 deletions

diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index fbbe6d6e891..98b838cef6e 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2011/07/14 08:15:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.16 2011/10/05 14:21:45 ryoon Exp $
 #
 
-DISTNAME=	fotoxx-11.07
+DISTNAME=	fotoxx-11.10
 CATEGORIES=	graphics
 MASTER_SITES=	http://kornelix.squarespace.com/storage/downloads/
 
diff --git a/graphics/fotoxx/PLIST b/graphics/fotoxx/PLIST
index 818b4b2364e..18f5df82f7e 100644
--- a/graphics/fotoxx/PLIST
+++ b/graphics/fotoxx/PLIST
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.7 2011/07/14 08:15:35 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.8 2011/10/05 14:21:45 ryoon Exp $
 bin/fotoxx
+man/man1/fotoxx.1.gz
 share/applications/kornelix-fotoxx.desktop
 share/doc/fotoxx/CHANGES
 share/doc/fotoxx/COPYING
 share/doc/fotoxx/README
 share/doc/fotoxx/TRANSLATIONS
+share/doc/fotoxx/edit menus
 share/doc/fotoxx/fotoxx.man
 share/doc/fotoxx/freshmeat
+share/doc/fotoxx/images/DRGB.jpg
 share/doc/fotoxx/images/HDF-paint.jpg
 share/doc/fotoxx/images/HDR-adjust.jpg
 share/doc/fotoxx/images/annotate.jpg
@@ -16,7 +19,8 @@ share/doc/fotoxx/images/curve-edit.jpg
 share/doc/fotoxx/images/edit-collection.jpg
 share/doc/fotoxx/images/edit-tags.jpg
 share/doc/fotoxx/images/expand-brightness.png
-share/doc/fotoxx/images/gallery image selection.jpg
+share/doc/fotoxx/images/gallery-selection.jpg
+share/doc/fotoxx/images/gamma-curve.jpg
 share/doc/fotoxx/images/gammachart.png
 share/doc/fotoxx/images/manage-tags.jpg
 share/doc/fotoxx/images/match-colors.jpg
@@ -32,8 +36,10 @@ share/doc/fotoxx/images/select-edit.jpg
 share/doc/fotoxx/images/select-whole-image.jpg
 share/doc/fotoxx/images/sharpen.jpeg
 share/doc/fotoxx/images/show-RGB.jpg
+share/doc/fotoxx/images/slide-show.jpg
 share/doc/fotoxx/images/smart-erase.png
 share/doc/fotoxx/images/stack.png
+share/doc/fotoxx/images/straighten-image.jpg
 share/doc/fotoxx/images/tone-mapping.png
 share/doc/fotoxx/images/translate.jpg
 share/doc/fotoxx/images/trim.jpg
@@ -83,7 +89,6 @@ share/fotoxx/locales/fr/zfuncs.po
 share/fotoxx/locales/gl/fotoxx.po
 share/fotoxx/locales/gl/zfuncs.po
 share/fotoxx/locales/it/fotoxx.po
-share/fotoxx/locales/it/fotoxx.po.old
 share/fotoxx/locales/it/zfuncs.po
 share/fotoxx/locales/nl/fotoxx.po
 share/fotoxx/locales/nl/zfuncs.po
@@ -95,4 +100,3 @@ share/fotoxx/locales/sv/fotoxx.po
 share/fotoxx/locales/sv/zfuncs.po
 share/fotoxx/locales/zh_CN/fotoxx.po
 share/fotoxx/locales/zh_CN/zfuncs.po
-share/man/man1/fotoxx.1
diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo
index a1c3e0f3595..0550b3748a9 100644
--- a/graphics/fotoxx/distinfo
+++ b/graphics/fotoxx/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.7 2011/07/14 08:15:35 ryoon Exp $
+$NetBSD: distinfo,v 1.8 2011/10/05 14:21:45 ryoon Exp $
 
-SHA1 (fotoxx-11.07.tar.gz) = 011aeb57df73ba6689160379bf90f0b46991df65
-RMD160 (fotoxx-11.07.tar.gz) = a8b6aa6cfb6310695621bcb07932f22a4f2ea3ab
-Size (fotoxx-11.07.tar.gz) = 1404130 bytes
-SHA1 (patch-aa) = a7cb44980df7e49143689bc11d349c8aceb0115d
-SHA1 (patch-ab) = 088a467f899464221f33a1d995ea37947a940f43
-SHA1 (patch-ac) = 369ce1c76b32b47bea3e855c812a7d50474dd2ba
-SHA1 (patch-fotoxx-11.05.1.cc) = 25930c9655621132fd4e7773d006b0f75bb58df8
+SHA1 (fotoxx-11.10.tar.gz) = 5fe99eed26be43742b39c10b4a399379cdc5d29a
+RMD160 (fotoxx-11.10.tar.gz) = 437c4aa15f6790c824add961ff41c1d69e74af20
+Size (fotoxx-11.10.tar.gz) = 1489681 bytes
+SHA1 (patch-aa) = 9787ad05c5cee2a170fbdb605aea980e376fdab7
+SHA1 (patch-ab) = 8a4ad79d29194a8c124ccc08d3969265d1ba33ee
+SHA1 (patch-ac) = 18987b159a6f29925b24518b8d83657d3d11046b
diff --git a/graphics/fotoxx/patches/patch-aa b/graphics/fotoxx/patches/patch-aa
index da01eb7e9e6..61b06504bfa 100644
--- a/graphics/fotoxx/patches/patch-aa
+++ b/graphics/fotoxx/patches/patch-aa
@@ -1,14 +1,23 @@
-$NetBSD: patch-aa,v 1.5 2011/07/14 08:15:35 ryoon Exp $
+$NetBSD: patch-aa,v 1.6 2011/10/05 14:21:45 ryoon Exp $
 
---- Makefile.orig	2011-07-01 17:05:59.000000000 +0000
+--- Makefile.orig	2011-10-01 13:52:21.000000000 +0000
 +++ Makefile
-@@ -26,8 +26,7 @@ fotoxx: fotoxx.o fotoxx_area.o fotoxx_in
+@@ -14,7 +14,7 @@ DATADIR = $(SHAREDIR)/data
+ ICONDIR = $(SHAREDIR)/icons
+ LOCALESDIR = $(SHAREDIR)/locales
+ DOCDIR = $(PREFIX)/share/doc/fotoxx
+-MANDIR = $(PREFIX)/share/man/man1
++MANDIR = $(PREFIX)/man/man1
+ MENUFILE = $(PREFIX)/share/applications/kornelix-fotoxx.desktop
+ 
+ CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0`
+@@ -24,8 +24,7 @@ fotoxx: fotoxx.o fotoxx_area.o fotoxx_in
          fotoxx_transform.o fotoxx_art.o fotoxx_comp.o zfuncs.o 
  	$(CXX) $(LDFLAGS) fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_retouch.o \
            fotoxx_transform.o fotoxx_art.o fotoxx_comp.o zfuncs.o \
 -          $(LIBS) -ltiff -o fotoxx 
--	@ ./dependencies.sh                             ## after the build
+-	@ ./dependencies.sh
 +          $(LIBS) -ltiff -o fotoxx -lcompat
  
- fotoxx.o: $(VERSION) fotoxx.h
- 	$(CXX) $(CFLAGS) -o fotoxx.o $(VERSION)
+ fotoxx.o: $(PROGRAM) fotoxx.h
+ 	$(CXX) $(CFLAGS) -o fotoxx.o $(PROGRAM)
diff --git a/graphics/fotoxx/patches/patch-ab b/graphics/fotoxx/patches/patch-ab
index 9d024927f55..5350d5330bc 100644
--- a/graphics/fotoxx/patches/patch-ab
+++ b/graphics/fotoxx/patches/patch-ab
@@ -1,31 +1,32 @@
-$NetBSD: patch-ab,v 1.5 2011/07/14 08:15:35 ryoon Exp $
+$NetBSD: patch-ab,v 1.6 2011/10/05 14:21:45 ryoon Exp $
 
---- zfuncs.cc.orig	2011-07-01 17:05:59.000000000 +0000
+--- zfuncs.cc.orig	2011-10-01 13:52:21.000000000 +0000
 +++ zfuncs.cc
 @@ -77,6 +77,7 @@ void zappcrash(cchar *pMess, ... )      
  
     printf("zappcrash: \n %s \n",message);                                  //  output message to stdout
  
-+#ifdef backtrace
++#ifdef __linux__
     nstack = backtrace(stacklist,nstack);                                   //  get traceback data
     stackents = backtrace_symbols(stacklist,nstack);
  
-@@ -84,12 +85,14 @@ void zappcrash(cchar *pMess, ... )      
+@@ -84,6 +85,7 @@ void zappcrash(cchar *pMess, ... )      
        printf(" %s \n",stackents[ii]);
  
     fid1 = fopen("zappcrash","w");                                          //  text file for backtrace
 +#endif
  
     fprintf(fid1,"zappcrash: \n %s \n",message);                            //  output message to text file
- 
-    cc = readlink("/proc/self/exe",progexe,300);                            //  get own program path
+    
+@@ -94,6 +96,7 @@ void zappcrash(cchar *pMess, ... )      
+    }
     progexe[cc] = 0;
  
-+#ifdef backtrace
++#ifdef __linux__
     for (ii = 0; ii < nstack; ii++)                                         //  output backtrace to text file
     {
        pfunc = 0;
-@@ -109,6 +112,7 @@ void zappcrash(cchar *pMess, ... )      
+@@ -113,6 +116,7 @@ void zappcrash(cchar *pMess, ... )      
  
        fprintf(fid1," %s %s \n",stackents[ii],pfunc);                       //  write to text file
     }
@@ -33,20 +34,3 @@ $NetBSD: patch-ab,v 1.5 2011/07/14 08:15:35 ryoon Exp $
  
     fclose(fid1);
     
-@@ -768,6 +772,7 @@ int parsefile(cchar *ppath, char **pdirk
- 
- ***************************************************************************/
- 
-+#ifdef zmondirk
- int zmondirk(cchar *action, cchar *dirk, char **file)
- {
-    struct inotify_event {
-@@ -860,7 +865,7 @@ int zmondirk(cchar *action, cchar *dirk,
-    zappcrash("zmondirk() call error");
-    return -1;
- }
--
-+#endif
- 
- /**************************************************************************
- 
diff --git a/graphics/fotoxx/patches/patch-ac b/graphics/fotoxx/patches/patch-ac
index a61de40488f..1c8dfd851ef 100644
--- a/graphics/fotoxx/patches/patch-ac
+++ b/graphics/fotoxx/patches/patch-ac
@@ -1,25 +1,17 @@
-$NetBSD: patch-ac,v 1.6 2011/07/14 08:15:35 ryoon Exp $
+$NetBSD: patch-ac,v 1.7 2011/10/05 14:21:45 ryoon Exp $
 
---- zfuncs.h.orig	2011-07-01 17:05:59.000000000 +0000
+--- zfuncs.h.orig	2011-10-01 13:52:21.000000000 +0000
 +++ zfuncs.h
-@@ -22,6 +22,7 @@
- 
- //     zfuncs.h   version  v.4.4
- 
-+#include <sys/param.h>
- #include <sys/time.h>
- #include <sys/stat.h>
- #include <unistd.h>
-@@ -34,9 +35,10 @@
+@@ -34,7 +34,12 @@
  #include <pthread.h>
  #include <errno.h>
  #include <signal.h>
--#include <execinfo.h>
-+//#include <execinfo.h>
++#ifdef __linux__
+ #include <execinfo.h>
++#else
++#include <sys/param.h>
 +#include <sys/wait.h>
++#endif
  #include <locale.h>
--#include <sys/inotify.h>
-+//#include <sys/inotify.h>
+ #include <sys/resource.h>
  
- #define  int8   char                                                       //  number types
- #define  int16  short
diff --git a/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc b/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc
deleted file mode 100644
index 9724e71284f..00000000000
--- a/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-fotoxx-11.05.1.cc,v 1.3 2011/07/14 08:15:35 ryoon Exp $
-
---- fotoxx-11.07.cc.orig	2011-07-01 17:05:59.000000000 +0000
-+++ fotoxx-11.07.cc
-@@ -451,7 +451,7 @@ int gtkinitfunc(void *data)
- 
-    if (topdirk) curr_dirk = strdupz(topdirk,0,"curr_dirk");                //  use top directory if defined       v.11.07
-    else {
--      ppv = get_current_dir_name();                                        //  or use current directory
-+      ppv = getcwd((char *)0, 0);                                        //  or use current directory
-       if (ppv) {
-          curr_dirk = strdupz(ppv,0,"curr_dirk");
-          free(ppv);
-@@ -2083,7 +2083,7 @@ void m_gallery(GtkWidget *, cchar *)
-    if (curr_file)
-       image_gallery(0,"paint1",curr_file_posn,m_gallery2,mWin);            //  overlay main window    v.10.9
-    else {
--      char *pp = get_current_dir_name();
-+      char *pp = getcwd((char *)0, 0);
-       if (pp) {
-          image_gallery(pp,"init",0,m_gallery2,mWin);                       //  use current directory   v.11.04
-          image_gallery(0,"paint1");