Update to 11.06.1

Changelog:
2011.06.09  v.11.06.1
Bugfix: A hole was closed that could cause a crash if an area is
deleted while an edit function is open and active.

2011.06.01  v.11.06
+ Smart Erase and Remove Dust were made slightly more effective.
+ Brightness/Color retouching and Tone Mapping were made 25-40% faster.
+ Retouching brightness/color by "painting" with the mouse (dodge and
  burn) was made much faster (instant response on a fast computer).
+ If at startup the previous image file is no longer present then a
  gallery of the 100 most recent files viewed is shown.
+ New function: Tools > Toolbar Style: set to text, icons, or both.
+ New function: Tools > Edit Translation: edit translations interactively
  as Fotoxx is being used, and the changes are immediately effective.
+ Several other small usability improvements were made.
+ Minor bugfix: paste area edge blending lost 1 pixel around the edge.

7 files changed, 30 insertions, 51 deletions

diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index 68e5e0e7360..50dc013c573 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2011/05/11 01:31:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2011/06/11 18:54:23 ryoon Exp $
 #
 
-DISTNAME=	fotoxx-11.05.1
+DISTNAME=	fotoxx-11.06.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://kornelix.squarespace.com/storage/downloads/
 
diff --git a/graphics/fotoxx/PLIST b/graphics/fotoxx/PLIST
index 3f5d8e9cc22..49980046166 100644
--- a/graphics/fotoxx/PLIST
+++ b/graphics/fotoxx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2011/05/11 01:27:03 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/06/11 18:54:23 ryoon Exp $
 bin/fotoxx
 share/applications/kornelix-fotoxx.desktop
 share/doc/fotoxx/CHANGES
@@ -31,6 +31,7 @@ share/doc/fotoxx/images/sharpen.jpeg
 share/doc/fotoxx/images/smart-erase.png
 share/doc/fotoxx/images/stack.png
 share/doc/fotoxx/images/tone-mapping.png
+share/doc/fotoxx/images/translate.jpg
 share/doc/fotoxx/images/trim.jpg
 share/doc/fotoxx/images/unbend.png
 share/doc/fotoxx/images/watermark.jpg
diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo
index 66f74991ed4..87865e28c9b 100644
--- a/graphics/fotoxx/distinfo
+++ b/graphics/fotoxx/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2011/05/11 01:27:03 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2011/06/11 18:54:23 ryoon Exp $
 
-SHA1 (fotoxx-11.05.1.tar.gz) = 86fc10df92c6ea0e829e7b0e0b27031312f630ca
-RMD160 (fotoxx-11.05.1.tar.gz) = fda2ef422745ae582ac90eb98d8ac6daea1b2499
-Size (fotoxx-11.05.1.tar.gz) = 1264701 bytes
-SHA1 (patch-aa) = f936cc5bdc02a5a92470c8e02189d748593c6327
-SHA1 (patch-ab) = b2ad9d5c8a2258729248371bd1e2a2920633331c
-SHA1 (patch-ac) = a17fd5ba3edfd746df2a9b4df3ab547505deedfe
-SHA1 (patch-fotoxx-11.05.1.cc) = f9f8a42bb0bf83c998da44e73f94ca47d92351fc
+SHA1 (fotoxx-11.06.1.tar.gz) = 85b62abf984103877eca2bcd721b2d382b01c84b
+RMD160 (fotoxx-11.06.1.tar.gz) = 14839d3a3fd1d61c5c1fbe3867a0c826dd472eb0
+Size (fotoxx-11.06.1.tar.gz) = 1354440 bytes
+SHA1 (patch-aa) = 30cdc0e3fbb1ef445463cb9c89079f2ef4c38c11
+SHA1 (patch-ab) = 8c95419f50a30a88c4cbbf70bd903aa5abb57db9
+SHA1 (patch-ac) = c6be21da3036a442a6441b3a7a857a87953254e6
+SHA1 (patch-fotoxx-11.05.1.cc) = bed6a88408948f3770f77e67046ba3c8635818c3
diff --git a/graphics/fotoxx/patches/patch-aa b/graphics/fotoxx/patches/patch-aa
index 2c5f8fad7e0..b4f693e6f2f 100644
--- a/graphics/fotoxx/patches/patch-aa
+++ b/graphics/fotoxx/patches/patch-aa
@@ -1,36 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2011/05/11 01:27:03 ryoon Exp $
+$NetBSD: patch-aa,v 1.4 2011/06/11 18:54:23 ryoon Exp $
 
---- Makefile.orig	2011-05-01 18:44:26.000000000 +0000
+--- Makefile.orig	2011-06-09 06:29:46.000000000 +0000
 +++ Makefile
-@@ -23,8 +23,7 @@ LFLAGS = $(LDFLAGS) `pkg-config --libs g
+@@ -24,8 +24,7 @@ LIBS = `pkg-config --libs gtk+-2.0 gthre
  
  fotoxx: fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o
- 	$(CXX) $(LFLAGS) -ltiff -o fotoxx fotoxx.o \
--	   fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o
+ 	$(CXX) $(LDFLAGS) fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_edit.o \
+-	           zfuncs.o $(LIBS) -ltiff -o fotoxx 
 -	@ ./dependencies.sh
-+	   fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o -lcompat
++	           zfuncs.o $(LIBS) -ltiff -o fotoxx -lcompat
  
  fotoxx.o: $(VERSION) fotoxx.h
  	$(CXX) $(CFLAGS) -o fotoxx.o $(VERSION)
