Update to 16.01

Changelog:
2016 Jan 01  v.16.01
+ Edit Any Metadata and Batch Add/Change Metadata: faster/easier UI: mouse
  point and click to select metadata items from a list of most likely items.
+ Panorama: a manual alignment option was added for images with no clear
  features in the overlap area that can be used for auto-alignment.
+ Batch Convert: add an overlay image to output images (e.g. a credit line).
+ Slide Show: minor changes to improve user interface (see User Guide).
+ Image right-shift is now a user option with no more back-and-forth motion.
+ Search Images: new option for text data matching: case-sensitive or not.
+ New user option: default gallery sort: file name, file mod date, photo date.
+ A new function for color saturation was added (separate from Retouch Combo).
+ Bugfix: Search Images for metadata was including some non-matching images.
+ Bugifx: possible crash in Select Area if 'extend to corner' is active.

2015 Dec 20  v.15.12.1
+ Bugfix: Retouch Combo: GUI lockup in Linux Mint 17.3. Ubuntu not affected.

2015 Dec 01  v.15.12
+ Adjust HSL menu: better control of the color range to select and adjust.
+ Fix Perspective: new option to automatically trim using the corner markers.
+ Trim/Rotate: new option: level a slanted image via EXIF RollAngle if present.
+ Keyboard Shortcuts: list all existing shortcuts in a popup window.
  A button is available to start a dialog to add or revise shortcuts.
+ Metadata short report: user can specify extra items to include in the report.
+ New: Metadata batch report - list selected metadata for selected image files.
+ File Save - New File Version: this function can now have a keyboard shortcut.
+ Maps: red-dot locations are consolidated only for separations < 100 meters.
  Previously location names were used, but this is sometimes too broad.
+ Maps: custom user maps are now separated from standard maps.
  This prevents losing them if the fotoxx-maps package is re-installed.
+ TIFF files are now saved without compression. The file size may be slightly
  greater or less, but the processing time is reduced 90%.
+ Slide Show: new transition: image turns like a book page to reveal next image.
+ Bugfix: the Upright function would not step to the next image.
+ Bugfix: PT Panorama was broken due to an interface change in Panorama Tools.
+ Bugfix: possible crash when leveling an image by dragging the image edge.
+ Bugfix: possible crash if a select area is abandoned with nothing selected.

2015 Nov 08  v.15.11.1
+ Bugfix: Rename failed to automatically open the next following file.
+ Translation updates: Spanish, Catalan, Portuguese, Italian.

2015 Nov 01  v.15.11
+ Folders in gallery pages show contained sub-folder and image file counts.
+ Pattern: pattern can imprint target image without changing image colors.
+ Adjust HSL: the amount of color change is proportional to the match with
  a selected target color, and this match range is adjustable.
+ Batch Convert: more flexibility in the formatting of output file names.
+ New: Spherical image projection with variable radius of curvature.
+ Trim/Rotate: if an image is leveled using mouse drag, the trim rectangle
  is automatically maximized, removing the need to do this manually.
+ If an edit dialog is started and left/right image margins are present,
  the image is pushed to the right side so the dialog can be positioned
  over the expanded left margin and menu panel, to cover less image area.
  This position is saved and restored the next time the dialog is used.
+ Saving to file type .bmp was removed, since all metadata is lost.
+ A new transition type was added to Slide Show: collapsing sphere.
+ Six other minor improvements and bug fixes.

2015 Oct 09  v.15.10
+ New: Batch Scripts: Perform a series of image edits while recording all
  menu and dialog inputs into a script file. Execute the script file to
  apply the same edits to multiple images selected from gallery pages.
+ Calibrate Printer: improved for slightly more accurate colors.
+ Edit curves: The capture distance for mouse selection of nodes to drag
  is adjustable (increase default value to make touch pads easier to use).
+ Batch Add/Change Metadata: a pick-list for commonly used tags was added.
+ Geographic maps: mouse distance to trigger a popup location name was
  made independent of map scale (10 pixels instead of 10 km).
+ Bugfix: gallery file selection: clicking on a file name in the list of
  selected files was sometimes inaccurate and selected the wrong file.
+ Bugfix: setting geotags by clicking on map locations did not allow an
  initial location to be revised by clicking somewhere else.

2015 Sep 03  v.15.09.2
+ Bugfix: infinite loop when saving RAW file to JPG/TIF/PNG.
+ Bugfix: Open of TIF file with 8 bits/color showed 0 or 16 in top panel.

2015 Sep 01  v.15.09
+ Program code was revised for latest GTK API breakage (Ubuntu 15.10).
+ The font size used in menus and dialogs can now be set by the user.
+ Panorama: about 20% faster (3 x 7 megapixels, 2 GHz CPU --> 18 secs).
+ Paint Transparency: response lag with large images was eliminated.
+ Area Copy and Paste was reinstated (easier than file save and open).
+ Use of alpha channel for vacated margins extended to all bend functions.
+ New: Calibrate Printer: tool to improve image print color accuracy.
+ Bugfix: crash in Flatten Book Page while marking page edges.
+ Bugfix: Slide Show fails if translated transition names contain blanks.
+ Bugfux: Leverage Edit: use of contrast as edit lever was broken.
+ Seven other minor improvements and fixes.

2015 Aug 01  v.15.08
+ The brightness distribution for an image can be reshaped by using slider
  controls and watching the image and/or graph. The distribution can be
  clipped at either end, or stretched or flattened in different zones.
