r341435: deletion of graphics/fotoxx

Rainer Hurling rhurlin at gwdg.de
Tue Jan 28 16:56:00 UTC 2014 

Am 28.01.2014 15:10, schrieb Baptiste Daroussin:
> On Tue, Jan 28, 2014 at 03:07:46PM +0100, Rainer Hurling wrote:
>> Am 28.01.2014 13:48 (UTC+1) schrieb Dag-Erling Smørgrav:
>>> Dag-Erling Smørgrav <des at des.no> writes:
>>>> Actually, the file *is* 2696168 bytes long.  With the following patch,
>>>> fetch(1) will still hang getting the last 1018 bytes, but the file will
>>>> be complete and the download will be successful.
>>>
>>> Completely fixed (no hang, no missing data) in head at 261230.
>>
>> Wow, many thanks for the fix!
>>
>> After rebuilding 11.0-CURRENT, I can confirm that fetch now is able to
>> load fotoxx-14.01.1.tar.gz as expected.
>>
>> Eventually some of the fetch failures listed in the ports PR database
>> also depended on this behaviour before the fix?
>>
>> Many thanks again. Now there is a real chance of an updated
>> graphics/fotoxx port :)
>>
> Can you update the patch for the PR to the 14.01.1 version while here maybe you
> want to add yourself as a maintainer :)

Hi Bapt,

I tried to create an update to version 14.01.1. What I did, was:

- update to version 14.01.1
- new mastersite; 2nd mastersites contents has to be updated
- unbreak the port
- modernize LIB_DEPENDS
- support STAGE_DIR
- strip bin/fotoxx
- correct usage of desktop-file-utils
- update URL in pkg-descr
- update pkg-plist

Known problems or TODOs:
- libexecinfo.so.1 is found in system and from port. No idea, which one
is the correct one to use (depending on OS version?).
- fotoxx now uses /proc for file operations. This was changed by the
author after version 11.03.

The updated port builds and installs fine for me (11.0-CURRENT).
Portlint complains about usage of ".if ${PORT_OPTIONS:MDOCS}" to wrap
installation of files into /usr/local/share/doc). Is this relevant and
what is necessary to consider it?

The diff is attached. I did not file a PR, because I think the usage of
/proc should be solved before. At runtime, the program is not fully
usable, because many functions try to get their info from /proc/...

I am not sure, if I am the right person to maintain the port. My skills
are very low (I am not a programmer, only an interested scientist ...)
and their are many things I do not fully understand.

Any help is really appreciated.

Greetings,
Rainer

> 
> regards,
> Bapt
> 

-------------- next part --------------
diff -u fotoxx.orig/Makefile fotoxx/Makefile
--- fotoxx.orig/Makefile	2014-01-27 19:51:13.000000000 +0100
+++ fotoxx/Makefile	2014-01-28 16:23:06.000000000 +0100
@@ -2,38 +2,33 @@
 # $FreeBSD: head/graphics/fotoxx/Makefile 341435 2014-01-27 17:35:26Z bapt $
 
 PORTNAME=	fotoxx
-PORTVERSION=	11.03
-PORTREVISION=	2
+PORTVERSION=	14.01.1
 CATEGORIES=	graphics
-MASTER_SITES=	http://kornelix.squarespace.com/downloads/ \
+MASTER_SITES=	http://www.kornelix.com/uploads/1/3/0/3/13035936/ \
 		http://www.rodperson.com/DL/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Application to organize and edit image collections
 
-BROKEN=		Does not fetch
-DEPRECATED=	Broken for more than 6 month
-EXPIRATION_DATE=	2014-02-27
-
-LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
 		ufraw-batch:${PORTSDIR}/graphics/ufraw \
-		exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool
+		exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \
+		dcraw:${PORTSDIR}/graphics/dcraw
 
