# svn status M Makefile M distinfo M files/patch-Makefile D files/patch-dependencies.sh A files/patch-f.file.cc A files/patch-f.meta.cc A files/patch-f.xform.cc D files/patch-fotoxx-11.03.cc A files/patch-fotoxx-13.03.1.cc M files/patch-zfuncs.cc D files/patch-zfuncs.h Index: Makefile =================================================================== --- Makefile (revision 327808) +++ Makefile (working copy) @@ -2,29 +2,27 @@ # $FreeBSD$ PORTNAME= fotoxx -PORTVERSION= 11.03 -PORTREVISION= 2 +PORTVERSION= 13.03.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 COMMENT= Application to organize and edit image collections -BROKEN= Does not fetch - 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 @@ -31,7 +29,6 @@ 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 .include Index: distinfo =================================================================== --- distinfo (revision 327808) +++ distinfo (working copy) @@ -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 Index: files/patch-Makefile =================================================================== --- files/patch-Makefile (revision 327808) +++ files/patch-Makefile (working copy) @@ -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 @@ +--- 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 + + # target install directories 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 +@@ -84,7 +84,6 @@ + rm -f fotoxx.1.gz + # menu (desktop) file + cp -f desktop $(DESTDIR)$(MENUFILE) +- xdg-desktop-menu install $(DESTDIR)$(MENUFILE) - $(PROGRAM): $(PROGRAM).o zfuncs.o - $(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o -- @ ./dependencies.sh - - $(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 - - menu: - cp -f desktop $(DESTDIR)$(DESKTOP) + uninstall: + rm -f $(DESTDIR)$(BINDIR)/fotoxx Index: files/patch-dependencies.sh (deleted) =================================================================== Index: files/patch-f.file.cc =================================================================== --- files/patch-f.file.cc (revision 0) +++ files/patch-f.file.cc (working copy) @@ -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 + + /************************************************************************** + Fotoxx image edit - file menu functions Index: files/patch-f.meta.cc =================================================================== --- files/patch-f.meta.cc (revision 0) +++ files/patch-f.meta.cc (working copy) @@ -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 + + /************************************************************************** + Fotoxx image editor - image metadata functions, EXIF/IPTC etc. Index: files/patch-f.xform.cc =================================================================== --- files/patch-f.xform.cc (revision 0) +++ files/patch-f.xform.cc (working copy) @@ -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 + + /************************************************************************** + +@@ -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" Index: files/patch-fotoxx-11.03.cc (deleted) =================================================================== Index: files/patch-fotoxx-13.03.1.cc =================================================================== --- files/patch-fotoxx-13.03.1.cc (revision 0) +++ files/patch-fotoxx-13.03.1.cc (working copy) @@ -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; Index: files/patch-zfuncs.cc =================================================================== --- files/patch-zfuncs.cc (revision 327808) +++ files/patch-zfuncs.cc (working copy) @@ -1,137 +1,11 @@ ---- zfuncs.cc.orig 2011-02-28 16:04:24.000000000 +0000 -+++ zfuncs.cc 2013-03-30 09:00:04.000000000 +0000 -@@ -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 -+ #include -+ #include -+ #include -+ #include -+ -+ #define WEXITSTATUS(w)((w)>>8) // fixes the WEXITSTATUS not declared on FreeBSD -+#endif - +- ++#include /************************************************************************** - system-level utility functions -@@ -281,7 +290,7 @@ - // safely access parameters from multiple threads - // limitation: one lock for any number of parameters --mutex zget_lock = PTHREAD_MUTEX_INITIALIZER; -+mutex_tp zget_lock = PTHREAD_MUTEX_INITIALIZER; - - int zget_locked(int ¶m) // lock and return parameter - { -@@ -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 - -@@ -3435,7 +3441,7 @@ - pthread_t tids[tmax]; - int tlocks[tmax]; - int zinit = 0; --mutex zmutex; -+mutex_tp zmutex; - - void zlockInit() // initz. call from main() - { + Table of Contents Index: files/patch-zfuncs.h (deleted) ===================================================================