Wed May 11 01:27:03 2011 UTC ()
Update to 11.05.1

* On DragonFly, not works yet (like before).

fotoxx change log
=================

2011.05.02  v.11.05.1
+ The new version of alien replaces text files in /usr/share/doc/appname
  with compressed (.gz) versions, making the menu Help > Change Log etc.
  fail. Program was revised to accept either normal or compressed files.
+ Context help (F1) for Remove Dust did not work.

2011.05.01  v.11.05
+ New function Erase Dust: erase dust spots on images from scanned slides.
+ Named image collections were made easier to create and revise. Images
  can be added, removed and rearranged using a thumbnail gallery.
+ The trim (crop) function better handles zoom and scroll. The desired
  image size can be input directly, in addition to the mouse drag method.
+ Smart Erase was made faster (noticeable on slow processors).
+ Create Blank Image: simplify UI and create new file automatically.
+ Minor UI improvement: inform user if the current search results or
  named collection must be abandoned to open a non-member image file.
+ Select Area: edge distance calculation for hairy edges is >2x faster.
+ Image tags with imbedded blanks are allowed.
+ Bugfix: Smart Erase was sometimes missing a few pixels.
+ The supplied .deb and .rpm packages are now built using Ubuntu 10.04
  instead of Ubuntu 8.10. These packages (using newer libraries) may
  not be installable on less current Linux releases.

