Update to 12.08

* Drop gmake from USE_TOOLS, bmake is sufficient
* Support NetBSD-current's libexecinfo
* Switch to gtk3

Fotoxx change log
=================

2012.08.01  v.12.08
+ Menus now show a popup descriptions if the mouse dwells on the menu.
+ Auto-synchronization (indexing of new image files) was made optional.
  If disabled, metadata edit and search functions are also disabled.
  These can be restored at any time by synchronizing the image files.
+ The size of a printed image (in centimeters) can be set in advance.
+ A 1-click sepia coloring was added (aged photo effect).
+ If Linux standard trash and desktop trash folder both fail (possible
  with some distros) give the option to simply delete the image file.
+ Painting and scrolling the gallery window was made faster.
+ Navigating the gallery window to other directories was simplified.
+ A gallery from an image search or collection can be discarded and
  replaced with a directory gallery using a toolbar button.
+ Bugfix: Edit Collections: keep the gallery window scroll position
  stable when adding or removing images from a collection.
+ Bugfix: If the initial gallery window is list view (no thumbnails),
  then the gallery window displayed only a blank window.
+ Bugifx: Crash if a retouch function is "painted" with the mouse and
  and the function is canceled before any change is made.
+ Bugfix: Show RGB [clear] button cleared image tags but not the dialog.
+ Web site was changed from squarespace.kornelix.com to kornelix.com.

2012.07.05  v.12.07.1
+ Bugfix: World map loses the mouse connection and becomes unresponsive
  after a left mouse click/drag is used to zoom/pan the map image.

2012.07.03  v.12.07
+ Tabs are now used to switch between the image and gallery windows.
+ List Geotag Groups by country, country/city, or country/city/date.
  Nearby dates can be grouped together. Click a listed group to get the
  corresponding thumbnail image gallery, view or edit images from there.
+ Click a location on a world map, get the corresponding image gallery.
+ Several small UI improvements in geotag edit and report functions.
+ Bugfix: edit collection: removing images was sometimes not possible if
  some images still in the collection had been deleted from disk.
+ Bugfix: memory leak if successive images are viewed in rapid sequence.
+ Bugfix: Art > Dots treatment was destroyed when saved to a file.
+ Bugfix: crash in Open Recent File if the first file had been deleted.

2012.06.17  v.12.06.2
+ The Spanish and Galician translations were updated.
+ bugfix: crash following use of Batch Add Geotags function.
+ Bugfix: stop unwanted gallery window from appearing when the control
  key is used to link mouse actions to the main window.

2012.06.01  v.12.06.1
+ bugfix: version check for exiftool failed for locales having a comma
  decimal point instead of a period (e.g. 8,60 instead of 8.60).

2012.06.01  v.12.06
+ The Spanish and Galician translations were updated (as of v.12.05).
+ Package exiftool version 8.60 or later is now a requirement.
  (this translates into Ubuntu 11.10 or later)
+ New: List geotag groups (city, country, date, image count), click on a
  group to show a thumbnail gallery, click thumbnails to view or edit.
+ Added and revised geotag locations were separated from the download set,
  to make them easier to keep when changing computers or Linux releases.
+ Geotag search for "null" can be used to find images with no geotags
  (also within other search criteria such as date).
+ New: Voodoo retouch function improves most images with one click.
+ Thumbnail files are now .jpeg instead of .png. Initialization after a
  new install is about 40% faster, and thumbnails are 1/3 as large.
+ There are now three thumbnail options: no thumbnails, thumbnails in the
  image directories (as before), or use a designated thumbnail directory.
+ Flatten Brightness: prevent "color bands" in monotone bright areas.
+ Rotate function user interface was improved and made more responsive.
+ Keyboard shortcuts can be revised and new ones added by the user.
+ Stop popup messages from getting hidden behind other windows.
+ Block "save to file" if an edit dialog is active (unpredictable result).
+ Edit history log was moved from EXIF:EditStatus to EXIF:ImageHistory
  because this is the de facto standard.
+ Metadata reports were changed to use EXIF tag names instead of tag
  descriptions. These are needed to directly edit metadata.