+ Editing and searching image tags have an additional tool to deal with a
  huge list of defined tags. The tag pick-list can be all tags, or only
  those for a category chosen from a category pick-list.
+ Select Area: open/save area cutout as PNG file with transparency data.
+ Image edits: image transparency data is now utilized and retained.
+ Paint Transparency: new: paint [semi-] transparent areas on an image.
+ Mashup: transparency data in overlay images is utilized and editable.
+ New batch tool: add/change/delete any metadata for selected image files.
+ Add Text: quickly add same text at same position to multiple image files.
+ Gallery thumbnail memory cache is self-limiting to 1 GB main memory.
+ Several small improvements in the user interface and error messages.
+ Bugfix: gallery sort by file modification date used incorrect date/time.
+ Bugfix: possible crash in leverage edits if edit function cancelled.
+ Bugfix: Select Area: draw/replace area edge did not work properly for
  areas selected by mouse painting or areas previously finished.

2015 Jul 01  v.15.07
+ Menus were reorganized. User Guide was revised to match.
+ User Guide was audited and many minor errors were corrected.
+ Index Image Files: user interface and messages were rationalized.
+ Undo/Redo button: middle mouse button produces a popup list of edits
  done to the current image. Go back to any done or undone edit step.
+ Edit Metadata and Search Images: working with thousands of unorganized
  image tags was made much more practical: type-in tags or use pick-list.
+ New batch tool: convert tags for all image files using a from-to list.
+ New batch tool: select images (click thumbnails) to trash or delete.
+ New batch tool: find and upright all image files rotated 90 degrees.
+ Gallery navigation panel: parent directories are buttons instead of text.
+ Effects > Pencil Sketch: set any desired foreground or background color.
+ RAW image noise measure was improved (gives slightly lower values).
+ Select Area: new buttons to quickly change line color while drawing.
+ Slide Show: zoom-out from a chosen image spot (compliment of zoom-in).
+ New user option: start session with last gallery now works for albums.
+ 4 minor bug fixes and 10 user interface improvements.

2015 Jun 01  v.15.06
+ New: HSL Color: change the color of selected image areas using an HSL
  color chooser. Blend with original image to preserve existing variation.
+ Threshold Denoise algorithm was improved.
+ Cycle Desktop (background image): Runs in the background. Add to the
  startup list to get a new desktop image each logon or time period.
+ New: Set Desktop Image: Set the desktop background image from Fotoxx.
+ New slide show transition: Image falls over to reveal the next image.
+ Mashup: UI improved for adding text and lines/arrows to a layout.
+ Trim/Rotate now includes an [auto] button to remove the black image
  margins left by composite or warp functions. Auto-Trim menu is gone.
+ KB shortcuts includes a button to report all the standard shortcuts.
+ Multiple UI and help text improvements.
+ Three minor bug fixes.

2015 May 01  v.15.05
+ New: Smart Denoise: measure noise and use the result to reduce noise
  with minimal loss of subtle detail. Also measure camera sensor noise.
+ The function Newest Images was revised to show a gallery of the newest
  1000 files, based on either EXIF photo date or file modification date.
+ Zonal Flatten: algorithm improvement and stronger deband controls.
+ New: Cycle Background: cycle desktop background image via Fotoxx album.
+ Bugfix: possible crash in some edit functions if [done] button pressed
  very quickly after adjusting a dialog control or edit curve.
+ Bugfix: Edit Metadata: tags with special characters were sometimes
  getting split into two tags.
+ Bugfix: Color Mode: color negative: it was sometimes possible to
  create invalid RGB colors which affected later color functions.

11 files changed, 306 insertions, 111 deletions

diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index 6cde1f51d9a..91d54599654 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.51 2015/06/12 10:50:09 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2016/01/03 04:33:49 ryoon Exp $
 #
 
-DISTNAME=	fotoxx-14.03.1
-PKGREVISION=	4
+DISTNAME=	fotoxx-16.01
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.kornelix.com/uploads/1/3/0/3/13035936/
+MASTER_SITES=	http://www.kornelix.com/downloads/tarballs/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.kornelix.com/fotoxx.html
+HOMEPAGE=	http://www.kornelix.com/fotoxx/fotoxx.html
 COMMENT=	Program for editing image files from a digital camera
 LICENSE=	gnu-gpl-v3
 
diff --git a/graphics/fotoxx/PLIST b/graphics/fotoxx/PLIST
index 9c4de3693c0..e208816a953 100644
--- a/graphics/fotoxx/PLIST
+++ b/graphics/fotoxx/PLIST
@@ -1,102 +1,162 @@
-@comment $NetBSD: PLIST,v 1.18 2014/03/15 05:37:03 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.19 2016/01/03 04:33:49 ryoon Exp $
 bin/fotoxx
 man/man1/fotoxx.1
+share/appdata/fotoxx.appdata.xml
 share/applications/fotoxx.desktop
 share/doc/fotoxx/README-ca
 share/doc/fotoxx/README-en
 share/doc/fotoxx/README-es
 share/doc/fotoxx/changelog.gz
 share/doc/fotoxx/copyright
-share/doc/fotoxx/fotoxx-release
 share/doc/fotoxx/fotoxx.man
-share/doc/fotoxx/translations-ca
-share/doc/fotoxx/translations-en
-share/doc/fotoxx/translations-es
 share/fotoxx/data/KB-shortcuts-ca
 share/fotoxx/data/KB-shortcuts-en
 share/fotoxx/data/KB-shortcuts-es