-USE_GNOME=	gtk20
-USE_GMAKE=	yes
-MANCOMPRESSED=	yes
-MAN1=		fotoxx.1
+USES=		gmake desktop-file-utils
+USE_GNOME=	gtk30
 
 ALL_TARGET=	fotoxx
-INSTALL_TARGET=	install manpage
+INSTALL_TARGET=	install
 
 LDFLAGS+=	-O3 -g -Wall -rdynamic -lexecinfo
 
-NO_STAGE=	yes
 post-patch:
 		@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
-			${WRKSRC}/Makefile \
-			${WRKSRC}/dependencies.sh
+			${WRKSRC}/Makefile
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx
 
 .include <bsd.port.mk>
diff -u fotoxx.orig/distinfo fotoxx/distinfo
--- fotoxx.orig/distinfo	2014-01-22 18:20:45.000000000 +0100
+++ fotoxx/distinfo	2014-01-07 11:59:27.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (fotoxx-11.03.tar.gz) = c23e6b7c5517d1509b14a270bd2ad2af6fd2de613e55e79104f77d1748492577
-SIZE (fotoxx-11.03.tar.gz) = 1152890
+SHA256 (fotoxx-14.01.1.tar.gz) = 04746b8ccefca343a2b2f530624f7d98cd8ce17d3f20beaf5171b1dc18c94701
+SIZE (fotoxx-14.01.1.tar.gz) = 2696186
Common subdirectories: fotoxx.orig/files and fotoxx/files
diff -u fotoxx.orig/pkg-descr fotoxx/pkg-descr
--- fotoxx.orig/pkg-descr	2014-01-22 18:20:45.000000000 +0100
+++ fotoxx/pkg-descr	2014-01-07 16:42:35.000000000 +0100
@@ -2,4 +2,4 @@
 and collection management. The goal is to meet most user needs
 while remaining fast and easy to use.
 
-WWW:	http://kornelix.squarespace.com/fotoxx
+WWW: http://www.kornelix.com/fotoxx.html
diff -u fotoxx.orig/pkg-plist fotoxx/pkg-plist
--- fotoxx.orig/pkg-plist	2014-01-22 18:20:45.000000000 +0100
+++ fotoxx/pkg-plist	2014-01-28 17:25:33.000000000 +0100
@@ -1,97 +1,210 @@
 bin/fotoxx