2011.04.01  v.11.04
+ Vertical panorama was implemented (previously possible but clumsy).
+ Slide Show can optionally play a music file or play list.
+ A pre-planned slide show can be started from the command line.
+ Initialization for new installs was simplified and the user warning was
  strengthened (need fewer frustrated users who don't read user guides).
+ Smart Erase was made easier by combining the select and erase functions.
+ Select ellipse: keep the ellipse centered at the drag origin.
+ Select by color: the search range for matching pixels was limited to
  3x the mouse radius. This works better, allowing edges with varying
  color to be more easily followed and selected. The remaining interior
  areas can be selected with an extra click in the finish dialog.
+ Paste Area was made easier to use by automating the finish step.
+ Unbend was extended to fix more types of perspective problems.
+ Toolbar buttons were rearranged to reduce the risk of accidentally
  overwriting the original image.
+ The total image file limit of 100,000 was removed. The practical limit
  depends on how much main memory is available for the image search index.
  1 GB is enough for >1 million files, and only needed when searching.
+ Bugfix: possible crash in slide show with "ellipse" transitions.
+ Bugfix: HDF: first manual tweak caused an annoying random jump.
+ Bugfix: crash if initial warning message ignored and then open a file.

2011.03.13  v.11.03.1
+ Bugfix: possible crash if area select along bottom edge of image.
+ Bugfix: possible crash following a revision of lens parameters.
+ Bugfix: select area: edge of image can also be edge of area.

2011.03.01  v.11.03
+ Composite functions Pano, HDR, HDF and Stack run 2-3 times faster.
+ Printing: intermediate file was changed from .jpeg to .tiff to correct
  slight blurring of some color edges in high-resolution images.
+ New art function: create color outline drawings.
+ New function: adjust monitor gamma with live feedback.
+ Plugins: add external image editors to Fotoxx menu: Fotoxx edits may
  precede and follow, [undo] / [redo] buttons work, etc.
+ Smart Erase: can use a tighter area around the object to be erased.
+ Panorama: the math was simplified to a pure cylindrical projection.
+ Select Area: added select for rectangular and elliptical areas.
+ Notify user of delay for thumbnail creation when new images are found.
+ New slide show transition: ellipse expanding from the center.
+ Select Area: brighter outlines for freehand draw and follow edge.
+ Unbend: panorama curve is more accurately flattened.
+ bugfix: crash reading 4-channel tiff file in strip format.
+ bugfix: panorama crash if image overlap reaches zero during alignment.
+ bugfix: crash if trying to save to a .gif file (converts to .jpg).
+ bugfix: fixed small memory leak in metadata viewer.

2011.02.01  v.11.02
+ Retouch functions can be incrementally "painted" with the mouse, with
  variable radius and strength.
+ Area cut and paste: edge effects are more effectively suppressed and
  the pasted area/object can be rotated as well as resized.
+ Curve edit (used in image retouch functions): curve data can be saved
  to a file or loaded from a file as part of the curve edit dialog.
+ New function: Smart Erase: erase power lines and other small defects
  by replacing them with pixels from the neighborhood.
+ New functions: Make Image Collection and Open Image Collection. Images
  may be assigned to named collections. A collection can be recalled and
  used for a slide-show, export, etc.
+ New function: Combine photos of the same subject taken at different
  moments, remove tourists, cars, etc. that come and go.
+ Panorama pre-align was made a little easier (check the user guide).
+ Tag Edit and Tag Management were separated to simplify operation.
+ New 1-time function: Tools > Fix Tag Delimiters: make tags (keywords)
  compatible with Photoshop. Other photo managers may not be compatible.
  This is optional and can be done at any time without affecting Fotoxx.
+ Art > Dots: dot rows are offset by 1/2 dot pitch, which looks better.
+ Expand Brightness Range: use sliders and show brightness histogram.
+ 1-time function to rebuild thumbnails now has a fast incremental mode.
+ Obsolete functions removed: convert old tag and parameter formats.
  (if you have startup problems, delete /home/<user>/.fotoxx).
+ Bugfix: Edit Info function could not be canceled before using it.
+ Bugfix: Edit Info (metadata) limit raised from 100 to 1000 characters.
+ Bugfix: Stop meaningless EXIF diagnostic when a blank image is created.
+ Bugfix: Annotate crash if font set to tiny and then increased.
+ tags_index file was renamed to search_index

2011.01.07  v.11.01.2
+ Bugfix: select whole image was not working. What went wrong between
  testing and release is a mystery, but now it is fixed.

2011.01.06  v.11.01.1
+ Revise startup warnings about thumbnails and tag index file to make
  them less intrusive and perhaps easier to understand.
+ French translation was updated.

2011.01.01  v.11.01
+ Select Area: Select the whole image and use overall brightness or a
  single RGB color brightness to control the application of a retouch
  function. This allows tone mapping, noise reduction, etc. to apply
  in darker image areas but not brighter areas (or the inverse).
+ New art function: make a dot matrix image (à la Roy Lichtenstein).
+ Slide Show was given a few dubiously useful but cute image transition
  modes (fade-out/fade-in and various kinetic image replacement methods).
+ Open Recent File: the 100 most recent image files are presented in a
  gallery window to make it easier to go back to a desired image.
+ If grid lines are active when an image is printed, the grid lines will
  also appear on the printed image.
+ The status bar shows if a select-area is active or a function is busy.
+ A new blank image can be created and used as a basis for mashups
  using cutouts from other images plus annotation text.
+ After a first-time install, the user is now advised to run the 1-time
  indexing program so that image searches will function correctly.
+ Batch add and delete tags have a popup window to monitor progress.
+ Search Images output (gallery window) is sorted to follow the physical
  organization of the underlying files. Groupings and sequences implied
  by the file organization (directories and file names) are preserved
  in the generated window of thumbnail images. This was always a claimed
  fotoxx capability, but was not always working as advertised.
+ Bugfix: image was sometimes not being resized to fit window after a
  size change (trim, resize), possibly giving a false impression.
+ Bugfix: inverting a select area did not work with some edit functions.

2010.12.07  v.10.12.1
Three minor GUI improvements:
+ pixel edit: notify if select area is active to avoid user confusion.
+ fix inconsistent behavior of select area draw and follow edge.
+ bugfix: "Save As" with a name like "2010.12" resulted in "2010.jpg".

2010.12.01  v.10.12
This release has many small user interface improvements and bug fixes.
+ Switching the mouse between dialogs and main window was simplified,
  making it easier to zoom and pan when a dialog owns the mouse or to
  control two active dialogs alternating ownership of the mouse.
+ Select Area by color: in firewall mode, pixels within the mouse radius
  are unconditionally selected. Left drag now works as an un-select.
+ Select Area by freeform drawing: drawing lines along the edge of the
  image is no longer so tedious.
+ The HDF "paint" mode was made more responsive for slow CPUs.
+ Image captions (IPTC: Caption-Abstract) are now searchable (along
  with tags, dates, stars, comments, file names). Image captions are
  searched for given words. Run Tools > Rebuild Tags Index to update
  the search index (one-time conversion job).
+ Data functions (EXIF/IPTC/etc. tags, comments, captions) were moved
  into one menu. The "big text" functions (comments, captions) were
  made easier to view and edit with a conventional text edit interface.
+ Info > Search Images: searching file names works without wildcards,
  (e.g. search "rosi" matches /xxx/rosi/xxx.jpg and /xxx/Rosixxx.jpg).
+ Info > Search Images: date range default month/day is 01/01 for low
  limit and 12/31 for high limit, so "2009 to 2010" is two full years.
+ Info > Search Images: "match any" and "match all" can be specified
  separately for tags, comments/captions, and file names.
+ Rotated images are no longer automatically uprighted. Instead, use
  the R or L key to permanently fix as needed. This saves time for
  every image opened since the EXIF data need not be read.
+ File > Open Recent File: opens the combo box file list automatically.
+ File > Open Previous File: opens most recent file that still exists.
+ File > Save As with "new version" selected: the version naming was
  changed to reduce the risk of conflict with a user file naming system.
  Format: originalname.jpg >> *.v01.jpg >> *.v02.jpg >> etc.
+ Buttons [Prev] and [Next] more reliably find previous or next files
  even if files have been deleted or renamed outside Fotoxx.
+ Dialogs that need significant time now show an hourglass, even when
  the mouse cursor stays inside the dialog window.
+ Tools > Clone: screen is split 50/50 between the two instances.
+ Transform > Trim: dragging the margins is smoother for slow CPUs.
+ Zoom: limit was raised from 200% to 400%. This makes it easier
  to do a very precise area selection.
+ Annotate Image: text can be optionally outlined with a different color.
+ The user guide was audited and many small corrections were made.
+ Bugfix: quotes in EXIF/IPTC/etc. data were replaced with escaped
  quotes to prevent the exiftool command from failing.
+ Bugfix: Area copy and paste: fixed small edge defects that sometimes
  happened when the pasted area was reduced in size.

2010.11.08  v.10.11.2
+ Bugfix: Trashing an image deleted User Comments for other images in the
  tag index file, causing the Search function to fail for comments search.
  Run Tools > Rebuild Tags Index if you are using the comments feature.

2010.11.01  v.10.11.1
+ Bugfix: crash if fotoxx start and quit without opening an image file.

2010.11.01  v.10.11
+ Search Tags: a simpler alternative is provided for those not wanting to
  maintain an elaborate image tag system: search based on user comments
  and/or image folder and file names. Match on any or all search words
  entered, with optional wildcard matching for folder and file names.
  NOTE: Run Tools > Rebuild Tags Index for this feature to work.
+ Edit functions operating within a small area were made more responsive
  for slow CPUs: Warp Area, Paste Area, Annotate Image, Edit Pixels.
+ Annotate Image: both text and background color and transparency can be
  specified. Traditional-looking watermarks can be made. Annotation data
  can be saved as a file, so annotations can be kept and re-used.
+ Grid lines: either line count or line spacing can be specified. Line
  counts are independent of image size. G-key toggles grid on/off.
+ New function: Warp Image (linear): an alternative way to compensate
  for perspective distortions. Change line slopes without curving them.
+ Pixel edit now works within a selected area. This makes it easy to paint
  inside an area using an opaque or transparent color and a large brush.
+ Select Area by Color: optional "firewall" mode: already-selected pixels
  become a barrier to the propagation of newly-selected pixels.
+ Buttons in Select Area dialog were made available as menu functions
  with their own F1 help topics (a small convenience improvement).
+ Dialog boxes now open near the upper right corner of the main window
  instead of the middle (a small convenience improvement).
+ File > Save As: retain the same current file and image set if saving
  to a different directory. Otherwise make the new file the current file
  and add it to the current image set (directory or tag search results)
  (a small convenience improvement).
+ New function: File > Open Previous: go back to the previous file,
  also if in another directory (a small convenience improvement).
  (File > Open Recent is unchanged: choose from last 30 files).
+ Bugfix: missing or corrupted parameters file could cause a crash.

2010.10.16  v.10.10.2 and 10.10.3
+ Bugfix: restored lost F1 links to user guide.
+ Bugfix: trim button [invert] did not work. [gold] ratio was inverted.
+ The Dutch translation was updated.
+ Edit EXIF User Comments and Annotate Image (write text on image) were
  made into separate functions. The old interface was confusing.
+ Annotate on slow (Atom) processors now works acceptably fast.
+ Grid lines dialog revised to use line spacing instead of line counts.
+ Trim ratio buttons are customized with a GUI instead of a text file.
+ Window repaint speed (expose event) was doubled (no impact on edits).

2010.10.02  v.10.10.1
+ Bugfix: Annotate function was missing the translation capability.
+ Annotate on slow (Atom) processors was made faster, but still slow.
+ The Italian translation was updated.

2010.10.01  v.10.10
+ New function Annotate Image: Text can be edited and viewed in a live
  window updated with each image opened, or written directly on the
  image using any font, size and rotation.
+ New function E-mail: select multiple images, downsize within specified
  limits, and e-mail using the preferred e-mail program.
+ A small improvement was made in the visibility of grid lines.
+ Max. working threads was raised to 6 (newest CPUs have up to 6 cores).
+ Image trim (crop): the preset aspect ratio buttons can be customized
  by editing a parameters file.
+ More parameters are saved and restored across sessions: trim size,
  grid lines, e-mail size, edit resize, batch resize.
+ The word "mass" in menus and help text was replaced with "batch".

2010.09.10  v.10.9.1
+ Chinese translation was updated.
+ Bugfix: save-as: file names like xxx.yyy.jpg got truncated to xxx.jpg.
+ Usability improvement: A set of files generated by searching tags is no
  longer discarded if a member file is opened, saved, renamed, or trashed.

2010.09.01  v.10.9
+ The Portuguese translation was updated.
+ New: Stack function: combine multiple images of the same subject for
  noise reduction. Use mean or median pixel RGB values and optionally
  discard the most extreme RGB values (noisiest) from the mix.
+ New: make a B/W or color negative, or make a positive from a negative.
+ New: delete or replace a tag for selected or all images.
+ The brightness/contrast curve edit function was revised to better
  preserve detail in the brightest image areas.
+ The Retouch curve edit functions are generally 30% faster.
+ The interplay between the main window and gallery window was revised.
  The gallery window overlays the main window, with the current image in
  the top row. When an image is clicked in the gallery, the main window
  overlays the gallery window, showing the selected image. Both windows
  are still present and can be dragged apart if wanted. The perception
  is that they both alternately occupy the same window.
+ The functions Burn CD/DVD, Mass Add/Delete Tags, and Mass Resize can
  now be used together with Search Tags: use Search Tags to establish a
  set of images from which the files to mass-process can be selected.
+ Select Area dialog: buttons added: [enable] [disable] [invert].
  This makes editing areas a bit faster than using separate menus.
+ A small improvement was made in the Select Area follow-edge algorithm.
+ Default extensions for "Save As" were changed from .jpeg and .tiff to
  .jpg and .tif because some programs don't recognize the longer forms.
+ "Save As" sets the current file to the newly saved file instead of
  remaining at the prior file. This makes fotoxx work more like other
  apps. Use the "recent file" menu to go back if wanted. Any edits are
  still active and can be undone or further edited and saved again.
+ HDR/HDF: auto-trim the edges where all input images do not overlap.
+ Curve editing was generally revised not to truncate curves beyond the
  first and last anchor points. Curves are projected to the graph limits.
+ Internal cleanup: generalize the saving and restoring parameters across
  sessions. Add mass-resize width/height to the saved parameters.
+ Bugfix: Sharpen: gradient method: threshold did not work correctly.
+ Bugfix: rounding error in HDF was causing 1-pixel alignment errors.
+ Bugfix: gtk function call within a thread was causing a (rare) crash.
+ Bugfix: huge tag in iptc:keywords caused a loop in tag editing.


(ryoon)
diff -r1.11 -r1.12 pkgsrc/graphics/fotoxx/Makefile
diff -r1.4 -r1.5 pkgsrc/graphics/fotoxx/PLIST
diff -r1.4 -r1.5 pkgsrc/graphics/fotoxx/distinfo
diff -r1.2 -r1.3 pkgsrc/graphics/fotoxx/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/graphics/fotoxx/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/graphics/fotoxx/patches/patch-ac
diff -r1.2 -r0 pkgsrc/graphics/fotoxx/patches/patch-ad
diff -r0 -r1.1 pkgsrc/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc

cvs diff -r1.11 -r1.12 pkgsrc/graphics/fotoxx/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/Makefile 2011/04/22 13:43:44 1.11
+++ pkgsrc/graphics/fotoxx/Makefile 2011/05/11 01:27:03 1.12
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1# $NetBSD: Makefile,v 1.11 2011/04/22 13:43:44 obache Exp $ 1# $NetBSD: Makefile,v 1.12 2011/05/11 01:27:03 ryoon Exp $
2# 2#
3 3
4DISTNAME= fotoxx-10.8.4 4DISTNAME= fotoxx-11.05.1
5PKGREVISION= 5 
6CATEGORIES= graphics 5CATEGORIES= graphics
7MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/ 6MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://kornelix.squarespace.com/fotoxx/ 9HOMEPAGE= http://kornelix.squarespace.com/fotoxx/
11COMMENT= Program for editing image files from a digital camera 10COMMENT= Program for editing image files from a digital camera
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 14DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
16DEPENDS+= p5-Image-ExifTool-[0-9]*:../../graphics/p5-Image-ExifTool 15DEPENDS+= p5-Image-ExifTool-[0-9]*:../../graphics/p5-Image-ExifTool
17DEPENDS+= gimp-ufraw-[0-9]*:../../graphics/gimp-ufraw 16DEPENDS+= gimp-ufraw-[0-9]*:../../graphics/gimp-ufraw
18 17
19#WRKSRC= ${WRKDIR}/fotoxx 18#WRKSRC= ${WRKDIR}/fotoxx
20USE_LANGUAGES= c++ 19USE_LANGUAGES= c++
21USE_TOOLS+= gmake pkg-config 20USE_TOOLS+= gmake pkg-config
22 21
23BUILD_TARGET= fotoxx 22BUILD_TARGET= fotoxx
24INSTALL_TARGET= install manpage # XXX menu 23INSTALL_TARGET= install
25 24
26.include "../../graphics/tiff/buildlink3.mk" 25.include "../../graphics/tiff/buildlink3.mk"
27.include "../../x11/gtk2/buildlink3.mk" 26.include "../../x11/gtk2/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"

cvs diff -r1.4 -r1.5 pkgsrc/graphics/fotoxx/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/PLIST 2010/08/24 18:58:02 1.4
+++ pkgsrc/graphics/fotoxx/PLIST 2011/05/11 01:27:03 1.5
@@ -1,85 +1,89 @@ @@ -1,85 +1,89 @@
1@comment $NetBSD: PLIST,v 1.4 2010/08/24 18:58:02 bad Exp $ 1@comment $NetBSD: PLIST,v 1.5 2011/05/11 01:27:03 ryoon Exp $
2bin/fotoxx 2bin/fotoxx
 3share/applications/kornelix-fotoxx.desktop
3share/doc/fotoxx/CHANGES 4share/doc/fotoxx/CHANGES
4share/doc/fotoxx/COPYING 5share/doc/fotoxx/COPYING
5share/doc/fotoxx/README 6share/doc/fotoxx/README
6share/doc/fotoxx/TRANSLATIONS 7share/doc/fotoxx/TRANSLATIONS
7share/doc/fotoxx/fotoxx.man 8share/doc/fotoxx/fotoxx.man
8share/doc/fotoxx/images/.thumbnails/HDF-dialog.jpeg.png 9share/doc/fotoxx/images/HDF-paint.jpg
9share/doc/fotoxx/images/.thumbnails/brightness-color.de.jpeg.png 10share/doc/fotoxx/images/HDR-adjust.jpg
10share/doc/fotoxx/images/HDF-dialog.jpeg 11share/doc/fotoxx/images/annotate.jpg
11share/doc/fotoxx/images/brightness-color.de.jpeg 12share/doc/fotoxx/images/brightness-color.jpg
12share/doc/fotoxx/images/brightness-color.jpeg 13share/doc/fotoxx/images/brightness-ramp.png
13share/doc/fotoxx/images/edit-tags.jpeg 14share/doc/fotoxx/images/curve-edit.jpg
14share/doc/fotoxx/images/navigation.de.jpeg 15share/doc/fotoxx/images/edit-collection.jpg
 16share/doc/fotoxx/images/edit-tags.jpg
 17share/doc/fotoxx/images/expand-brightness.png
 18share/doc/fotoxx/images/gallery image selection.jpg
 19share/doc/fotoxx/images/gammachart.png
 20share/doc/fotoxx/images/manage-tags.jpg
15share/doc/fotoxx/images/navigation.jpeg 21share/doc/fotoxx/images/navigation.jpeg
16share/doc/fotoxx/images/pano-dialog.jpeg 22share/doc/fotoxx/images/pano-dialog.jpeg
17share/doc/fotoxx/images/rename.de.jpeg 23share/doc/fotoxx/images/remove-dust.jpg
18share/doc/fotoxx/images/rename.jpeg 24share/doc/fotoxx/images/rename.jpeg
19share/doc/fotoxx/images/save-as.de.jpeg 
20share/doc/fotoxx/images/save-as.jpeg 25share/doc/fotoxx/images/save-as.jpeg
21share/doc/fotoxx/images/search-tags.de.jpeg 26share/doc/fotoxx/images/search-images.jpg
22share/doc/fotoxx/images/search-tags.jpeg 
23share/doc/fotoxx/images/select-area.png 27share/doc/fotoxx/images/select-area.png
24share/doc/fotoxx/images/sharpen.de.jpeg 28share/doc/fotoxx/images/select-edit.jpg
 29share/doc/fotoxx/images/select-whole-image.jpg
25share/doc/fotoxx/images/sharpen.jpeg 30share/doc/fotoxx/images/sharpen.jpeg
26share/doc/fotoxx/images/tonemap.de.jpeg 31share/doc/fotoxx/images/smart-erase.png
27share/doc/fotoxx/images/tonemap.jpeg 32share/doc/fotoxx/images/stack.png
28share/doc/fotoxx/images/zappcrash 33share/doc/fotoxx/images/tone-mapping.png
29share/doc/fotoxx/userguide-changes 34share/doc/fotoxx/images/trim.jpg
30share/doc/fotoxx/userguide-de.html 35share/doc/fotoxx/images/unbend.png
 36share/doc/fotoxx/images/watermark.jpg
31share/doc/fotoxx/userguide-en.html 37share/doc/fotoxx/userguide-en.html
 38share/fotoxx/data/desktop
32share/fotoxx/icons/arrow.png 39share/fotoxx/icons/arrow.png
33share/fotoxx/icons/busy.png 40share/fotoxx/icons/busy.png
34share/fotoxx/icons/busy2.png 
35share/fotoxx/icons/drag.png 41share/fotoxx/icons/drag.png
36share/fotoxx/icons/draw.png 42share/fotoxx/icons/draw.png
37share/fotoxx/icons/first-page.png 43share/fotoxx/icons/first-page.png
38share/fotoxx/icons/folder.png 44share/fotoxx/icons/folder.png
39share/fotoxx/icons/folder128.png 
40share/fotoxx/icons/folder2.png 
41share/fotoxx/icons/folder256.png 45share/fotoxx/icons/folder256.png
42share/fotoxx/icons/fotoxx.png 46share/fotoxx/icons/fotoxx.png
43share/fotoxx/icons/gallery.png 47share/fotoxx/icons/gallery.png
44share/fotoxx/icons/help.png 48share/fotoxx/icons/help.png
45share/fotoxx/icons/kill.png 
46share/fotoxx/icons/last-page.png 49share/fotoxx/icons/last-page.png
47share/fotoxx/icons/next-page.png 50share/fotoxx/icons/next-page.png
48share/fotoxx/icons/next-row.png 51share/fotoxx/icons/next-row.png
49share/fotoxx/icons/next.png 52share/fotoxx/icons/next.png
50share/fotoxx/icons/open.png 53share/fotoxx/icons/open.png
51share/fotoxx/icons/prev-page.png 54share/fotoxx/icons/prev-page.png
52share/fotoxx/icons/prev-row.png 55share/fotoxx/icons/prev-row.png
53share/fotoxx/icons/prev.png 56share/fotoxx/icons/prev.png
54share/fotoxx/icons/print.png 57share/fotoxx/icons/print.png
55share/fotoxx/icons/quit.png 58share/fotoxx/icons/quit.png
56share/fotoxx/icons/redo.png 59share/fotoxx/icons/redo.png
57share/fotoxx/icons/save.png 60share/fotoxx/icons/save.png
58share/fotoxx/icons/select.png 61share/fotoxx/icons/saveas.png
59share/fotoxx/icons/trash.png 62share/fotoxx/icons/trash.png
60share/fotoxx/icons/undo.png 63share/fotoxx/icons/undo.png
61share/fotoxx/icons/zoom+.png 64share/fotoxx/icons/zoom+.png
62share/fotoxx/icons/zoom-.png 65share/fotoxx/icons/zoom-.png
63share/fotoxx/locales/de/fotoxx.po 66share/fotoxx/locales/de/fotoxx.po
64share/fotoxx/locales/de/fotoxx.po.old 67share/fotoxx/locales/de/fotoxx.po.old
65share/fotoxx/locales/de/zfuncs.po 68share/fotoxx/locales/de/zfuncs.po
 69share/fotoxx/locales/en/fotoxx.po
 70share/fotoxx/locales/en/zfuncs.po
66share/fotoxx/locales/es/fotoxx.po 71share/fotoxx/locales/es/fotoxx.po
67share/fotoxx/locales/es/zfuncs.po 72share/fotoxx/locales/es/zfuncs.po
68share/fotoxx/locales/fr/fotoxx.po 73share/fotoxx/locales/fr/fotoxx.po
69share/fotoxx/locales/fr/zfuncs.po 74share/fotoxx/locales/fr/zfuncs.po
70share/fotoxx/locales/gl/fotoxx.po 75share/fotoxx/locales/gl/fotoxx.po
71share/fotoxx/locales/gl/zfuncs.po 76share/fotoxx/locales/gl/zfuncs.po
72share/fotoxx/locales/it/fotoxx.po 77share/fotoxx/locales/it/fotoxx.po
73share/fotoxx/locales/it/zfuncs.po 78share/fotoxx/locales/it/zfuncs.po
74share/fotoxx/locales/nl/fotoxx.po 79share/fotoxx/locales/nl/fotoxx.po
75share/fotoxx/locales/nl/zfuncs.po 80share/fotoxx/locales/nl/zfuncs.po
76share/fotoxx/locales/pt/fotoxx.po 81share/fotoxx/locales/pt/fotoxx.po
77share/fotoxx/locales/pt/zfuncs.po 82share/fotoxx/locales/pt/zfuncs.po
78share/fotoxx/locales/ru/fotoxx.po 83share/fotoxx/locales/ru/fotoxx.po
79share/fotoxx/locales/ru/zfuncs.po 84share/fotoxx/locales/ru/zfuncs.po
80share/fotoxx/locales/sv/fotoxx.po 85share/fotoxx/locales/sv/fotoxx.po
81share/fotoxx/locales/sv/fotoxx.po.old 
82share/fotoxx/locales/sv/zfuncs.po 86share/fotoxx/locales/sv/zfuncs.po
83share/fotoxx/locales/zh_CN/fotoxx.po 87share/fotoxx/locales/zh_CN/fotoxx.po
84share/fotoxx/locales/zh_CN/zfuncs.po 88share/fotoxx/locales/zh_CN/zfuncs.po
85share/man/man1/fotoxx.1 89share/man/man1/fotoxx.1

cvs diff -r1.4 -r1.5 pkgsrc/graphics/fotoxx/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/distinfo 2010/10/02 12:14:44 1.4
+++ pkgsrc/graphics/fotoxx/distinfo 2011/05/11 01:27:03 1.5
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.4 2010/10/02 12:14:44 bad Exp $ 1$NetBSD: distinfo,v 1.5 2011/05/11 01:27:03 ryoon Exp $
2 2
3SHA1 (fotoxx-10.8.4.tar.gz) = 3a1ead13324b5c50811247279c3de43b6e0d776a 3SHA1 (fotoxx-11.05.1.tar.gz) = 86fc10df92c6ea0e829e7b0e0b27031312f630ca
4RMD160 (fotoxx-10.8.4.tar.gz) = fc755d00f6f169bca7de165803a81b9511f5fb4f 4RMD160 (fotoxx-11.05.1.tar.gz) = fda2ef422745ae582ac90eb98d8ac6daea1b2499
5Size (fotoxx-10.8.4.tar.gz) = 1133275 bytes 5Size (fotoxx-11.05.1.tar.gz) = 1264701 bytes
6SHA1 (patch-aa) = 3052ebfdaf7d5c21e1ea15aff5167641f763137c 6SHA1 (patch-aa) = f936cc5bdc02a5a92470c8e02189d748593c6327
7SHA1 (patch-ab) = 3a6cc4a86e4422c62b917a634704650de3c84f48 7SHA1 (patch-ab) = b2ad9d5c8a2258729248371bd1e2a2920633331c
8SHA1 (patch-ac) = a0e0c9825d2c3db7b98e81d0a5ca39962cc48f1c 8SHA1 (patch-ac) = a17fd5ba3edfd746df2a9b4df3ab547505deedfe
9SHA1 (patch-ad) = 7815830a1f5c9a9b24bcd2f79c704d78c1ac5a72 9SHA1 (patch-fotoxx-11.05.1.cc) = f9f8a42bb0bf83c998da44e73f94ca47d92351fc

cvs diff -r1.2 -r1.3 pkgsrc/graphics/fotoxx/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/patches/patch-aa 2010/08/24 18:58:03 1.2
+++ pkgsrc/graphics/fotoxx/patches/patch-aa 2011/05/11 01:27:03 1.3
@@ -1,14 +1,36 @@ @@ -1,14 +1,36 @@
1$NetBSD: patch-aa,v 1.2 2010/08/24 18:58:03 bad Exp $ 1$NetBSD: patch-aa,v 1.3 2011/05/11 01:27:03 ryoon Exp $
2 2
3--- Makefile.orig 2010-08-18 11:23:51.000000000 +0000 3--- Makefile.orig 2011-05-01 18:44:26.000000000 +0000
4+++ Makefile 2010-08-23 00:06:09.000000000 +0000 4+++ Makefile
5@@ -20,8 +20,7 @@ 5@@ -23,8 +23,7 @@ LFLAGS = $(LDFLAGS) `pkg-config --libs g
6 MANDIR = $(PREFIX)/share/man/man1 
7  6
8 $(PROGRAM): $(PROGRAM).o zfuncs.o 7 fotoxx: fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o
 8 $(CXX) $(LFLAGS) -ltiff -o fotoxx fotoxx.o \
 9- fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o
9- @ ./dependencies.sh 10- @ ./dependencies.sh
10- $(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o 11+ fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o -lcompat
11+ $(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o -lcompat 
12  12
13 $(PROGRAM).o: $(SOURCE) 13 fotoxx.o: $(VERSION) fotoxx.h
14 $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ 14 $(CXX) $(CFLAGS) -o fotoxx.o $(VERSION)
 15@@ -48,7 +47,7 @@ install: fotoxx
 16 mkdir -p $(DESTDIR)$(LOCALESDIR)
 17 mkdir -p $(DESTDIR)$(DOCDIR)
 18 mkdir -p $(DESTDIR)$(MANDIR)
 19- mkdir -p $(PREFIX)/share/applications
 20+ mkdir -p $(DESTDIR)$(PREFIX)/share/applications
 21 cp -f fotoxx $(DESTDIR)$(BINDIR)
 22 cp -f data/* $(DESTDIR)$(DATADIR)
 23 cp -f icons/* $(DESTDIR)$(ICONDIR)
 24@@ -60,9 +59,9 @@ install: fotoxx
 25 cp fotoxx.1.gz $(DESTDIR)$(MANDIR)
 26 rm -f fotoxx.1.gz
 27 # menu (desktop) file
 28- echo Exec=/usr/bin/fotoxx >> $(MENUFILE1)
 29- echo Icon=/usr/share/fotoxx/icons/fotoxx.png >> $(MENUFILE1)
 30- cp $(MENUFILE1) $(DESTDIR)$(MENUFILE2)
 31+ echo Exec=$(BINDIR)/fotoxx >> $(DESTDIR)$(MENUFILE1)
 32+ echo Icon=$(ICONDIR)/fotoxx.png >> $(DESTDIR)$(MENUFILE1)
 33+ cp $(DESTDIR)$(MENUFILE1) $(DESTDIR)$(MENUFILE2)
 34 @ echo "*** use make menu to install the desktop menu"
 35
 36 menu:

cvs diff -r1.2 -r1.3 pkgsrc/graphics/fotoxx/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/patches/patch-ab 2010/08/24 18:58:03 1.2
+++ pkgsrc/graphics/fotoxx/patches/patch-ab 2011/05/11 01:27:03 1.3
@@ -1,46 +1,52 @@ @@ -1,46 +1,52 @@
1$NetBSD: patch-ab,v 1.2 2010/08/24 18:58:03 bad Exp $ 1$NetBSD: patch-ab,v 1.3 2011/05/11 01:27:03 ryoon Exp $
2 2
3--- zfuncs.cc.orig 2010-08-18 11:23:51.000000000 +0000 3--- zfuncs.cc.orig 2011-05-01 18:44:26.000000000 +0000
4+++ zfuncs.cc 2010-08-23 00:03:30.000000000 +0000 4+++ zfuncs.cc
5@@ -46,10 +46,12 @@ 5@@ -77,6 +77,7 @@ void zappcrash(cchar *pMess, ... )
6  6
7 printf("appcrash: \n %s \n",message); 7 printf("zappcrash: \n %s \n",message); // output message to stdout
8  8
9+#ifdef backtrace 9+#ifdef backtrace
10 nstack = backtrace(stacklist,nstack); // good for g++ -rdynamic 10 nstack = backtrace(stacklist,nstack); // get traceback data
11 stackents = backtrace_symbols(stacklist,nstack); 11 stackents = backtrace_symbols(stacklist,nstack);
12 for (ii = 0; ii < nstack; ii++)  12
 13@@ -84,12 +85,14 @@ void zappcrash(cchar *pMess, ... )
13 printf(" %s \n",stackents[ii]); 14 printf(" %s \n",stackents[ii]);
 15
 16 fid1 = fopen("zappcrash","w"); // text file for backtrace
14+#endif 17+#endif
15  18
16 abort(); // good for gdb backtrace 19 fprintf(fid1,"zappcrash: \n %s \n",message); // output message to text file
17 } 
18@@ -79,10 +81,12 @@ 
19  20
20 fprintf(fid,"zappcrash: \n %s \n",message); 21 cc = readlink("/proc/self/exe",progexe,300); // get own program path
 22 progexe[cc] = 0;
21  23
22+#ifdef backtrace 24+#ifdef backtrace
23 nstack = backtrace(stacklist,nstack); 25 for (ii = 0; ii < nstack; ii++) // output backtrace to text file
24 stackents = backtrace_symbols(stacklist,nstack); 26 {
25 for (ii = 0; ii < nstack; ii++)  27 pfunc = 0;
26 fprintf(fid," %s \n",stackents[ii]); 28@@ -109,6 +112,7 @@ void zappcrash(cchar *pMess, ... )
 29
 30 fprintf(fid1," %s %s \n",stackents[ii],pfunc); // write to text file
 31 }
27+#endif 32+#endif
28  33
29 fclose(fid); 34 fclose(fid1);
30  35
31@@ -739,6 +743,7 @@ 36@@ -768,6 +772,7 @@ int parsefile(cchar *ppath, char **pdirk
32  37
33 ***************************************************************************/ 38 ***************************************************************************/
34  39
35+#ifdef zmondirk 40+#ifdef zmondirk
36 int zmondirk(cchar *action, cchar *dirk, char **file) 41 int zmondirk(cchar *action, cchar *dirk, char **file)
37 { 42 {
38 struct inotify_event { 43 struct inotify_event {
39@@ -831,6 +836,7 @@ 44@@ -860,7 +865,7 @@ int zmondirk(cchar *action, cchar *dirk,
40 zappcrash("zmondirk() call error"); 45 zappcrash("zmondirk() call error");
41 return -1; 46 return -1;
42 } 47 }
 48-
43+#endif 49+#endif
44  50
45  
46 /************************************************************************** 51 /**************************************************************************
 52

cvs diff -r1.3 -r1.4 pkgsrc/graphics/fotoxx/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/patches/patch-ac 2010/10/02 12:14:44 1.3
+++ pkgsrc/graphics/fotoxx/patches/patch-ac 2011/05/11 01:27:03 1.4
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-ac,v 1.3 2010/10/02 12:14:44 bad Exp $ 1$NetBSD: patch-ac,v 1.4 2011/05/11 01:27:03 ryoon Exp $
2 2
3--- zfuncs.h.orig 2010-08-18 11:23:51.000000000 +0000 3--- zfuncs.h.orig 2011-05-01 18:44:26.000000000 +0000
4+++ zfuncs.h 2010-10-02 12:06:46.000000000 +0000 4+++ zfuncs.h
5@@ -22,6 +22,7 @@ 5@@ -22,6 +22,7 @@
6  6
7 // zfuncs.h version v.3.8 7 // zfuncs.h version v.4.2
8  8
9+#include <sys/param.h> 9+#include <sys/param.h>
10 #include <sys/time.h> 10 #include <sys/time.h>
11 #include <sys/stat.h> 11 #include <sys/stat.h>
12 #include <unistd.h> 12 #include <unistd.h>
13@@ -34,9 +35,10 @@ 13@@ -34,9 +35,10 @@
14 #include <pthread.h> 14 #include <pthread.h>
15 #include <errno.h> 15 #include <errno.h>
16 #include <signal.h> 16 #include <signal.h>
17-#include <execinfo.h> 17-#include <execinfo.h>
18+//#include <execinfo.h> 18+//#include <execinfo.h>
19+#include <sys/wait.h> 19+#include <sys/wait.h>
20 #include <locale.h> 20 #include <locale.h>

File Deleted: pkgsrc/graphics/fotoxx/patches/Attic/patch-ad

File Added: pkgsrc/graphics/fotoxx/patches/Attic/patch-fotoxx-11.05.1.cc
$NetBSD: patch-fotoxx-11.05.1.cc,v 1.1 2011/05/11 01:27:03 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)
 
 //  set up current file and directory from command line input or last session parameters        v.11.04
 
-   ppv = get_current_dir_name();                                           //  save current directory
+   ppv = getcwd((char *)0, 0);                                           //  save current directory
    if (ppv) {
       curr_dirk = strdupz(ppv,0,"curr_dirk");
       free(ppv);
@@ -493,6 +493,15 @@ int gtkinitfunc(void *data)
    else curr_dirk = 0;
    
    if (last_file) {                                                        //  from command line or parameters
+#ifdef __NetBSD__
+	ppv = zmalloc(MAXPATHLEN+1, "last_file");
+	if (ppv) {
+	  if (realpath(last_file, ppv)) {
+	    zfree(last_file);
+	    last_file = ppv;
+	  }
+	}
+#else
       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)
          zfree(last_file);
          last_file = 0;
       }
+#endif
    }
 
    if (curr_file) {
@@ -2007,7 +2017,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");