+share/fotoxx/data/custom_kernel/blur5
+share/fotoxx/data/custom_kernel/denoise3
+share/fotoxx/data/custom_kernel/emboss3
+share/fotoxx/data/custom_kernel/emboss5
+share/fotoxx/data/custom_kernel/outlines5
+share/fotoxx/data/custom_kernel/sharpen3
+share/fotoxx/data/custom_kernel/sharpen5
 share/fotoxx/data/edit-menus-ca
 share/fotoxx/data/edit-menus-en
 share/fotoxx/data/edit-menus-es
 share/fotoxx/data/favorites/menu-config
-share/fotoxx/data/favorites/menu-config-pixbuf-009.png
-share/fotoxx/data/images/F-toolbar.jpg
-share/fotoxx/data/images/G-toolbar.jpg
+share/fotoxx/data/images/F-menu.jpg
+share/fotoxx/data/images/G-menu.jpg
 share/fotoxx/data/images/HDF-paint.jpg
 share/fotoxx/data/images/HDR-adjust.jpg
-share/fotoxx/data/images/KB-shortcuts.jpg
-share/fotoxx/data/images/add-geotags.jpg
+share/fotoxx/data/images/KBshortcuts1.jpg
+share/fotoxx/data/images/KBshortcuts2.jpg
+share/fotoxx/data/images/W-menu.jpg
+share/fotoxx/data/images/add-lines.jpg
 share/fotoxx/data/images/add-text.jpg
 share/fotoxx/data/images/add-text2.jpg
-share/fotoxx/data/images/anti-alias.jpg
+share/fotoxx/data/images/adjust RGB.jpg
+share/fotoxx/data/images/adjust-HSL.jpg
+share/fotoxx/data/images/adjust-britedist.jpg
+share/fotoxx/data/images/albums1.jpg
+share/fotoxx/data/images/albums2.jpg
+share/fotoxx/data/images/albums3.jpg
+share/fotoxx/data/images/anti_alias.jpg
+share/fotoxx/data/images/arrow31.png
 share/fotoxx/data/images/auto-trim.jpg
+share/fotoxx/data/images/batch-add-change-metadata.jpg
 share/fotoxx/data/images/batch-add-geotags.jpg
+share/fotoxx/data/images/batch-add-tags.jpg
+share/fotoxx/data/images/batch-convert-RAW.jpg
 share/fotoxx/data/images/batch-convert.jpg
-share/fotoxx/data/images/batch-raw-conv.jpg
-share/fotoxx/data/images/brightness steps.jpg
-share/fotoxx/data/images/brightness-distribution.jpg
+share/fotoxx/data/images/batch-delete-trash.jpg
+share/fotoxx/data/images/batch-report-meta1.jpg
+share/fotoxx/data/images/batch-report-meta2.jpg
+share/fotoxx/data/images/batch-upright.jpg
+share/fotoxx/data/images/bookmarks.jpg
+share/fotoxx/data/images/brightness steps.png
 share/fotoxx/data/images/brightness-ramp.jpg
-share/fotoxx/data/images/chromatic.jpg
-share/fotoxx/data/images/cmyk.jpg
-share/fotoxx/data/images/collections.jpg
+share/fotoxx/data/images/color-drawing.jpg
+share/fotoxx/data/images/color_fringes.jpg
+share/fotoxx/data/images/color_ramp.jpg
 share/fotoxx/data/images/colorchart.png
+share/fotoxx/data/images/custom-kernel.jpg
 share/fotoxx/data/images/denoise.jpg
+share/fotoxx/data/images/denoise2.jpg
+share/fotoxx/data/images/directed-blur.jpg
 share/fotoxx/data/images/dots.jpg
-share/fotoxx/data/images/drawing.jpg
+share/fotoxx/data/images/edit-any-metadata.jpg
+share/fotoxx/data/images/edit-geotags.jpg
 share/fotoxx/data/images/edit-metadata.jpg
 share/fotoxx/data/images/edit-translation.jpg
+share/fotoxx/data/images/embossing.jpg
 share/fotoxx/data/images/favorites.jpg
-share/fotoxx/data/images/file-save.jpg
+share/fotoxx/data/images/file-save1.jpg
+share/fotoxx/data/images/file-save2.jpg
+share/fotoxx/data/images/find-dups.jpg
+share/fotoxx/data/images/fix-perspective.jpg
+share/fotoxx/data/images/fix-perspective2.jpg
 share/fotoxx/data/images/flatbook.jpg
-share/fotoxx/data/images/fotoxx.jpg
+share/fotoxx/data/images/fotoxx-views.jpg
 share/fotoxx/data/images/gallery-select.jpg
-share/fotoxx/data/images/gammachart.png
+share/fotoxx/data/images/gammachart-reduced.png
+share/fotoxx/data/images/gammachart2.png
 share/fotoxx/data/images/geotag-groups.jpg
 share/fotoxx/data/images/grad_blur.jpg
 share/fotoxx/data/images/grid-lines.jpg
 share/fotoxx/data/images/index.jpg
 share/fotoxx/data/images/jpeg quality.jpg
-share/fotoxx/data/images/keystone.jpg
+share/fotoxx/data/images/leverage-edits.jpg
+share/fotoxx/data/images/line_drawing.jpg
+share/fotoxx/data/images/magnify.jpg
+share/fotoxx/data/images/make-waves.jpg
+share/fotoxx/data/images/map-click.jpg
 share/fotoxx/data/images/mashup.jpg