+ Slide Show: added continuous loop option (last goes back to first).
+ Trim: new option to start automatically for each new file opened
  (work through a batch of new photos more quickly).
+ Trim: new convenience button to do rotate and return to trim.
+ The [prev] and [next] buttons pre-load the next file ahead of need.
  This can speed-up sequential viewing of images on a slow computer.
+ F11 toggles main window to full-screen (no menu/toolbar) and back.
+ Bugfix: geotag retrieval failure with photos from some cameras.
+ Bugfix: Keyboard shortcut T (for Trim) caused a crash.

2012.04.21  v.12.05
+ Geotagging and reporting was added. Geotags may be entered using city
  names, with substring matching. Click the wanted city from multiple
  candidates. Multiple images can be processed rapidly. Batch processing
  is also available. Search images by city [country] or within radius of
  a given location. Output is a gallery of clickable thumbnails. Select
  locations to assign or search from a world map. Database has 3000+
  cities and others can be added as needed from a web geocoding service.
+ Search Images function was simplified. Searching by date, rating, tags,
  comments, caption, filename, geotags, and any other metadata is in one
  GUI with buttons to select the unusual options.
+ Bugfix: captions and comments with imbedded quotes were causing some
  metadata edits to fail (do nothing).
+ Bugfix: stop GUI lockup if window is resized by user while panorama or
  other composite function is still computing.
+ Bugfix: stop paranoia if an image directory is read-only and thumbnail
  subdirectory cannot be created - just leave out the thumbnails.
+ Bugfix: GUI was too difficult to view and edit the same collection.

2012.04.01  v.12.04
+ Select Area by color tones is almost 2x faster with less flicker.
+ New: Erase an object by overpainting with selected background.
+ New: Vignette Tool: change brightness or color in a radial pattern.
+ Art > Tiles: an optional 3D depth effect was added.
+ Edit Pixels: do area edge blending same as other edit functions.
+ Gamma Curve: buttons [++] etc. added as in brightness/color curves.
+ Select Area: "tweak" mode added: nudge an edge line using the mouse.
+ White Balance: slider added to adjust the impact from 0 to 100%.
+ Gallery window navigation was made a little more flexible.
+ First time startup: initial thumbnail creation and image file indexing
  is 2x faster (2000+ images/min. on a strong PC with 4 cpu cores).
+ New: Help > Log File: view the current (live) log file.
+ Memory allocation failure: no crash, exit with a reasonable message.
+ Bugfix: rare crash when a concurrent edit function completes.

2012.03.14  v.12.03.2
+ Bugfix: Select Area / Finish: crash in cairo. This is apparently a new
  bug in gtk3/cairo which affects some distros (but not current Ubuntu).
  Fotoxx was changed to avoid the problem: remove calls to gdk_flush().
  This can make Fotoxx appear to "freeze" during Select Area / Finish.

2012.03.04  v.12.03.1
+ Bugfix: Select Area: cancel button did not kill the Finish process.
+ Bugfix: Retouching a zoomed image caused temp. change in aspect ratio.

2012.03.01  v.12.03
+ Mouse-driven area select and edit functions respond much faster.
+ The internal image format was changed from int-16 to float-32 per
  RGB color. This simplified the code and made some edit functions
  slightly faster. There is no visual image impact. The main memory
  needed to edit a 20 megapixel image has grown to about 800 MB.
+ The exiftool program is started as a server process and left running.
  This eliminates a significant startup delay for every image opened.
+ Indexing of new files at startup was made much faster: typically
  1-2 seconds on a strong PC if only a few new images are found.
+ A toolbar button is used to change the mouse-drawing color for select
  and edit functions. Similar buttons on many dialogs were removed.
+ The pixel edit function was made easier and faster to use.
+ An edited file can be saved in the additional formats .bmp and .ico.
+ Setting the zoom ratio was simplified: each 2x zoom is 1-3 clicks.
+ Create Blank Image: the file type can be .jpg, .tif, .png, or .bmp.
+ The E-mail function was removed because Thunderbird and Evolution do
  not work (or no longer work) with the "standard" xdg-email protocol
  for attachments. Use Tools > Batch Convert to select images, export,
  and reduce size (if wanted) for attaching to e-mail or uploading.