-%%DATADIR%%/icons/arrow.png
-%%DATADIR%%/icons/busy.png
-%%DATADIR%%/icons/drag.png
-%%DATADIR%%/icons/draw.png
-%%DATADIR%%/icons/first-page.png
+share/applications/fotoxx.desktop
+%%PORTDOCS%%%%DOCSDIR%%/README-ca
+%%PORTDOCS%%%%DOCSDIR%%/README-en
+%%PORTDOCS%%%%DOCSDIR%%/README-es
+%%PORTDOCS%%%%DOCSDIR%%/changelog.gz
+%%PORTDOCS%%%%DOCSDIR%%/copyright
+%%PORTDOCS%%%%DOCSDIR%%/fotoxx-release
+%%PORTDOCS%%%%DOCSDIR%%/fotoxx.man
+%%PORTDOCS%%%%DOCSDIR%%/freecode
+%%PORTDOCS%%%%DOCSDIR%%/translations-ca
+%%PORTDOCS%%%%DOCSDIR%%/translations-en
+%%PORTDOCS%%%%DOCSDIR%%/translations-es
+%%DATADIR%%/data/KB-shortcuts-ca
+%%DATADIR%%/data/KB-shortcuts-en
+%%DATADIR%%/data/KB-shortcuts-es
+%%DATADIR%%/data/edit-menus-ca
+%%DATADIR%%/data/edit-menus-en
+%%DATADIR%%/data/edit-menus-es
+%%DATADIR%%/data/favorites/menu-config
+%%DATADIR%%/data/favorites/menu-config-pixbuf-009.png
+%%DATADIR%%/data/images/F-toolbar.jpg
+%%DATADIR%%/data/images/G-toolbar.jpg
+%%DATADIR%%/data/images/HDF-paint.jpg
+%%DATADIR%%/data/images/HDR-adjust.jpg
+%%DATADIR%%/data/images/KB-shortcuts.jpg
+%%DATADIR%%/data/images/add-geotags.jpg
+%%DATADIR%%/data/images/add-text.jpg
+%%DATADIR%%/data/images/add-text2.jpg
+%%DATADIR%%/data/images/anti-alias.jpg
+%%DATADIR%%/data/images/auto-trim.jpg
+%%DATADIR%%/data/images/batch-add-geotags.jpg
+%%DATADIR%%/data/images/batch-convert.jpg
+%%DATADIR%%/data/images/batch-raw-conv.jpg
+%%DATADIR%%/data/images/batch-rename.jpg
+%%DATADIR%%/data/images/brightness-distribution.jpg
+%%DATADIR%%/data/images/brightness-ramp.jpg
+%%DATADIR%%/data/images/chromatic.jpg
+%%DATADIR%%/data/images/cmyk.jpg
+%%DATADIR%%/data/images/collections.jpg
+%%DATADIR%%/data/images/colorchart.png
+%%DATADIR%%/data/images/denoise.jpg
+%%DATADIR%%/data/images/dots.jpg
+%%DATADIR%%/data/images/drawing.jpg
+%%DATADIR%%/data/images/edit-metadata.jpg
+%%DATADIR%%/data/images/edit-translation.jpg
+%%DATADIR%%/data/images/favorites.jpg
+%%DATADIR%%/data/images/file-save.jpg
+%%DATADIR%%/data/images/flatbook.jpg
+%%DATADIR%%/data/images/fotoxx.jpg
+%%DATADIR%%/data/images/gallery-select.jpg
+%%DATADIR%%/data/images/gammachart.jpg
+%%DATADIR%%/data/images/geotag-groups.jpg
+%%DATADIR%%/data/images/grad_blur.jpg
+%%DATADIR%%/data/images/grid-lines.jpg
+%%DATADIR%%/data/images/jpeg quality.jpg
+%%DATADIR%%/data/images/keystone.jpg
+%%DATADIR%%/data/images/leverage-edits.jpg
+%%DATADIR%%/data/images/mashup.jpg
+%%DATADIR%%/data/images/mashup2.jpg
+%%DATADIR%%/data/images/match-colors.jpg
+%%DATADIR%%/data/images/move-collections.jpg
+%%DATADIR%%/data/images/paint-clone.jpg
+%%DATADIR%%/data/images/paint-edits.jpg
+%%DATADIR%%/data/images/pano-color.jpg
+%%DATADIR%%/data/images/pano-pre-align.jpg
+%%DATADIR%%/data/images/plugins.jpg
+%%DATADIR%%/data/images/print.jpg
+%%DATADIR%%/data/images/remove-dust.jpg
+%%DATADIR%%/data/images/rename.jpg
+%%DATADIR%%/data/images/resize.jpg
+%%DATADIR%%/data/images/retouch-combo.jpg
+%%DATADIR%%/data/images/retouch-combo2.jpg
+%%DATADIR%%/data/images/revise-RGB.jpg
+%%DATADIR%%/data/images/search-images-metadata.jpg
+%%DATADIR%%/data/images/search-images.jpg
+%%DATADIR%%/data/images/select-area.jpg
+%%DATADIR%%/data/images/sharpen.jpg
+%%DATADIR%%/data/images/sharpen4.jpg
+%%DATADIR%%/data/images/shift-colors.jpg
+%%DATADIR%%/data/images/show-RGB.jpg
+%%DATADIR%%/data/images/sketch.jpg
+%%DATADIR%%/data/images/slide-show.jpg
+%%DATADIR%%/data/images/smart-erase.jpg
+%%DATADIR%%/data/images/stack-noise.jpg
+%%DATADIR%%/data/images/stack-paint.jpg
+%%DATADIR%%/data/images/stuck-pixels.jpg
+%%DATADIR%%/data/images/synchronize.jpg
+%%DATADIR%%/data/images/tabsF&G.png
+%%DATADIR%%/data/images/texture.jpg
+%%DATADIR%%/data/images/tone-mapping.jpg
+%%DATADIR%%/data/images/trim-rotate.jpg
+%%DATADIR%%/data/images/unbend.jpg
+%%DATADIR%%/data/images/user-settings.jpg
+%%DATADIR%%/data/images/vignette.jpg
+%%DATADIR%%/data/images/warps.jpg
+%%DATADIR%%/data/quickstart-ca.html
+%%DATADIR%%/data/quickstart-de.html
+%%DATADIR%%/data/quickstart-en.html
+%%DATADIR%%/data/quickstart-es.html
+%%DATADIR%%/data/quickstart-fr.html
+%%DATADIR%%/data/quickstart-it.html
+%%DATADIR%%/data/quickstart-pt.html
+%%DATADIR%%/data/slideshow-tone.oga
+%%DATADIR%%/data/tags_defined
+%%DATADIR%%/data/userguide-en.html
+%%DATADIR%%/data/userguide-es.html
+%%DATADIR%%/data/userguide-it.html
+%%DATADIR%%/icons/F-tab.png
+%%DATADIR%%/icons/G-tab.png
+%%DATADIR%%/icons/W-tab.png
+%%DATADIR%%/icons/bottom.png
+%%DATADIR%%/icons/broken.png
+%%DATADIR%%/icons/cancel.png
+%%DATADIR%%/icons/down+.png
+%%DATADIR%%/icons/down.png
+%%DATADIR%%/icons/edit-funcs/CMYK.png
+%%DATADIR%%/icons/edit-funcs/HDF.png
+%%DATADIR%%/icons/edit-funcs/HDR.png
+%%DATADIR%%/icons/edit-funcs/RGB.png
+%%DATADIR%%/icons/edit-funcs/blur.png
+%%DATADIR%%/icons/edit-funcs/bright distrib.png
+%%DATADIR%%/icons/edit-funcs/brigth color sat.png
+%%DATADIR%%/icons/edit-funcs/brigth ramp.png
+%%DATADIR%%/icons/edit-funcs/color depth.png
+%%DATADIR%%/icons/edit-funcs/crop rotate.png
+%%DATADIR%%/icons/edit-funcs/dots.png
+%%DATADIR%%/icons/edit-funcs/drawing01.png
+%%DATADIR%%/icons/edit-funcs/embossing.png
+%%DATADIR%%/icons/edit-funcs/expand bright.png
+%%DATADIR%%/icons/edit-funcs/fix fringes.png
+%%DATADIR%%/icons/edit-funcs/fix stuck pixels.png
+%%DATADIR%%/icons/edit-funcs/flatten bright.png
+%%DATADIR%%/icons/edit-funcs/flip.png
+%%DATADIR%%/icons/edit-funcs/gamma.png
+%%DATADIR%%/icons/edit-funcs/invert.png
+%%DATADIR%%/icons/edit-funcs/keystone.png
+%%DATADIR%%/icons/edit-funcs/landscape.png
+%%DATADIR%%/icons/edit-funcs/leverage edit.png
+%%DATADIR%%/icons/edit-funcs/outlines.png
+%%DATADIR%%/icons/edit-funcs/paint edits.png
+%%DATADIR%%/icons/edit-funcs/paint pixels.png
+%%DATADIR%%/icons/edit-funcs/painting.png
+%%DATADIR%%/icons/edit-funcs/panorama.png
+%%DATADIR%%/icons/edit-funcs/pencil.png
+%%DATADIR%%/icons/edit-funcs/red eyes.png
+%%DATADIR%%/icons/edit-funcs/reduce noise.png
+%%DATADIR%%/icons/edit-funcs/remove dust.png
+%%DATADIR%%/icons/edit-funcs/resize.png
+%%DATADIR%%/icons/edit-funcs/sharpen.png
+%%DATADIR%%/icons/edit-funcs/shiftcolors.png
+%%DATADIR%%/icons/edit-funcs/smarterase.png
+%%DATADIR%%/icons/edit-funcs/stacknoise.png
+%%DATADIR%%/icons/edit-funcs/stackpaint.png
+%%DATADIR%%/icons/edit-funcs/text.png
+%%DATADIR%%/icons/edit-funcs/tiles.png
+%%DATADIR%%/icons/edit-funcs/tonemapping.png
+%%DATADIR%%/icons/edit-funcs/unbend.png
+%%DATADIR%%/icons/edit-funcs/vert panorama.png
+%%DATADIR%%/icons/edit-funcs/voodoo.png
+%%DATADIR%%/icons/edit-funcs/warp affine.png
+%%DATADIR%%/icons/edit-funcs/warp area.png
+%%DATADIR%%/icons/edit-funcs/warp curved.png
+%%DATADIR%%/icons/edit-funcs/warp linear.png
+%%DATADIR%%/icons/edit-funcs/whitebalance.png
+%%DATADIR%%/icons/favorites.png
+%%DATADIR%%/icons/fg-color.png
 %%DATADIR%%/icons/folder.png