+share/fotoxx/data/images/mashup1.jpg
 share/fotoxx/data/images/mashup2.jpg
-share/fotoxx/data/images/match-colors.jpg
+share/fotoxx/data/images/mashup3.jpg
+share/fotoxx/data/images/mashup3b.jpg
+share/fotoxx/data/images/mashup4.jpg
+share/fotoxx/data/images/mashup5.jpg
+share/fotoxx/data/images/mashup6.jpg
+share/fotoxx/data/images/match_color.jpg
 share/fotoxx/data/images/mosaic.jpg
 share/fotoxx/data/images/mosaic2.jpg
-share/fotoxx/data/images/move-collections.jpg
-share/fotoxx/data/images/paint-clone.jpg
+share/fotoxx/data/images/navi-buttons.jpg
 share/fotoxx/data/images/paint-edits.jpg
-share/fotoxx/data/images/pano-color.jpg
-share/fotoxx/data/images/pano-pre-align.jpg
-share/fotoxx/data/images/pattern.jpg
+share/fotoxx/data/images/paint-transparency.jpg
+share/fotoxx/data/images/paint_clone.jpg
+share/fotoxx/data/images/panorama1.jpg
+share/fotoxx/data/images/panorama2.jpg
+share/fotoxx/data/images/pattern1.jpg
+share/fotoxx/data/images/pattern2.jpg
 share/fotoxx/data/images/plugins.jpg
 share/fotoxx/data/images/print.jpg
-share/fotoxx/data/images/remove-dust.jpg
+share/fotoxx/data/images/printer-cal-study.png
+share/fotoxx/data/images/printer-calibrate.jpg
+share/fotoxx/data/images/randomtags.jpg
+share/fotoxx/data/images/remove_dust.jpg
 share/fotoxx/data/images/rename.jpg
 share/fotoxx/data/images/resize.jpg
 share/fotoxx/data/images/retouch-combo.jpg
-share/fotoxx/data/images/retouch-combo2.jpg
-share/fotoxx/data/images/revise-RGB.jpg
+share/fotoxx/data/images/script-files.jpg
 share/fotoxx/data/images/search-images-metadata.jpg
 share/fotoxx/data/images/search-images.jpg
 share/fotoxx/data/images/select-area.jpg
+share/fotoxx/data/images/select-finish.jpg
 share/fotoxx/data/images/sharpen.jpg
 share/fotoxx/data/images/sharpen4.jpg
-share/fotoxx/data/images/shift-colors.jpg
+share/fotoxx/data/images/shift_colors.jpg
 share/fotoxx/data/images/show-RGB.jpg
 share/fotoxx/data/images/sketch.jpg
+share/fotoxx/data/images/slide-show-keys.png
 share/fotoxx/data/images/slide-show.jpg
-share/fotoxx/data/images/smart-erase.jpg
+share/fotoxx/data/images/smart_erase.jpg
+share/fotoxx/data/images/sphere.jpg
+share/fotoxx/data/images/sphere2.jpg
 share/fotoxx/data/images/stack-noise.jpg
 share/fotoxx/data/images/stack-paint.jpg
-share/fotoxx/data/images/stuck-pixels.jpg
-share/fotoxx/data/images/tabsF&G.png
+share/fotoxx/data/images/stuck_pixels.jpg
 share/fotoxx/data/images/texture.jpg
+share/fotoxx/data/images/texture2.jpg
 share/fotoxx/data/images/tone-mapping.jpg
 share/fotoxx/data/images/trim-rotate.jpg
 share/fotoxx/data/images/unbend.jpg
-share/fotoxx/data/images/user-settings.jpg
+share/fotoxx/data/images/upright.jpg
+share/fotoxx/data/images/user-options.jpg
+share/fotoxx/data/images/view-metadata.jpg
 share/fotoxx/data/images/vignette.jpg
 share/fotoxx/data/images/warps.jpg
+share/fotoxx/data/images/zonal-flatten1.jpg
+share/fotoxx/data/images/zonal-flatten2.jpg
+share/fotoxx/data/metadata_short_list
+share/fotoxx/data/patterns/brick wall.jpg
+share/fotoxx/data/patterns/burlap.jpg
+share/fotoxx/data/patterns/canvas2.jpg
+share/fotoxx/data/patterns/geometry 2.jpg
+share/fotoxx/data/patterns/geometry 3.jpeg
+share/fotoxx/data/patterns/linen-fine.jpg
+share/fotoxx/data/patterns/pattern_114.jpg
+share/fotoxx/data/patterns/pattern_117.jpg
+share/fotoxx/data/patterns/pattern_131.jpg
 share/fotoxx/data/quickstart-ca.html
 share/fotoxx/data/quickstart-de.html
 share/fotoxx/data/quickstart-en.html
@@ -104,18 +164,30 @@ share/fotoxx/data/quickstart-es.html
 share/fotoxx/data/quickstart-fr.html
 share/fotoxx/data/quickstart-it.html
 share/fotoxx/data/quickstart-pt.html
+share/fotoxx/data/retouch_combo/darken high
+share/fotoxx/data/retouch_combo/darken low
+share/fotoxx/data/retouch_combo/forest
+share/fotoxx/data/retouch_combo/level
+share/fotoxx/data/retouch_combo/lighten high
+share/fotoxx/data/retouch_combo/lighten low
+share/fotoxx/data/retouch_combo/rich
+share/fotoxx/data/retouch_combo/soften
+share/fotoxx/data/retouch_combo/unclip
 share/fotoxx/data/slideshow-tone.oga
 share/fotoxx/data/tags_defined
 share/fotoxx/data/userguide-en.html
