Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Apr 2013 10:00:01 GMT
From:      Rod Person <rodperson@rodperson.com>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/177643: Update port graphics/fotoxx to latest version
Message-ID:  <201304051000.r35A01xt023791@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/177643; it has been noted by GNATS.

From: Rod Person <rodperson@rodperson.com>
To: bug-followup@FreeBSD.org, rodperson@rodperson.com
Cc:  
Subject: Re: ports/177643: Update port graphics/fotoxx to latest version
Date: Fri, 05 Apr 2013 05:57:50 -0400

 This is a multi-part message in MIME format.
 --------------060402060808030904040805
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 I just noticed that on of the patch files was incorrect, which lead to
 the enormous size of the diff.  I corrected that and this is the correct
 patch file for the port.
 
 If this is not the way to resubmit this please let me know.
 
 Sorry for the inconvenience.
 
 -- 
 Rod Person
 http://www.rodperson.com
   
 "When Columbus discovered America, where were we?"
   -Ignacio Ek, Maya, 1970
 
 
 --------------060402060808030904040805
 Content-Type: text/plain; charset=us-ascii;
  name="patch-fotoxx.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch-fotoxx.txt"
 
 diff -crbBNu ./fotoxx/Makefile ./fotoxx13/Makefile
 --- ./fotoxx/Makefile	2012-12-03 23:13:10.000000000 -0500
 +++ ./fotoxx13/Makefile	2013-03-28 16:38:48.000000000 -0400
 @@ -2,14 +2,14 @@
  # Date created:		2011-03-28
  # Whom:			Rod Person <rodperson@rodperson.com>
  #
 -# $FreeBSD: branches/RELENG_9_1_0/graphics/fotoxx/Makefile 300896 2012-07-14 13:54:48Z beat $
 +# $FreeBSD: ports/graphics/fotoxx/Makefile,v 1.4 2012/11/17 05:58:05 svnexp Exp $
  #
  
  PORTNAME=	fotoxx
 -PORTVERSION=	11.03
 +PORTVERSION=	13.03.1
  PORTREVISION=	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=	rodperson@rodperson.com
 @@ -18,21 +18,21 @@
  LIB_DEPENDS=	execinfo.1:${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_GNOME=	gtk30
  USE_GMAKE=	yes
  MANCOMPRESSED=	yes
 -MAN1=		fotoxx.1
 +MAN1=		fotoxx.1.gz
  
  ALL_TARGET=	fotoxx
 -INSTALL_TARGET=	install manpage
 +INSTALL_TARGET=	install
  
  LDFLAGS+=	-O3 -g -Wall -rdynamic -lexecinfo
  
  post-patch:
  		@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 -			${WRKSRC}/Makefile \
 -			${WRKSRC}/dependencies.sh
 +			${WRKSRC}/Makefile
  
  .include <bsd.port.mk>
 diff -crbBNu ./fotoxx/distinfo ./fotoxx13/distinfo
 --- ./fotoxx/distinfo	2012-12-03 23:13:10.000000000 -0500
 +++ ./fotoxx13/distinfo	2013-03-28 16:15:19.000000000 -0400
 @@ -1,2 +1,2 @@
 -SHA256 (fotoxx-11.03.tar.gz) = c23e6b7c5517d1509b14a270bd2ad2af6fd2de613e55e79104f77d1748492577
 -SIZE (fotoxx-11.03.tar.gz) = 1152890
 +SHA256 (fotoxx-13.03.1.tar.gz) = d0c2fbfd96ca550c685728d657303a4e662cb4fbeb514487891ee5e0599d22c9
 +SIZE (fotoxx-13.03.1.tar.gz) = 2276110
 diff -crbBNu ./fotoxx/files/patch-Makefile ./fotoxx13/files/patch-Makefile
 --- ./fotoxx/files/patch-Makefile	2012-12-03 23:13:10.000000000 -0500
 +++ ./fotoxx13/files/patch-Makefile	2013-04-03 18:56:10.000000000 -0400
 @@ -1,26 +1,19 @@
 ---- Makefile.orig	2011-02-28 17:04:24.000000000 +0100
 -+++ Makefile	2011-05-25 17:26:15.000000000 +0200
 -@@ -15,13 +15,12 @@
 - BINDIR = $(PREFIX)/bin
 - DATADIR = $(PREFIX)/share/$(PROGRAM)
 - DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
 --MANDIR = $(PREFIX)/share/man/man1
 -+MANDIR = $(PREFIX)/man/man1
 - ICONDIR = $(DATADIR)/icons
 - DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop
 - 
 - $(PROGRAM): $(PROGRAM).o zfuncs.o
 - 	$(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o
 --	@ ./dependencies.sh
 +--- Makefile.orig	2013-03-09 08:48:01.000000000 -0500
 ++++ Makefile	2013-04-02 17:38:34.000000000 -0400
 +@@ -5,7 +5,7 @@
 + # defaults for parameters that may be pre-defined
 + CXXFLAGS ?= -O3 -g -Wall 
 + LDFLAGS ?= -O3 -g -Wall -rdynamic
 +-PREFIX ?= /usr
 ++PREFIX ?= /usr/local
   
 - $(PROGRAM).o: $(SOURCE)
 - 	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)   \
 -@@ -42,8 +41,6 @@
 - 	cp -f icons/* $(DESTDIR)$(ICONDIR)
 - 	cp -f -R locales/* $(DESTDIR)$(DATADIR)/locales
 - 	cp -f $(PROGRAM) $(DESTDIR)$(BINDIR)
 --	@ echo use make menu to install desktop menu
 --	@ echo use make manpage to install man page
 + # target install directories
 + BINDIR = $(PREFIX)/bin
 +@@ -84,7 +84,6 @@
 + 	rm -f fotoxx.1.gz
 + 	# menu (desktop) file
 + 	cp -f desktop $(DESTDIR)$(MENUFILE)
 +-	xdg-desktop-menu install $(DESTDIR)$(MENUFILE)
   
 - menu:
 - 	cp -f desktop $(DESTDIR)$(DESKTOP)
 + uninstall:
 + 	rm -f  $(DESTDIR)$(BINDIR)/fotoxx
 diff -crbBNu ./fotoxx/files/patch-dependencies.sh ./fotoxx13/files/patch-dependencies.sh
 --- ./fotoxx/files/patch-dependencies.sh	2012-12-03 23:13:10.000000000 -0500
 +++ ./fotoxx13/files/patch-dependencies.sh	1969-12-31 19:00:00.000000000 -0500
 @@ -1,37 +0,0 @@
 ---- dependencies.sh.orig	2011-02-28 11:04:24.000000000 -0500
 -+++ dependencies.sh	2011-03-28 08:52:03.000000000 -0400
 -@@ -1,4 +1,4 @@
 --#! /bin/bash
 -+#!/bin/sh
 - #
 - #  Check if dependencies are installed before build.
 - #
 -@@ -7,15 +7,15 @@
 - #  but they are required at run time to handle EXIF data 
 - #  and RAW files from digital cameras.
 - 
 --dlist=" g++  /usr/include/gtk-2.0/gtk/gtk.h  
 --        /usr/include/tiffio.h  /usr/lib*/libtiff.so
 --        xdg-open  xdg-desktop-menu  exiftool"
 -+dlist=" /usr/local/include/gtk-2.0/gtk/gtk.h
 -+        /usr/local/include/tiffio.h  /usr/local/lib/libtiff.so
 -+        /usr/local/bin/xdg-open  /usr/local/bin/xdg-desktop-menu  /usr/local/bin/exiftool"
 - 
 - error=0
 - 
 - for dname in $dlist
 - do
 --   if [ ${dname:0:1} = "/" ] 
 -+   if [ ${dname#/*} = ${dname} ] 
 -       then find $dname >/dev/null 2>&1
 -       else which $dname >/dev/null
 -    fi
 -@@ -40,7 +40,7 @@
 - 
 - for dname in $dlist
 - do
 --   if [ ${dname:0:1} = "/" ] 
 -+   if [ ${dname#/*} = ${dname} ] 
 -       then find $dname >/dev/null 2>&1
 -       else which $dname >/dev/null
 -    fi
 diff -crbBNu ./fotoxx/files/patch-f.file.cc ./fotoxx13/files/patch-f.file.cc
 --- ./fotoxx/files/patch-f.file.cc	1969-12-31 19:00:00.000000000 -0500
 +++ ./fotoxx13/files/patch-f.file.cc	2013-03-28 16:15:21.000000000 -0400
 @@ -0,0 +1,10 @@
 +--- f.file.cc.orig	2013-03-09 08:48:01.000000000 -0500
 ++++ f.file.cc	2013-03-27 08:25:44.000000000 -0400
 +@@ -23,6 +23,7 @@
 + 
 + #define EX extern                                                          //  disable extern declarations
 + #include "fotoxx.h"
 ++#include <sys/wait.h>
 + 
 + /**************************************************************************
 +       Fotoxx image edit - file menu functions
 diff -crbBNu ./fotoxx/files/patch-f.meta.cc ./fotoxx13/files/patch-f.meta.cc
 --- ./fotoxx/files/patch-f.meta.cc	1969-12-31 19:00:00.000000000 -0500
 +++ ./fotoxx13/files/patch-f.meta.cc	2013-03-28 16:15:21.000000000 -0400
 @@ -0,0 +1,11 @@
 +--- f.meta.cc.orig	2013-03-09 08:48:01.000000000 -0500
 ++++ f.meta.cc	2013-03-27 08:26:01.000000000 -0400
 +@@ -23,7 +23,7 @@
 + 
 + #define EX extern                                                          //  enable extern declarations
 + #include "fotoxx.h"
 +-
 ++#include <sys/wait.h>
 + 
 + /**************************************************************************
 +    Fotoxx image editor - image metadata functions, EXIF/IPTC etc.
 diff -crbBNu ./fotoxx/files/patch-f.xform.cc ./fotoxx13/files/patch-f.xform.cc
 --- ./fotoxx/files/patch-f.xform.cc	1969-12-31 19:00:00.000000000 -0500
 +++ ./fotoxx13/files/patch-f.xform.cc	2013-03-28 16:15:21.000000000 -0400
 @@ -0,0 +1,25 @@
 +--- f.xform.cc.orig	2013-03-09 08:48:01.000000000 -0500
 ++++ f.xform.cc	2013-03-27 14:07:51.000000000 -0400
 +@@ -23,7 +23,7 @@
 + 
 + #define EX extern                                                          //  enable extern declarations
 + #include "fotoxx.h"
 +-
 ++#include <gtk/gtk.h>
 + 
 + /**************************************************************************
 + 
 +@@ -1469,10 +1469,10 @@
 + 
 +    if (strEqu(event,"fontbutt")) {                                         //  select new font
 +       snprintf(font,100,"%s %d",writetext_font,writetext_size);
 +-      font_dialog = gtk_font_chooser_dialog_new(ZTX("select font"),MWIN);
 +-      gtk_font_chooser_set_font(GTK_FONT_CHOOSER(font_dialog),font);
 ++      font_dialog = gtk_font_selection_dialog_new(ZTX("select font"));
 ++      gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(font_dialog),font);
 +       gtk_dialog_run(GTK_DIALOG(font_dialog));
 +-      pp = gtk_font_chooser_get_font(GTK_FONT_CHOOSER(font_dialog));
 ++      pp = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(font_dialog));
 +       gtk_widget_destroy(font_dialog);
 + 
 +       if (pp) {                                                            //  should have "fontname nn"
 diff -crbBNu ./fotoxx/files/patch-fotoxx-11.03.cc ./fotoxx13/files/patch-fotoxx-11.03.cc
 --- ./fotoxx/files/patch-fotoxx-11.03.cc	2012-12-03 23:13:10.000000000 -0500
 +++ ./fotoxx13/files/patch-fotoxx-11.03.cc	1969-12-31 19:00:00.000000000 -0500
 @@ -1,43 +0,0 @@
 ---- fotoxx-11.03.cc.orig	2011-02-28 17:04:24.000000000 +0100
 -+++ fotoxx-11.03.cc	2011-05-26 10:36:11.000000000 +0200
 -@@ -24,6 +24,13 @@
 - #include <tiffio.h>
 - #include "zfuncs.h"
 - 
 -+#ifdef __FreeBSD__
 -+      #include <unistd.h> /* for getcwd */
 -+      #include <sys/types.h> /* for getpwuid */
 -+      #include <pwd.h> /* for getpwuid */
 -+      #define WEXITSTATUS(w)((w)>>8)                                       // fixes WEXITSTATUS not declared on FreeBSD
 -+#endif
 -+
 - #define fversion "Fotoxx v.11.03    2011.03.01"                            //  version and date
 - #define fversioncc 16                                                      //  cc to use for window title bar
 - #define flicense "Free software - GNU General Public License v.3"
 -@@ -986,7 +993,7 @@
 -    }
 -    
 -    if (! curr_file) {                                                      //  set curr. directory anyway   v.11.01
 --      ppv = get_current_dir_name();
 -+      ppv = getwd(null);
 -       curr_dirk = strdupz(ppv,0,"curr_dirk");
 -       free(ppv);
 -       err = chdir(curr_dirk);
 -@@ -2428,7 +2435,7 @@
 -    if (curr_file)
 -       image_gallery(curr_file,"paint1",0,m_gallery2,mWin);                 //  overlay main window    v.10.9
 -    else {
 --      char *pp = get_current_dir_name();
 -+      char *pp = getwd(null);
 -       if (pp) {
 -          image_gallery(pp,"paint1",0,m_gallery2,mWin);                     //  use current directory   v.10.9
 -          free(pp);
 -@@ -5169,7 +5176,7 @@
 -    }
 - 
 -    *tempdir = 0;                                                           //  temp directory: /tmp/<user>/fotoxx/email
 --   strncatv(tempdir,99,"/tmp/",cuserid(null),"/fotoxx/email",null);
 -+   strncatv(tempdir,99,"/tmp/",getpwuid(null),"/fotoxx/email",null);
 - 
 -    sprintf(command,"mkdir -p %s",tempdir);                                 //  (re)create directory
 -    err = system(command);
 diff -crbBNu ./fotoxx/files/patch-fotoxx-13.03.1.cc ./fotoxx13/files/patch-fotoxx-13.03.1.cc
 --- ./fotoxx/files/patch-fotoxx-13.03.1.cc	1969-12-31 19:00:00.000000000 -0500
 +++ ./fotoxx13/files/patch-fotoxx-13.03.1.cc	2013-04-05 05:49:21.000000000 -0400
 @@ -0,0 +1,97 @@
 +--- fotoxx-13.03.1.cc.orig	2013-03-09 08:48:01.000000000 -0500
 ++++ fotoxx-13.03.1.cc	2013-04-02 17:41:47.000000000 -0400
 +@@ -289,7 +289,6 @@
 +    char           KBshortsU[200], KBshortsI[200];
 +    char           badnews[200];
 +    char           *pp1, *pp2;
 +-   double         freememory, cachememory;                                 //  available memory at startup
 +    float          exifver = 0;
 +    FILE           *fid;
 +    struct stat    statb;
 +@@ -353,13 +352,6 @@
 +       }
 +    }
 + 
 +-   parseprocfile("/proc/meminfo","MemFree:",&freememory,null);             //  get amount of free memory       v.12.04
 +-   parseprocfile("/proc/meminfo","Cached:",&cachememory,null);
 +-   freememory = (freememory + cachememory) / 1024;                         //  megabytes
 +-   printf("free memory: %.0f MB \n",freememory);
 +-   printf("max. view image: %.0f megapixels \n",(freememory-100)/6);       //  F + preview, 3 bytes/pixel each
 +-   printf("max. edit image: %.0f megapixels \n",(freememory-100)/54);      //  + E0/E1/E3/ER, 12 bytes/pixel each
 +-
 +    Nwt = sysconf(_SC_NPROCESSORS_ONLN);                                    //  get SMP CPU count
 +    if (Nwt <= 0) Nwt = 1;
 +    if (Nwt > max_threads) Nwt = max_threads;                               //  compile time limit
 +@@ -3881,32 +3873,6 @@
 +    else return -1;
 + }
 + 
 +-
 +-/**************************************************************************/
 +-
 +-//  popup a warning message if real memory is below specified threshold
 +-//  returns margin: real memory - threshold, in megabytes 
 +-//  (+ if enough memory, - if not)
 +-//  the popup message only appears if real memory < threshold
 +-//  the popup message goes away after a few seconds
 +-
 +-int warn_memory(int req_mb)                                                //  v.12.11
 +-{
 +-   double   freemem, cachemem;
 +-   int      act_mb, gap_mb;
 +-   cchar    *message = ZTX("warning: real memory %d MB < required %d MB \n"
 +-                           "response time may become very long \n");
 +-
 +-   parseprocfile("/proc/meminfo","MemFree:",&freemem,null);                //  get current free memory
 +-   parseprocfile("/proc/meminfo","Cached:",&cachemem,null);
 +-   act_mb = (freemem + cachemem) / 1024;                                   //  megabytes
 +-   gap_mb = act_mb - req_mb;
 +-   if (gap_mb > -10) return gap_mb;
 +-   zpopup_message(message,act_mb,req_mb);                                  //  deficit > 10 MB
 +-   return gap_mb;                                      
 +-}
 +-
 +-
 + /**************************************************************************
 +       PXM pixmap functions - RGB float pixel map
 + ***************************************************************************/
 +@@ -3925,9 +3891,6 @@
 +       return 0;
 +    }
 + 
 +-   int req_mb = ww * hh * 12 / mega;                                       //  warn if memory low              v.12.11
 +-   warn_memory(req_mb);
 +-
 +    PXM *pxm = (PXM *) zmalloc(sizeof(PXM),"PXM");                          //  0.45 sec for 116 megapix image (1.4 GB)
 +    pxm->ww = ww;
 +    pxm->hh = hh;
 +@@ -4344,9 +4307,6 @@
 + 
 + PXB * PXB_make(int ww, int hh)                                             //  v.12.10
 + {
 +-   int req_mb = ww * hh * 3 / mega;                                        //  warn if memory low              v.12.11
 +-   warn_memory(req_mb);
 +-
 +    PXB *pxb = (PXB *) zmalloc(sizeof(PXB),"PXB");
 +    strcpy(pxb->wmi,"pxbpix");
 +    pxb->pixbuf = gdk_pixbuf_new(GDKRGB,0,8,ww,hh);
 +@@ -4395,9 +4355,6 @@
 + 
 + PXB * PXB_copy(PXB *pxb1)                                                  //  v.12.10
 + {
 +-   int req_mb = pxb1->ww * pxb1->hh * 3 / mega;                            //  warn if memory low              v.12.11
 +-   warn_memory(req_mb);
 +-
 +    PXB *pxb2 = (PXB *) zmalloc(sizeof(PXB),"PXB");
 +    strcpy(pxb2->wmi,"pxbpix");
 +    pxb2->pixbuf = gdk_pixbuf_copy(pxb1->pixbuf);
 +@@ -4413,9 +4370,6 @@
 + 
 + PXB * PXB_rescale(PXB *pxb1, int ww2, int hh2)                             //  v.12.10
 + {
 +-   int req_mb = ww2 * hh2 * 3 / mega;                                      //  warn if memory low              v.12.11
 +-   warn_memory(req_mb);
 +-
 +    GdkPixbuf *pixbuf2 = gdk_pixbuf_scale_simple(pxb1->pixbuf,ww2,hh2,BILINEAR);
 +    PXB *pxb2 = PXB_make(pixbuf2);
 +    return pxb2;
 diff -crbBNu ./fotoxx/files/patch-zfuncs.cc ./fotoxx13/files/patch-zfuncs.cc
 --- ./fotoxx/files/patch-zfuncs.cc	2012-12-03 23:13:10.000000000 -0500
 +++ ./fotoxx13/files/patch-zfuncs.cc	2013-03-28 16:15:21.000000000 -0400
 @@ -1,119 +1,11 @@
 ---- zfuncs.cc.orig	2011-02-28 17:04:24.000000000 +0100
 -+++ zfuncs.cc	2011-05-26 10:04:13.000000000 +0200
 -@@ -24,6 +24,15 @@
 +--- zfuncs.cc.orig	2013-03-09 08:48:01.000000000 -0500
 ++++ zfuncs.cc	2013-03-27 13:20:38.000000000 -0400
 +@@ -27,7 +27,7 @@
 + //     zfuncs.cpp   version  v.5.6
   
   #include "zfuncs.h"
 - 
 -+#ifdef __FreeBSD__
 -+   #include <sys/event.h>
 -+   #include <sys/types.h>
 -+   #include <sys/times.h>
 -+   #include <pwd.h>
 -+   #include <execinfo.h>
 -+
 -+   #define WEXITSTATUS(w)((w)>>8)  // fixes the WEXITSTATUS not declared on FreeBSD
 -+#endif
 - 
 - /**************************************************************************
 -    system-level utility functions
 -@@ -778,23 +787,27 @@
 -       char        fname[200];       //  null-terminated file name within directory
 -    };
 -    
 -+   int f, kq, nev;
 -+   struct kevent change;
 -+   struct kevent event;
 -+   
 -    inotify_event     evbuff;
 -    struct timeval    waitime;
 -    fd_set            fids;
 -    int               wd, retval, cc, fcc;
 --   int               evbcc = sizeof(evbuff);
 -+   int               evbcc = sizeof(event);
 -    static int        fid = -1;
 -    
 -    if (strEqu(action,"open"))                                              //  setup a monitored directory
 -    {
 --      fid = inotify_init();
 --      if (fid < 0) {
 -+      f = kqueue();
 -+      if (f < 0) {
 -          return -1;
 -       }
 --      wd = inotify_add_watch(fid,dirk,IN_ALL_EVENTS);
 -+      wd = kevent(f, &change, 1, &event, 1, NULL);
 -       if (wd < 0) {
 --         close(fid);
 --         fid = -1;
 -+         close(f);
 -+         f = -1;
 -          return -1;
 -       }
 -       return 0;
 -@@ -802,7 +815,7 @@
 -    
 -    if (strEqu(action,"event"))                                             //  return pending event or zero
 -    {
 --      if (fid < 0) return -1;
 -+      if (f < 0) return -1;
 - 
 -       if (file) {
 -          if (*file) zfree(*file);                                          //  free prior memory
 -@@ -816,12 +829,12 @@
 -          waitime.tv_sec = 0;
 -          waitime.tv_usec = 1;
 - 
 --         retval = select(fid+1, &fids, null, null, &waitime);
 -+         retval = select(f+1, &fids, null, null, &waitime);
 -          if (retval == 0) return 0;                                        //  nothing pending
 - 
 -          if (retval == -1) {                                               //  error
 -             close(fid);
 --            fid = -1;
 -+            f = -1;
 -             return -1;
 -          }
 - 
 -@@ -832,28 +845,21 @@
 -             return -1;
 -          }
 - 
 --         fcc = evbuff.len;
 --         if (fcc > 199) return -1;
 --         if (fcc > 0 && file) 
 --            *file = strdupz(evbuff.fname,0,"zmondirk_file");               //  return filename     v.3.5
  -
 --         if (evbuff.mask & (IN_CREATE | IN_MOVED_TO))                      //  file was added
 -+         if (event.fflags & (NOTE_WRITE | NOTE_RENAME))                    //  file was added
 -             return 1;
 --         if (evbuff.mask & (IN_CLOSE_WRITE | IN_CLOSE_NOWRITE | IN_MODIFY))   //  file was possibly added
 -+         if (event.fflags & (NOTE_EXIT | NOTE_REVOKE | NOTE_ATTRIB))       //  file was possibly added
 -             return 1;
 --         if (evbuff.mask & (IN_DELETE | IN_MOVED_FROM))                    //  file was deleted
 -+         if (event.fflags & (NOTE_DELETE))                                 //  file was deleted
 -             return 2;
 --         if (evbuff.mask & (IN_DELETE_SELF | IN_MOVE_SELF))                //  monitored directory gone
 --            return 3;
 -          return 9;                                                         //  other
 -       }
 -    }
 -    
 -    if (strEqu(action,"close"))                                             //  stop monitoring
 -    {
 --      if (fid > -1) retval = close(fid);
 -+      if (f > -1) retval = close(f);
 -       else retval = -1;
 --      fid = -1;
 -+      f = -1;
 -       return retval;
 -    }
 -    
 -@@ -2983,7 +2989,7 @@
 -    strcpy(zicondir,zdatadir);
 -    strcat(zicondir,"/icons");
 - 
 --   pp = cuserid(0);
 -+   pp = getlogin();
 -    if (strEqu(pp,"root")) snprintf(zuserdir,199,"/root/.%s",zappname);     //  get /root/.appname
 -    else snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname);           //  or /home/user/.appname
 ++#include <sys/wait.h>
 + /**************************************************************************
   
 +    Table of Contents
 diff -crbBNu ./fotoxx/files/patch-zfuncs.h ./fotoxx13/files/patch-zfuncs.h
 --- ./fotoxx/files/patch-zfuncs.h	2012-12-03 23:13:10.000000000 -0500
 +++ ./fotoxx13/files/patch-zfuncs.h	1969-12-31 19:00:00.000000000 -0500
 @@ -1,17 +0,0 @@
 ---- zfuncs.h.orig	2011-02-28 17:04:24.000000000 +0100
 -+++ zfuncs.h	2011-05-25 17:50:21.000000000 +0200
 -@@ -36,7 +36,13 @@
 - #include <signal.h>
 - #include <execinfo.h>
 - #include <locale.h>
 --#include <sys/inotify.h>
 -+
 -+#ifdef __linux__
 -+   #include <sys/inotify.h>
 -+#elif defined(__FreeBSD__)
 -+   #include <sys/event.h>
 -+   #include <sys/types.h>
 -+#endif
 - 
 - #define  int8   char                                                       //  number types
 - #define  int16  short
 diff -crbBNu ./fotoxx/pkg-plist ./fotoxx13/pkg-plist
 --- ./fotoxx/pkg-plist	2012-12-03 23:13:10.000000000 -0500
 +++ ./fotoxx13/pkg-plist	2013-03-28 16:15:19.000000000 -0400
 @@ -1,4 +1,4 @@
 -@comment $FreeBSD: branches/RELENG_9_1_0/graphics/fotoxx/pkg-plist 300896 2012-07-14 13:54:48Z beat $
 +@comment $FreeBSD: ports/graphics/fotoxx/pkg-plist,v 1.2 2012/11/17 05:58:05 svnexp Exp $
  bin/fotoxx
  %%DATADIR%%/icons/arrow.png
  %%DATADIR%%/icons/busy.png
 
 --------------060402060808030904040805--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304051000.r35A01xt023791>