-%%DATADIR%%/icons/folder256.png
 %%DATADIR%%/icons/fotoxx.png
-%%DATADIR%%/icons/gallery.png
+%%DATADIR%%/icons/goto.png
 %%DATADIR%%/icons/help.png
-%%DATADIR%%/icons/last-page.png
-%%DATADIR%%/icons/next-page.png
-%%DATADIR%%/icons/next-row.png
 %%DATADIR%%/icons/next.png
 %%DATADIR%%/icons/open.png
-%%DATADIR%%/icons/prev-page.png
-%%DATADIR%%/icons/prev-row.png
 %%DATADIR%%/icons/prev.png
-%%DATADIR%%/icons/print.png
 %%DATADIR%%/icons/quit.png
 %%DATADIR%%/icons/redo.png
+%%DATADIR%%/icons/rotate-left.png
+%%DATADIR%%/icons/rotate-right.png
 %%DATADIR%%/icons/save.png
-%%DATADIR%%/icons/saveas.png
+%%DATADIR%%/icons/sort.png
+%%DATADIR%%/icons/sync.G.png
+%%DATADIR%%/icons/top.png
 %%DATADIR%%/icons/trash.png
 %%DATADIR%%/icons/undo.png
+%%DATADIR%%/icons/up+.png
+%%DATADIR%%/icons/up.png
+%%DATADIR%%/icons/warning.png
 %%DATADIR%%/icons/zoom+.png
 %%DATADIR%%/icons/zoom-.png