-share/fotoxx/data/userguide-es.html
-share/fotoxx/data/userguide-it.html
-share/fotoxx/icons/F-tab.png
-share/fotoxx/icons/G-tab.png
-share/fotoxx/icons/W-tab.png
+share/fotoxx/icons/albums.png
+share/fotoxx/icons/areas.png
+share/fotoxx/icons/batch.png
+share/fotoxx/icons/bend.png
+share/fotoxx/icons/blackball.png
+share/fotoxx/icons/blueball.png
 share/fotoxx/icons/bottom.png
 share/fotoxx/icons/broken.png
 share/fotoxx/icons/cancel.png
-share/fotoxx/icons/down+.png
+share/fotoxx/icons/choosemap.png
+share/fotoxx/icons/color.png
+share/fotoxx/icons/combine.png
 share/fotoxx/icons/down.png
 share/fotoxx/icons/edit-funcs/CMYK.png
 share/fotoxx/icons/edit-funcs/HDF.png
@@ -166,28 +238,52 @@ share/fotoxx/icons/edit-funcs/warp area.png
 share/fotoxx/icons/edit-funcs/warp curved.png
 share/fotoxx/icons/edit-funcs/warp linear.png
 share/fotoxx/icons/edit-funcs/whitebalance.png
+share/fotoxx/icons/edit.png
+share/fotoxx/icons/effects.png
 share/fotoxx/icons/favorites.png
-share/fotoxx/icons/fg-color.png
+share/fotoxx/icons/file.png
 share/fotoxx/icons/folder.png
 share/fotoxx/icons/fotoxx.png
 share/fotoxx/icons/goto.png
+share/fotoxx/icons/greenball.png
 share/fotoxx/icons/help.png
-share/fotoxx/icons/next.png
+share/fotoxx/icons/metadata.png
 share/fotoxx/icons/open.png
-share/fotoxx/icons/prev.png
-share/fotoxx/icons/quit.png
-share/fotoxx/icons/redo.png
+share/fotoxx/icons/overlayBC.png
+share/fotoxx/icons/overlayBL.png
+share/fotoxx/icons/overlayBR.png
+share/fotoxx/icons/overlayCC.png
+share/fotoxx/icons/overlayCL.png
+share/fotoxx/icons/overlayCR.png
+share/fotoxx/icons/overlayTC.png
+share/fotoxx/icons/overlayTL.png
+share/fotoxx/icons/overlayTR.png
+share/fotoxx/icons/plugins.png
+share/fotoxx/icons/prev_next.png
+share/fotoxx/icons/redball.png
+share/fotoxx/icons/repair.png
+share/fotoxx/icons/rotate-180.png
 share/fotoxx/icons/rotate-left.png
 share/fotoxx/icons/rotate-right.png
 share/fotoxx/icons/save.png
+share/fotoxx/icons/scroll.png
+share/fotoxx/icons/search.png
+share/fotoxx/icons/separator.png
+share/fotoxx/icons/setmaprange.png
 share/fotoxx/icons/sort.png
-share/fotoxx/icons/sync.G.png
+share/fotoxx/icons/sync.png
+share/fotoxx/icons/tools.png
 share/fotoxx/icons/top.png
-share/fotoxx/icons/trash.png
-share/fotoxx/icons/undo.png
-share/fotoxx/icons/up+.png
+share/fotoxx/icons/undo_redo.png
 share/fotoxx/icons/up.png
+share/fotoxx/icons/viewF-check.png
+share/fotoxx/icons/viewF.png
+share/fotoxx/icons/viewG-check.png
+share/fotoxx/icons/viewG.png
+share/fotoxx/icons/viewW-check.png
+share/fotoxx/icons/viewW.png
 share/fotoxx/icons/warning.png
+share/fotoxx/icons/whiteball.png
 share/fotoxx/icons/zoom+.png
 share/fotoxx/icons/zoom-.png
 share/fotoxx/locales/translate-ca.po
@@ -199,6 +295,3 @@ share/fotoxx/locales/translate-it.po
 share/fotoxx/locales/translate-nl.po
 share/fotoxx/locales/translate-pt.po
 share/fotoxx/locales/translate-ru.po
-share/fotoxx/locales/translate-sv.po
-@pkgdir share/desktop-directories
-@pkgdir etc/xdg/menus
diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo
index 05377d38a2f..8a9176c60d5 100644
--- a/graphics/fotoxx/distinfo
+++ b/graphics/fotoxx/distinfo
@@ -1,9 +1,14 @@
-$NetBSD: distinfo,v 1.23 2014/03/27 19:13:06 ryoon Exp $
+$NetBSD: distinfo,v 1.24 2016/01/03 04:33:49 ryoon Exp $
 