+ Bugfix: If the top image directory was set to /home/<user>, thousands
  of unwanted files in /home/<user>/.thumbnails/* were being indexed.
+ Bugfix: Stack/Noise image alignment was poor if there was significant
  camera movement between photos.
+ Bugfix: Progress monitoring for some functions was very inaccurate.
+ Bugfix: some .gif files produced empty thumbnail images.
+ Bugfix: file synchronization at startup was sometimes wasting time
  with unnecessary updates.

2012.02.01  v.12.02
+ Fotoxx was converted to use GTK3 and Cairo. It will no longer build
  or install on older Linux releases lacking these libraries.
+ Multiple (up to 10) top image directories are now supported.
+ The gallery thumbnail size is saved and restored across sessions.
+ Bugfix: crash if an image present 2+ times in a collection is removed.
+ Bugfix: crash in slide show "jaws" transition.
+ RPM packages are built using Fedora and rpmbuild instead of alien.

2012.01.04  v.12.01.2
+ Italian user guide was updated.
+ Swedish translation was updated.

6 files changed, 69 insertions, 68 deletions

diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index e0bf818983a..22759fcd0e3 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.22 2012/06/02 04:06:34 obache Exp $
+# $NetBSD: Makefile,v 1.23 2012/08/12 07:20:15 ryoon Exp $
 #
 
-DISTNAME=	fotoxx-12.01.2
-PKGREVISION=	2
+DISTNAME=	fotoxx-12.08
 CATEGORIES=	graphics
-MASTER_SITES=	http://kornelix.squarespace.com/storage/downloads/
+MASTER_SITES=	http://www.kornelix.com/uploads/1/3/0/3/13035936/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://kornelix.squarespace.com/fotoxx/
+HOMEPAGE=	http://www.kornelix.com/fotoxx.html
 COMMENT=	Program for editing image files from a digital camera
 LICENSE=	gnu-gpl-v3
 
@@ -17,15 +16,21 @@ DEPENDS+=	xdg-utils-[0-9]*:../../misc/xdg-utils
 DEPENDS+=	p5-Image-ExifTool-[0-9]*:../../graphics/p5-Image-ExifTool
 DEPENDS+=	gimp-ufraw-[0-9]*:../../graphics/gimp-ufraw
 
-#WRKSRC=		${WRKDIR}/fotoxx
 USE_LANGUAGES=	c++
-USE_TOOLS+=	gmake pkg-config
+USE_TOOLS+=	pkg-config
 TOOLS_NOOP+=	xdg-desktop-menu
 
 BUILD_TARGET=	fotoxx
 INSTALL_TARGET=	install
 
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS} == "NetBSD" && \
+    (!empty(OS_VERSION:M6.99.*) || !empty(OS_VERSION:M[7-9].*)))
+LDFLAGS+=	-lexecinfo
+.endif
+
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/fotoxx/PLIST b/graphics/fotoxx/PLIST
index 8c46cf77227..551c27f1cf0 100644
--- a/graphics/fotoxx/PLIST
+++ b/graphics/fotoxx/PLIST
@@ -1,49 +1,57 @@
-@comment $NetBSD: PLIST,v 1.11 2012/01/08 12:35:45 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/08/12 07:20:15 ryoon Exp $
 bin/fotoxx
 man/man1/fotoxx.1
 share/applications/kornelix-fotoxx.desktop
+share/doc/fotoxx/KB-shortcuts
 share/doc/fotoxx/README
 share/doc/fotoxx/changelog
 share/doc/fotoxx/copyright
 share/doc/fotoxx/edit-menus
 share/doc/fotoxx/fotoxx.man
-share/doc/fotoxx/freecode
 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
 share/doc/fotoxx/images/auto-trim.jpg
+share/doc/fotoxx/images/batch-add-geotags.jpg
 share/doc/fotoxx/images/batch-rename.jpg
 share/doc/fotoxx/images/batch-resize-export.jpg
 share/doc/fotoxx/images/bright-ramp.jpg
 share/doc/fotoxx/images/brightness-color.jpg
 share/doc/fotoxx/images/curve-edit.jpg
 share/doc/fotoxx/images/edit-caption-comments.jpg
+share/doc/fotoxx/images/edit-geotags.jpg
 share/doc/fotoxx/images/edit-pixels.jpg
 share/doc/fotoxx/images/edit-tags.jpg
+share/doc/fotoxx/images/edit-translation.jpg
 share/doc/fotoxx/images/expand-brightness.jpg
+share/doc/fotoxx/images/flatten.jpg
 share/doc/fotoxx/images/gallery-selection.jpg
+share/doc/fotoxx/images/gallery-toolbar.jpg
 share/doc/fotoxx/images/gamma-curve.jpg
 share/doc/fotoxx/images/gammachart.png
+share/doc/fotoxx/images/geotag-groups.jpg
 share/doc/fotoxx/images/grid-lines.jpg
 share/doc/fotoxx/images/lens-parameters.jpg
+share/doc/fotoxx/images/leverage-edits.jpg
 share/doc/fotoxx/images/manage-collections.jpg
-share/doc/fotoxx/images/manage-tags.jpg
 share/doc/fotoxx/images/match-colors.jpg
-share/doc/fotoxx/images/navigation.jpeg
+share/doc/fotoxx/images/navigation.jpg
+share/doc/fotoxx/images/paint-edits.jpg
 share/doc/fotoxx/images/pano-color.jpg
 share/doc/fotoxx/images/pano-pre-align.jpg
+share/doc/fotoxx/images/print.jpg
 share/doc/fotoxx/images/remove-dust.jpg
 share/doc/fotoxx/images/rename.jpeg
 share/doc/fotoxx/images/resize.jpg
 share/doc/fotoxx/images/revise-RGB.jpg
 share/doc/fotoxx/images/rotate.jpg
+share/doc/fotoxx/images/rotate2.jpg
+share/doc/fotoxx/images/rotate3.jpg
 share/doc/fotoxx/images/save-as.jpg
-share/doc/fotoxx/images/search-images2.jpg
-share/doc/fotoxx/images/search_metadata.jpg
+share/doc/fotoxx/images/search-images-metadata.jpg
+share/doc/fotoxx/images/search-images.jpg
 share/doc/fotoxx/images/select-area.jpg
-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
@@ -52,38 +60,28 @@ share/doc/fotoxx/images/stack-noise.jpg
 share/doc/fotoxx/images/stack-paint.jpg
 share/doc/fotoxx/images/straighten-image.jpg
 share/doc/fotoxx/images/stuck-pixels.jpg
-share/doc/fotoxx/images/synchronize-files.jpg
-share/doc/fotoxx/images/tone-mapping.png
-share/doc/fotoxx/images/translate.jpg
+share/doc/fotoxx/images/synchronize.jpg
+share/doc/fotoxx/images/tone-mapping.jpg
 share/doc/fotoxx/images/trim.jpg
 share/doc/fotoxx/images/unbend.png
 share/doc/fotoxx/images/user-settings.jpg
+share/doc/fotoxx/images/vignette.jpg
+share/doc/fotoxx/images/warps.jpg
 share/doc/fotoxx/images/watermark.jpg
 share/doc/fotoxx/images/white-balance.jpg
 share/doc/fotoxx/translations
 share/doc/fotoxx/userguide-en.html
 share/doc/fotoxx/userguide-it.html
-share/fotoxx/icons/arrow.png
-share/fotoxx/icons/busy.png
-share/fotoxx/icons/drag.png
-share/fotoxx/icons/draw.png
+share/fotoxx/icons/fg-color.png
 share/fotoxx/icons/first-page.png
-share/fotoxx/icons/folder.png
 share/fotoxx/icons/folder256.png
+share/fotoxx/icons/fotoxx-banner.png
 share/fotoxx/icons/fotoxx.png
-share/fotoxx/icons/fotoxx128.png
-share/fotoxx/icons/fotoxx16.png
-share/fotoxx/icons/fotoxx24.png
-share/fotoxx/icons/fotoxx32.png
-share/fotoxx/icons/fotoxx48.png
-share/fotoxx/icons/fotoxx64.png
-share/fotoxx/icons/gallery.png
 share/fotoxx/icons/help.png
 share/fotoxx/icons/last-page.png
 share/fotoxx/icons/next-page.png
 share/fotoxx/icons/next-row.png
 share/fotoxx/icons/next.png
-share/fotoxx/icons/open+W.png
 share/fotoxx/icons/open.png
 share/fotoxx/icons/prev-page.png
 share/fotoxx/icons/prev-row.png
diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo
index 5e407e52889..4924853e005 100644
--- a/graphics/fotoxx/distinfo
+++ b/graphics/fotoxx/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2012/06/02 04:13:04 obache Exp $
+$NetBSD: distinfo,v 1.12 2012/08/12 07:20:15 ryoon Exp $
 
-SHA1 (fotoxx-12.01.2.tar.gz) = f846318c2641d3ac781da8cf5214e376923c028c
-RMD160 (fotoxx-12.01.2.tar.gz) = f80a0154a6405466a3b711f5e5605b5979375eaa
-Size (fotoxx-12.01.2.tar.gz) = 1685182 bytes
-SHA1 (patch-aa) = 231e951a79953523f1a9540819c01f3544497c70
-SHA1 (patch-ab) = 8b4df0666e7579f41ff150f63daf9d5233a2e9c1
-SHA1 (patch-ac) = c27796ad30c072e7f1e7e5879b75f206c4bc82be
+SHA1 (fotoxx-12.08.tar.gz) = 719e24de33cd2a1826302529987c1c97c19f5bb6
+RMD160 (fotoxx-12.08.tar.gz) = 6bd8b614dd6d9b5e1cae183fb8e3f9163a1a600f
+Size (fotoxx-12.08.tar.gz) = 1800791 bytes
+SHA1 (patch-aa) = 1640bf95c015519c215eeb2dafcf74cc1fb4f9a1
+SHA1 (patch-ab) = 84afc67898a323c957d749f91fe3458280af9052
+SHA1 (patch-ac) = 71398ac6f6614074b596df1b9f50a7ae41f8e7bc
diff --git a/graphics/fotoxx/patches/patch-aa b/graphics/fotoxx/patches/patch-aa
index 472a6a8fef7..fb2613f7667 100644
--- a/graphics/fotoxx/patches/patch-aa
+++ b/graphics/fotoxx/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.9 2012/06/02 04:13:04 obache Exp $
+$NetBSD: patch-aa,v 1.10 2012/08/12 07:20:15 ryoon Exp $
 
---- Makefile.orig	2012-01-04 08:47:11.000000000 +0000
+--- Makefile.orig	2012-08-04 11:58:30.000000000 +0000
 +++ Makefile
 @@ -13,7 +13,7 @@ SHAREDIR = $(PREFIX)/share/fotoxx
  ICONDIR = $(SHAREDIR)/icons
@@ -10,14 +10,13 @@ $NetBSD: patch-aa,v 1.9 2012/06/02 04:13:04 obache Exp $
 +MANDIR = $(PREFIX)/${PKGMANDIR}/man1
  MENUFILE = $(PREFIX)/share/applications/kornelix-fotoxx.desktop
  
- CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0`
-@@ -23,8 +23,7 @@ fotoxx:  fotoxx.o f.file.o f.tools.o f.s
-          f.transform.o f.art.o f.comp.o f.navi.o zfuncs.o 
- 	$(CXX) $(LDFLAGS) -o fotoxx fotoxx.o f.file.o f.tools.o f.select.o f.info.o \
-          f.retouch.o f.transform.o f.art.o f.comp.o f.navi.o zfuncs.o \
--         $(LIBS) -ltiff 
--	@ ./dependencies.sh
-+         $(LIBS) -ltiff -lcompat
+ CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
+@@ -23,7 +23,7 @@ fotoxx:  fotoxx.o f.file.o f.tools.o f.s
+          f.retouch.o f.art.o f.comp.o zfuncs.o
+ 	$(CXX) $(LDFLAGS) -o fotoxx fotoxx.o f.file.o f.tools.o f.select.o f.meta.o \
+          f.gallery.o f.xform.o f.retouch.o f.art.o f.comp.o zfuncs.o \
+-         $(LIBS) -ltiff -lpthread
++         $(LIBS) -ltiff -lpthread ${LDFLAGS}
  
- fotoxx.o: fotoxx-$(VERSION) fotoxx.h
- 	$(CXX) $(CFLAGS) -o fotoxx.o fotoxx-$(VERSION)
+ fotoxx.o: $(FOTOXX) fotoxx.h
+ 	$(CXX) $(CFLAGS) -o fotoxx.o $(FOTOXX)
diff --git a/graphics/fotoxx/patches/patch-ab b/graphics/fotoxx/patches/patch-ab
index 98027503ccc..f2280917fdf 100644
--- a/graphics/fotoxx/patches/patch-ab
+++ b/graphics/fotoxx/patches/patch-ab
@@ -1,28 +1,28 @@
-$NetBSD: patch-ab,v 1.7 2012/01/08 12:35:45 ryoon Exp $
+$NetBSD: patch-ab,v 1.8 2012/08/12 07:20:15 ryoon Exp $
 
---- zfuncs.cc.orig	2012-01-04 08:47:11.000000000 +0000
+--- zfuncs.cc.orig	2012-08-04 11:58:30.000000000 +0000
 +++ zfuncs.cc
 @@ -81,6 +81,7 @@ void zappcrash(cchar *pMess, ... )
  
-    printf("zappcrash: \n %s \n",message);                                  //  output message to stdout
+    printf("*** zappcrash: \n %s \n",message);                              //  output message to stdout
  
-+#ifdef __linux__
++#if defined (__linux__) || (defined (__NetBSD__) && (__NetBSD_Version__ >= 699000000))
     nstack = backtrace(stacklist,nstack);                                   //  get traceback data
     stackents = backtrace_symbols(stacklist,nstack);
  
-@@ -88,6 +89,7 @@ void zappcrash(cchar *pMess, ... )
-       printf(" %s \n",stackents[ii]);
- 
+@@ -90,6 +91,7 @@ void zappcrash(cchar *pMess, ... )
     fid1 = fopen("zappcrash","w");                                          //  text file for backtrace
-+#endif
  
     fprintf(fid1,"zappcrash: \n %s \n",message);                            //  output message to text file
++#endif
     
+    cc = readlink("/proc/self/exe",progexe,300);                            //  get own program path
+    if (cc <= 0) {
 @@ -98,6 +100,7 @@ void zappcrash(cchar *pMess, ... )
     }
     progexe[cc] = 0;
  
-+#ifdef __linux__
++#if defined (__linux__) || (defined (__NetBSD__) && (__NetBSD_Version__ >= 699000000))
     for (ii = 0; ii < nstack; ii++)                                         //  output backtrace to text file
     {
        pfunc = 0;
diff --git a/graphics/fotoxx/patches/patch-ac b/graphics/fotoxx/patches/patch-ac
index 7c6fd4b9baf..7d8aa60ed52 100644
--- a/graphics/fotoxx/patches/patch-ac
+++ b/graphics/fotoxx/patches/patch-ac
@@ -1,17 +1,16 @@
-$NetBSD: patch-ac,v 1.9 2012/01/08 12:35:45 ryoon Exp $
+$NetBSD: patch-ac,v 1.10 2012/08/12 07:20:15 ryoon Exp $
 
---- zfuncs.h.orig	2012-01-04 08:47:11.000000000 +0000
+--- zfuncs.h.orig	2012-08-04 11:58:30.000000000 +0000
 +++ zfuncs.h
-@@ -36,7 +36,12 @@
+@@ -37,7 +37,11 @@
  #include <pthread.h>
  #include <errno.h>
  #include <signal.h>
-+#ifdef __linux__
- #include <execinfo.h>
-+#else
 +#include <sys/param.h>
-+#include <sys/wait.h>
++#if defined (__linux__) || (defined (__NetBSD__) && (__NetBSD_Version__ >= 699000000))
+ #include <execinfo.h>
 +#endif
++#include <sys/wait.h>
  #include <locale.h>
- 
  #include <gtk/gtk.h>
+