-@@ -48,7 +47,7 @@ install: fotoxx
- 	mkdir -p  $(DESTDIR)$(LOCALESDIR)
- 	mkdir -p  $(DESTDIR)$(DOCDIR)
- 	mkdir -p  $(DESTDIR)$(MANDIR)
--	mkdir -p  $(PREFIX)/share/applications
-+	mkdir -p  $(DESTDIR)$(PREFIX)/share/applications
- 	cp -f  fotoxx $(DESTDIR)$(BINDIR)
- 	cp -f  data/* $(DESTDIR)$(DATADIR)
- 	cp -f  icons/* $(DESTDIR)$(ICONDIR)
-@@ -60,9 +59,9 @@ install: fotoxx
- 	cp fotoxx.1.gz $(DESTDIR)$(MANDIR)
- 	rm -f fotoxx.1.gz
- 	# menu (desktop) file
--	echo Exec=/usr/bin/fotoxx >> $(MENUFILE1)
--	echo Icon=/usr/share/fotoxx/icons/fotoxx.png >> $(MENUFILE1)
--	cp $(MENUFILE1) $(DESTDIR)$(MENUFILE2)
-+	echo Exec=$(BINDIR)/fotoxx >> $(DESTDIR)$(MENUFILE1)
-+	echo Icon=$(ICONDIR)/fotoxx.png >> $(DESTDIR)$(MENUFILE1)
-+	cp $(DESTDIR)$(MENUFILE1) $(DESTDIR)$(MENUFILE2)
- 	@ echo "*** use make menu to install the desktop menu"
- 
- menu:
diff --git a/graphics/fotoxx/patches/patch-ab b/graphics/fotoxx/patches/patch-ab
index b2c38851c5c..931d2cc4625 100644
--- a/graphics/fotoxx/patches/patch-ab
+++ b/graphics/fotoxx/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2011/05/11 01:27:03 ryoon Exp $
+$NetBSD: patch-ab,v 1.4 2011/06/11 18:54:23 ryoon Exp $
 
---- zfuncs.cc.orig	2011-05-01 18:44:26.000000000 +0000
+--- zfuncs.cc.orig	2011-06-09 06:29:46.000000000 +0000
 +++ zfuncs.cc
 @@ -77,6 +77,7 @@ void zappcrash(cchar *pMess, ... )      
  
diff --git a/graphics/fotoxx/patches/patch-ac b/graphics/fotoxx/patches/patch-ac
index 03e7fa6529f..43a55eb2816 100644
--- a/graphics/fotoxx/patches/patch-ac
+++ b/graphics/fotoxx/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2011/05/11 01:27:03 ryoon Exp $
+$NetBSD: patch-ac,v 1.5 2011/06/11 18:54:23 ryoon Exp $
 
---- zfuncs.h.orig	2011-05-01 18:44:26.000000000 +0000
+--- zfuncs.h.orig	2011-06-09 06:29:46.000000000 +0000
 +++ zfuncs.h
 @@ -22,6 +22,7 @@
  
- //     zfuncs.h   version  v.4.2
+ //     zfuncs.h   version  v.4.4
  
 +#include <sys/param.h>
  #include <sys/time.h>
diff --git a/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc b/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc
index 2fe7ca0f286..c0593945189 100644
--- a/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc
+++ b/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-fotoxx-11.05.1.cc,v 1.1 2011/05/11 01:27:03 ryoon Exp $
+$NetBSD: patch-fotoxx-11.05.1.cc,v 1.2 2011/06/11 18:54:23 ryoon Exp $
 
---- fotoxx-11.05.1.cc.orig	2011-05-01 18:44:26.000000000 +0000
-+++ fotoxx-11.05.1.cc
-@@ -484,7 +484,7 @@ int gtkinitfunc(void *data)
+--- fotoxx-11.06.1.cc.orig	2011-06-09 06:29:46.000000000 +0000
++++ fotoxx-11.06.1.cc
+@@ -427,7 +427,7 @@ int gtkinitfunc(void *data)
  
  //  set up current file and directory from command line input or last session parameters        v.11.04
  
@@ -11,7 +11,7 @@ $NetBSD: patch-fotoxx-11.05.1.cc,v 1.1 2011/05/11 01:27:03 ryoon Exp $
     if (ppv) {
        curr_dirk = strdupz(ppv,0,"curr_dirk");
        free(ppv);
-@@ -493,6 +493,15 @@ int gtkinitfunc(void *data)
+@@ -436,6 +436,15 @@ int gtkinitfunc(void *data)
     else curr_dirk = 0;
     
     if (last_file) {                                                        //  from command line or parameters
@@ -27,7 +27,7 @@ $NetBSD: patch-fotoxx-11.05.1.cc,v 1.1 2011/05/11 01:27:03 ryoon Exp $
        ppv = realpath(last_file,0);                                         //  prepend directory if needed
        if (ppv) {
           curr_file = strdupz(ppv,0,"curr_file");
-@@ -503,6 +512,7 @@ int gtkinitfunc(void *data)
+@@ -446,6 +455,7 @@ int gtkinitfunc(void *data)
           zfree(last_file);
           last_file = 0;
        }
@@ -35,7 +35,7 @@ $NetBSD: patch-fotoxx-11.05.1.cc,v 1.1 2011/05/11 01:27:03 ryoon Exp $
     }
  
     if (curr_file) {
-@@ -2007,7 +2017,7 @@ void m_gallery(GtkWidget *, cchar *)
+@@ -1953,7 +1963,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 {