-SHA1 (fotoxx-14.03.1.tar.gz) = ac2033f87de2c23941261f7c50160cddf872c110
-RMD160 (fotoxx-14.03.1.tar.gz) = 3221de239963562d6b88de8ad3ba4324121087de
-Size (fotoxx-14.03.1.tar.gz) = 2786641 bytes
-SHA1 (patch-aa) = 50eeb4660843adf72697af090cefbbf67bd7ccd1
-SHA1 (patch-ab) = 2582855cc4b4c6f9c8bf866f184d166c3f7fc979
-SHA1 (patch-ac) = b3809f0e9f0351eb39a399599446af1e7cb9b466
-SHA1 (patch-f.repair.cc) = d02355b53e058171b2dbdccd77576a6bb357a242
+SHA1 (fotoxx-16.01.tar.gz) = bc5ea7278126e12f413b3f5fef9ff432495223c3
+RMD160 (fotoxx-16.01.tar.gz) = 699d8a7fdfff3dcde67b595286f74fdb70eb402b
+SHA512 (fotoxx-16.01.tar.gz) = 503fabd9110acc2e1d0ec2de8a78da00922e9d324f547c7500ee7c61b86c8015aef592ce05e99bf2913c7c1b11cd349b1b46419bd35c3a579d3d60a5ef2b0478
+Size (fotoxx-16.01.tar.gz) = 4307895 bytes
+SHA1 (patch-aa) = 03b9de99e6467b1a7e117ddda92cdc7073c4d495
+SHA1 (patch-ab) = abe2d032085129b51a07f06f689b2d6b9db411a9
+SHA1 (patch-ac) = 87677d03a83b7baa00744aaf8a92777ecd711919
+SHA1 (patch-f.combine.cc) = 53bb4cd50f5747defb6c7ffc38ec6d4ca8cec834
+SHA1 (patch-f.meta.cc) = 72dd09f17c467e1477213098e8d2da5d12e7a5fb
+SHA1 (patch-f.repair.cc) = 4eb73dc312838387d56f6c0ed9a12fd1da2a6c0a
+SHA1 (patch-fotoxx.h) = 17af8379dfca152dbc5d9558b42ea9b608218c2a
+SHA1 (patch-zfuncs.cc) = 70e5dda836681627983b407776adc5958b35b0fa
diff --git a/graphics/fotoxx/patches/patch-aa b/graphics/fotoxx/patches/patch-aa
index a3912ffc422..cbd32ac1477 100644
--- a/graphics/fotoxx/patches/patch-aa
+++ b/graphics/fotoxx/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.15 2014/03/15 05:37:03 ryoon Exp $
+$NetBSD: patch-aa,v 1.16 2016/01/03 04:33:49 ryoon Exp $
 
 * Pass LDFLAGS from pkgsrc's Makefile
 
---- Makefile.orig	2014-03-05 07:17:10.000000000 +0000
+--- Makefile.orig	2016-01-01 08:20:29.000000000 +0000
 +++ Makefile
 @@ -15,7 +15,7 @@ DATADIR = $(SHAREDIR)/data
  ICONDIR = $(SHAREDIR)/icons
@@ -10,6 +10,15 @@ $NetBSD: patch-aa,v 1.15 2014/03/15 05:37:03 ryoon Exp $
  DOCDIR = $(PREFIX)/share/doc/fotoxx
 -MANDIR = $(PREFIX)/share/man/man1
 +MANDIR = $(PREFIX)/${PKGMANDIR}/man1
+ APPDATADIR = $(PREFIX)/share/appdata
  MENUFILE = $(PREFIX)/share/applications/fotoxx.desktop
  
- CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
+@@ -94,7 +94,7 @@ install: fotoxx uninstall
+ 	cp -f -R  data/* $(DESTDIR)$(DATADIR)
+ 	cp -f -R  icons/* $(DESTDIR)$(ICONDIR)
+ 	cp -f -R  locales/* $(DESTDIR)$(LOCALESDIR)
+-	cp -n -R  doc/* $(DESTDIR)$(DOCDIR)
++	cp -R  doc/* $(DESTDIR)$(DOCDIR)
+ 	gzip -f -9 $(DESTDIR)$(DOCDIR)/changelog
+ 	cp -f -R  appdata/* $(DESTDIR)$(APPDATADIR)
+ 	# man page
diff --git a/graphics/fotoxx/patches/patch-ab b/graphics/fotoxx/patches/patch-ab
index 665dd6ac184..67482761038 100644
--- a/graphics/fotoxx/patches/patch-ab
+++ b/graphics/fotoxx/patches/patch-ab
@@ -1,36 +1,48 @@
-$NetBSD: patch-ab,v 1.14 2014/03/27 19:13:06 ryoon Exp $
+$NetBSD: patch-ab,v 1.15 2016/01/03 04:33:49 ryoon Exp $
 
 * Add NetBSD support
 
---- fotoxx-14.03.1.cc.orig	2014-03-05 07:17:10.000000000 +0000
-+++ fotoxx-14.03.1.cc
-@@ -512,7 +512,11 @@ int initzfunc(void *)
+--- fotoxx-16.01.cc.orig	2016-01-01 08:20:29.000000000 +0000
++++ fotoxx-16.01.cc
+@@ -465,28 +465,28 @@ int initzfunc(void *)
+    if (err) {
+       printz("copy default pattern files \n");
+       mkdir(pattern_dirk,0750);
+-      shell_quiet("cp -n %s/patterns/* %s",get_zdatadir(),pattern_dirk);
++      shell_quiet("yes 'n' | cp -i %s/patterns/* %s",get_zdatadir(),pattern_dirk);
     }
  
-    contx = 0;
-+#if defined(__NetBSD__)
-+   while ((pp = command_output(contx,"find /var/shm/fotoxx-*",0))) {
-+#else
-    while ((pp = command_output(contx,"find /run/shm/fotoxx-*",0))) {
-+#endif
-       pp2 = strchr(pp,'-');
-       if (! pp2) continue;
-       npid = atoi(pp2+1);                                                  //  pid of fotoxx owner process
-@@ -556,7 +560,7 @@ int initzfunc(void *)
+    err = stat(retouch_combo_dirk,&statb);                                        //  retouch combo settings
+    if (err) {
+       printz("copy default retouch_combo files \n");
+       mkdir(retouch_combo_dirk,0750);
+-      shell_quiet("cp -n %s/retouch_combo/* %s",get_zdatadir(),retouch_combo_dirk);
++      shell_quiet("yes 'n' | cp -i %s/retouch_combo/* %s",get_zdatadir(),retouch_combo_dirk);
+    }
  
-    //  miscellaneous
+    err = stat(custom_kernel_dirk,&statb);                                        //  custom convolution kernels
+    if (err) {
+       printz("copy default custom_kernel files \n");
+       mkdir(custom_kernel_dirk,0750);
+-      shell_quiet("cp -n %s/custom_kernel/* %s",get_zdatadir(),custom_kernel_dirk);
++      shell_quiet("yes 'n' | cp -i %s/custom_kernel/* %s",get_zdatadir(),custom_kernel_dirk);
+    }
  
--   Nwt = get_nprocs();                                                     //  get SMP CPU count
-+   Nwt = sysconf(_SC_NPROCESSORS_ONLN);                                    //  get SMP CPU count
-    if (Nwt <= 0) Nwt = 2;
-    if (Nwt > max_threads) Nwt = max_threads;                               //  compile time limit
-    printz("using %d threads \n",Nwt);
-@@ -641,7 +645,7 @@ int initzfunc(void *)
-    err = stat(favorites_config,&statb);
+    err = stat(favorites_dirk,&statb);                                            //  favorites menu
     if (err) {
-       printz("create default favorites menu \n");
--      shell_quiet("cp -R -n %s/favorites/* %s",get_zdatadir(),favorites_dirk);
-+      shell_quiet("yes 'n' | cp -R -i %s/favorites/* %s",get_zdatadir(),favorites_dirk);
+       printz("copy default favorites menu \n");
+       mkdir(favorites_dirk,0750);
+-      shell_quiet("cp -n %s/favorites/* %s",get_zdatadir(),favorites_dirk);
++      shell_quiet("yes 'n' | cp -i %s/favorites/* %s",get_zdatadir(),favorites_dirk);
     }
  
-    //  if no slide show pause tone file, copy installation default
+    err = stat(tags_defined_file,&statb);                                         //  tags_defined file
+@@ -510,7 +510,7 @@ int initzfunc(void *)
+    screenhh = gdk_screen_get_height(screen);
+    printz("screen width: %d  height: %d \n",screenww,screenhh);
+ 
+-   NWT = get_nprocs();                                                           //  get SMP CPU count
++   NWT = sysconf(_SC_NPROCESSORS_ONLN);           //  get SMP CPU count
+    if (NWT <= 0) NWT = 2;
+    if (NWT > max_threads) NWT = max_threads;                                     //  compile time limit
+    printz("using %d threads \n",NWT);
diff --git a/graphics/fotoxx/patches/patch-ac b/graphics/fotoxx/patches/patch-ac
index 6fd66f5abfe..fbf4a4afb7c 100644
--- a/graphics/fotoxx/patches/patch-ac
+++ b/graphics/fotoxx/patches/patch-ac
@@ -1,14 +1,14 @@
-$NetBSD: patch-ac,v 1.15 2014/03/27 19:13:06 ryoon Exp $
+$NetBSD: patch-ac,v 1.16 2016/01/03 04:33:49 ryoon Exp $
 
 * Add NetBSD support
 
---- zfuncs.h.orig	2014-03-05 07:17:10.000000000 +0000
+--- zfuncs.h.orig	2016-01-01 08:20:29.000000000 +0000
 +++ zfuncs.h
 @@ -22,7 +22,6 @@
  
- //     zfuncs.h   version  v.5.8
+ //     zfuncs.h   version  v.6.2
  
--#include <sys/sysinfo.h> 
+-#include <sys/sysinfo.h>
  #include <sys/time.h>
  #include <sys/stat.h>
  #include <sys/resource.h>
@@ -18,5 +18,5 @@ $NetBSD: patch-ac,v 1.15 2014/03/27 19:13:06 ryoon Exp $
  #include <gtk/gtk.h>
 +#include <sys/wait.h>
  
- #define VERTICAL GTK_ORIENTATION_VERTICAL                                  //  GTK shortcuts
+ #define VERTICAL GTK_ORIENTATION_VERTICAL                                        //  GTK shortcuts
  #define HORIZONTAL GTK_ORIENTATION_HORIZONTAL
diff --git a/graphics/fotoxx/patches/patch-f.combine.cc b/graphics/fotoxx/patches/patch-f.combine.cc
new file mode 100644
index 00000000000..937882a44c8
--- /dev/null
+++ b/graphics/fotoxx/patches/patch-f.combine.cc
@@ -0,0 +1,27 @@
+$NetBSD: patch-f.combine.cc,v 1.1 2016/01/03 04:33:49 ryoon Exp $
+
+--- f.combine.cc.orig	2016-01-01 08:20:29.000000000 +0000
++++ f.combine.cc
+@@ -47,6 +47,9 @@
+ 
+ #define EX extern                                                                //  enable extern declarations
+ #include "fotoxx.h"                                                              //  (variables in fotoxx.h are refs)
++#if !defined(__linux__)
++#include <limits.h>
++#endif
+ 
+ /********************************************************************************/
+ 
+@@ -6490,7 +6493,12 @@ void m_pano_PT(GtkWidget *, cchar *)    
+    if (checkpend("all")) return;
+    Fblock = 1;                                                                   //  15.11
+ 
++#if defined(__linux__)
+    olddir = get_current_dir_name();                                              //  save curr. directory
++#else
++   char cwd[PATH_MAX];
++   olddir = getcwd(cwd, PATH_MAX);
++#endif
+ 
+    err = chdir(tempdir);                                                         //  use /tmp/fotoxx-xxxxx
+    if (err) {
diff --git a/graphics/fotoxx/patches/patch-f.meta.cc b/graphics/fotoxx/patches/patch-f.meta.cc
new file mode 100644
index 00000000000..b06c1b20418
--- /dev/null
+++ b/graphics/fotoxx/patches/patch-f.meta.cc
@@ -0,0 +1,16 @@
+$NetBSD: patch-f.meta.cc,v 1.1 2016/01/03 04:33:49 ryoon Exp $
+
+--- f.meta.cc.orig	2016-01-01 08:20:29.000000000 +0000
++++ f.meta.cc
+@@ -4836,7 +4836,11 @@ cchar * web_geocode(char *location[2], c
+    snprintf(URI,299,"\"%s&location=%s,%s\"",query,location[0],location[1]);
+ 
+    err = shell_quiet("wget -T 10 -o /dev/null -O %s %s",outfile,URI);
++#if defined(__linux__)
+    if (err == 4) err = ECOMM;                                                    //  replace "interrupted system call"
++#else
++   if (err == 4) err = EIO;                                                    //  replace "interrupted system call"
++#endif
+    if (err) return strerror(err);
+ 
+    fid = fopen(outfile,"r");                                                     //  get response
diff --git a/graphics/fotoxx/patches/patch-f.repair.cc b/graphics/fotoxx/patches/patch-f.repair.cc
index 8d19583a055..dee0da0581d 100644
--- a/graphics/fotoxx/patches/patch-f.repair.cc
+++ b/graphics/fotoxx/patches/patch-f.repair.cc
@@ -1,23 +1,23 @@
-$NetBSD: patch-f.repair.cc,v 1.2 2014/03/15 05:37:03 ryoon Exp $
+$NetBSD: patch-f.repair.cc,v 1.3 2016/01/03 04:33:50 ryoon Exp $
 
---- f.repair.cc.orig	2014-03-05 07:17:10.000000000 +0000
+--- f.repair.cc.orig	2016-01-01 08:20:29.000000000 +0000
 +++ f.repair.cc
-@@ -28,6 +28,8 @@
-    Fotoxx image edit - Repair menu functions
- ***************************************************************************/
+@@ -51,6 +51,8 @@
+ 
+ /********************************************************************************/
  
-+int smart_erase_blur(float radius);
 +void smart_erase_func(int mode);
++int smart_erase_blur(float radius);
  
  //  image sharpen functions
  
-@@ -1593,9 +1595,6 @@ void m_smart_erase(GtkWidget *, const ch
+@@ -2234,9 +2236,6 @@ void m_smart_erase(GtkWidget *, const ch
  
- int smart_erase_dialog_event(zdialog *zd, const char *event)               //  overhauled
+ int smart_erase_dialog_event(zdialog *zd, const char *event)                     //  overhauled
  {
 -   void smart_erase_func(int mode);
 -   void smart_erase_blur(float radius);
--   
+-
     float       radius;
     int         cc;
-    
+ 
diff --git a/graphics/fotoxx/patches/patch-fotoxx.h b/graphics/fotoxx/patches/patch-fotoxx.h
new file mode 100644
index 00000000000..9765da5baaa
--- /dev/null
+++ b/graphics/fotoxx/patches/patch-fotoxx.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-fotoxx.h,v 1.1 2016/01/03 04:33:50 ryoon Exp $
+
+--- fotoxx.h.orig	2016-01-01 08:20:29.000000000 +0000
++++ fotoxx.h
+@@ -21,7 +21,9 @@
+ 
+ *********************************************************************************/
+ 
++#if defined(__linux__)
+ #include <wait.h>
++#endif
+ #include <glob.h>
+ #include <tiffio.h>
+ #include <png.h>
diff --git a/graphics/fotoxx/patches/patch-zfuncs.cc b/graphics/fotoxx/patches/patch-zfuncs.cc
new file mode 100644
index 00000000000..5e59a7472ba
--- /dev/null
+++ b/graphics/fotoxx/patches/patch-zfuncs.cc
@@ -0,0 +1,20 @@
+$NetBSD: patch-zfuncs.cc,v 1.1 2016/01/03 04:33:50 ryoon Exp $
+
+--- zfuncs.cc.orig	2016-01-01 08:20:29.000000000 +0000
++++ zfuncs.cc
+@@ -296,6 +296,7 @@ char *zstrdup(cchar *string, int addcc)
+ 
+ void zmalloc_report()
+ {
++#if defined(__linux__)
+    using namespace zfuncs;
+ 
+    static double     ptime = 0;
+@@ -317,6 +318,7 @@ void zmalloc_report()
+    ptime = jobtime();                                                            //  reset some counters
+    Nmalloc = Nstrdup = Nfree = 0;
+ 
++#endif
+    return;
+ }
+