import fotox-32, a simple image manipulation program, mostly for the

common tasks of improving digicam images, with some support for
generation of HDR images and panoramas

5 files changed, 153 insertions, 0 deletions

diff --git a/graphics/fotox/DESCR b/graphics/fotox/DESCR
new file mode 100644
index 00000000000..4d35db95d18
--- /dev/null
+++ b/graphics/fotox/DESCR
@@ -0,0 +1 @@
+Simple image manipulation program
diff --git a/graphics/fotox/Makefile b/graphics/fotox/Makefile
new file mode 100644
index 00000000000..6111f9936e6
--- /dev/null
+++ b/graphics/fotox/Makefile
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1.1.1 2007/12/17 19:45:08 drochner Exp $
+#
+
+DISTNAME=	fotox.32
+PKGNAME=	fotox-32
+CATEGORIES=	graphics
+MASTER_SITES=	http://kornelix.squarespace.com/storage/fotox/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://kornelix.squarespace.com/fotox/
+COMMENT=	Simple image manipulation program
+
+WRKSRC=		${WRKDIR}
+USE_LANGUAGES=	c++
+USE_TOOLS+=	pkg-config
+
+FDATA=		${PREFIX}/share/fotox
+
+SUBST_CLASSES+=		data
+SUBST_STAGE.data=	pre-build
+SUBST_FILES.data=	zlib.cpp
+SUBST_VARS.data=	FDATA
+
+do-build:
+	(cd ${WRKSRC} && ${SH} fotox-build.sh)
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/fotox.x ${PREFIX}/bin/fotox
+	${INSTALL_DATA_DIR} ${FDATA}
+	${INSTALL_DATA} ${WRKSRC}/parameters.txt ${FDATA}
+	${CP} -r ${WRKSRC}/icons ${FDATA}
+	${INSTALL_DATA} ${WRKSRC}/fotox-guide.pdf ${FDATA}
+
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/fotox/PLIST b/graphics/fotox/PLIST
new file mode 100644
index 00000000000..1b879822c87
--- /dev/null
+++ b/graphics/fotox/PLIST
@@ -0,0 +1,38 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/17 19:45:08 drochner Exp $
+bin/fotox
+share/fotox/fotox-guide.pdf
+share/fotox/icons/HDR.png
+share/fotox/icons/blank.png
+share/fotox/icons/crop.png
+share/fotox/icons/exif.png
+share/fotox/icons/exif2.png
+share/fotox/icons/fotox.png
+share/fotox/icons/fotox2.png
+share/fotox/icons/goto-end.png
+share/fotox/icons/goto-top.png
+share/fotox/icons/help.png
+share/fotox/icons/index.png
+share/fotox/icons/kill.png
+share/fotox/icons/next-page.png
+share/fotox/icons/next-row.png
+share/fotox/icons/next.png
+share/fotox/icons/open.png
+share/fotox/icons/pano.png
+share/fotox/icons/parms.png
+share/fotox/icons/prev-page.png
+share/fotox/icons/prev-row.png
+share/fotox/icons/prev.png
+share/fotox/icons/quit.png
+share/fotox/icons/redeye.png
+share/fotox/icons/redeye1.png
+share/fotox/icons/redo.png
+share/fotox/icons/resize.png
+share/fotox/icons/rotate.png
+share/fotox/icons/save.png
+share/fotox/icons/trash.png
+share/fotox/icons/tune.png
+share/fotox/icons/unbend.png
+share/fotox/icons/undo.png
+share/fotox/parameters.txt
+@dirrm share/fotox/icons
+@dirrm share/fotox
diff --git a/graphics/fotox/distinfo b/graphics/fotox/distinfo
new file mode 100644
index 00000000000..449961b2494
--- /dev/null
+++ b/graphics/fotox/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1.1.1 2007/12/17 19:45:08 drochner Exp $
+
+SHA1 (fotox.32.tar.gz) = 606333582f72ee4a405fbe8ea31639228a82eed5
+RMD160 (fotox.32.tar.gz) = d030ad1d89b4e8c564bbec7659cd5fe19c172770
+Size (fotox.32.tar.gz) = 1600578 bytes
+SHA1 (patch-aa) = f7305ae008e25e2fa51178e8a95472fc6bf035bc
diff --git a/graphics/fotox/patches/patch-aa b/graphics/fotox/patches/patch-aa
new file mode 100644
index 00000000000..55a6859f7c9
--- /dev/null
+++ b/graphics/fotox/patches/patch-aa
@@ -0,0 +1,73 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/12/17 19:45:08 drochner Exp $
+
+--- zlib.cpp.orig	2007-11-10 17:58:47.000000000 +0100
++++ zlib.cpp
+@@ -15,10 +15,10 @@
+ 
+ char * syserrText(int err)
+ {
+-   static char    *ptext, buff[200];
++   static char    buff[200];
+    if (err == 0) err = errno;
+-   ptext = strerror_r(err,buff,200);
+-   return ptext;
++   strerror_r(err,buff,200);
++   return buff;
+ }
+ 
+ 
+@@ -2115,7 +2115,10 @@ void zlockInit()                        
+ {
+    int      ii;
+    tid_main = pthread_self();
+-   for (ii = 0; ii < tmax; ii++) tids[ii] = tlocks[ii] = 0;
++   for (ii = 0; ii < tmax; ii++) {
++	   tids[ii] = (pthread_t)0;
++	   tlocks[ii] = 0;
++   }
+    mutex_init(&zmutex,null);
+    zinit++;
+    return;
+@@ -2482,7 +2485,10 @@ void wfilesave(GtkWidget *mLog)
+    file = zgetfile("save screen to file","screen-save.txt","save");
+    if (! file) return;
+    err = wfiledump(mLog,file);
+-   if (err) zmessageACK(strerror_r(errno,file,200));
++   if (err) {
++	   strerror_r(errno,file,200);
++	   zmessageACK(file);
++   }
+    zfree(file);
+    return;
+ }
+@@ -2646,24 +2652,15 @@ char     zexedirk[1000], zappdirk[200], 
+ void initz_appfiles(const char *appfile, ...)  //  null terminator         v.07
+ {
+    char           command[1200], *pp;
+-   int            fcc, err;
++   int            err;
+    struct stat    statdat;
+    va_list        arglist;
+ 
+-   fcc = readlink("/proc/self/exe",zexedirk,999);                          //  get /dirk-path/appname.x
+-   if (fcc < 3 || fcc > 997) zappcrash("/proc/self/exe absurd");
+-   zexedirk[fcc] = 0;
+-   pp = strrchr(zexedirk,'/');
+-   if (! pp) zappcrash("/proc/self/exe absurd");
+-   *pp = 0;
+-
+-   strncpy0(zappname,pp+1,39);                                             //  appname
+-   pp = strrchr(zappname,'.');
+-   if (pp) *pp = 0;
+-   
+-   pp = cuserid(0);                                                        //  get /home/user/.appname/
+-   if (strEqu(pp,"root")) snprintf(zappdirk,199,"/root/.%s",zappname);
+-   else snprintf(zappdirk,199,"/home/%s/.%s",pp,zappname);
++   strncpy0(zexedirk, "@FDATA@", 999);
++   strncpy0(zappname,"fotox",39);                                             //  appname
++   
++   pp = getenv("HOME");                                                        //  get /home/user/.appname/
++   snprintf(zappdirk,199,"%s/.%s",pp,zappname);
+    
+    err = stat(zappdirk,&statdat);                                          //  does it exist already?
+    if (err) {