-%%DOCSDIR%%/userguide-en.html
-%%DOCSDIR%%/freshmeat
-%%DOCSDIR%%/fotoxx.man
-%%DOCSDIR%%/TRANSLATIONS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/images/HDF-paint.jpg
-%%DOCSDIR%%/images/HDR-adjust.jpg
-%%DOCSDIR%%/images/annotate.jpg
-%%DOCSDIR%%/images/brightness-color.jpg
-%%DOCSDIR%%/images/brightness-ramp.png
-%%DOCSDIR%%/images/edit-tags.jpg
-%%DOCSDIR%%/images/expand-brightness.png
-%%DOCSDIR%%/images/gallery image selection.jpg
-%%DOCSDIR%%/images/manage-tags.jpg
-%%DOCSDIR%%/images/navigation.jpeg
-%%DOCSDIR%%/images/pano-dialog.jpeg
-%%DOCSDIR%%/images/rename.jpeg
-%%DOCSDIR%%/images/save-as.jpeg
-%%DOCSDIR%%/images/search-images.jpg
-%%DOCSDIR%%/images/select-area.png
-%%DOCSDIR%%/images/select-whole-image.jpg
-%%DOCSDIR%%/images/select_edit.jpg
-%%DOCSDIR%%/images/sharpen.jpeg
-%%DOCSDIR%%/images/smart-erase.png
-%%DOCSDIR%%/images/stack.png
-%%DOCSDIR%%/images/tone-mapping.png
-%%DOCSDIR%%/images/trim.jpg
-%%DOCSDIR%%/images/watermark.jpg
-%%DATADIR%%/locales/de/fotoxx.po
-%%DATADIR%%/locales/de/zfuncs.po
-%%DATADIR%%/locales/en/fotoxx.po
-%%DATADIR%%/locales/en/zfuncs.po
-%%DATADIR%%/locales/es/fotoxx.po
-%%DATADIR%%/locales/es/zfuncs.po
-%%DATADIR%%/locales/fr/fotoxx.po
-%%DATADIR%%/locales/fr/fotoxx.po.old
-%%DATADIR%%/locales/fr/zfuncs.po
-%%DATADIR%%/locales/gl/fotoxx.po
-%%DATADIR%%/locales/gl/zfuncs.po
-%%DATADIR%%/locales/it/fotoxx.po
-%%DATADIR%%/locales/it/zfuncs.po
-%%DATADIR%%/locales/nl/fotoxx.po
-%%DATADIR%%/locales/nl/zfuncs.po
-%%DATADIR%%/locales/pt/fotoxx.po
-%%DATADIR%%/locales/pt/zfuncs.po
-%%DATADIR%%/locales/ru/fotoxx.po
-%%DATADIR%%/locales/ru/zfuncs.po
-%%DATADIR%%/locales/sv/fotoxx.po
-%%DATADIR%%/locales/sv/zfuncs.po
-%%DATADIR%%/locales/zh_CN/fotoxx.po
-%%DATADIR%%/locales/zh_CN/zfuncs.po
- at dirrm %%DOCSDIR%%/images
- at dirrm %%DOCSDIR%%
- at dirrm %%DATADIR%%/locales/de
- at dirrm %%DATADIR%%/locales/en
- at dirrm %%DATADIR%%/locales/es
- at dirrm %%DATADIR%%/locales/fr
- at dirrm %%DATADIR%%/locales/gl
- at dirrm %%DATADIR%%/locales/it
- at dirrm %%DATADIR%%/locales/nl
- at dirrm %%DATADIR%%/locales/pt
- at dirrm %%DATADIR%%/locales/ru
- at dirrm %%DATADIR%%/locales/sv
- at dirrm %%DATADIR%%/locales/zh_CN
- at dirrm %%DATADIR%%/locales
- at dirrm %%DATADIR%%/icons
- at dirrm %%DATADIR%%
+%%DATADIR%%/locales/translate-ca.po
+%%DATADIR%%/locales/translate-de.po
+%%DATADIR%%/locales/translate-en.po
+%%DATADIR%%/locales/translate-es.po
+%%DATADIR%%/locales/translate-fr.po
+%%DATADIR%%/locales/translate-it.po
+%%DATADIR%%/locales/translate-nl.po
+%%DATADIR%%/locales/translate-pt.po
+%%DATADIR%%/locales/translate-ru.po
+%%DATADIR%%/locales/translate-sv.po
+share/man/man1/fotoxx.1.gz
+ at dirrmtry share/man/man1
+ at dirrmtry share/man
+ at dirrmtry %%DATADIR%%/locales
+ at dirrmtry %%DATADIR%%/icons/edit-funcs
+ at dirrmtry %%DATADIR%%/icons
+ at dirrmtry %%DATADIR%%/data/images
+ at dirrmtry %%DATADIR%%/data/favorites
+ at dirrmtry %%DATADIR%%/data
+ at dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%

More information about the freebsd-ports mailing list