Page MenuHomeFreeBSD
Files F171292410

D4620.id11556.diff
No OneTemporary
Actions

D4620.id11556.diff
View Options

Index: head/graphics/fotoxx/Makefile
===================================================================
--- head/graphics/fotoxx/Makefile
+++ head/graphics/fotoxx/Makefile
@@ -2,10 +2,11 @@
# $FreeBSD$
PORTNAME= fotoxx
-PORTVERSION= 14.02.2
+PORTVERSION= 15.05
CATEGORIES= graphics
-MASTER_SITES= http://www.kornelix.com/uploads/1/3/0/3/13035936/ \
- LOCAL/mandree
+MASTER_SITES= GENTOO/distfiles \
+ http://fossies.org/linux/misc/legacy/ \
+ http://www.kornelix.com/uploads/1/3/0/3/13035936/
MAINTAINER= ports@FreeBSD.org
COMMENT= Application to organize and edit image collections
@@ -13,49 +14,35 @@
LICENSE= GPLv3
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \
- ufraw-batch:${PORTSDIR}/graphics/ufraw \
+ dcraw:${PORTSDIR}/graphics/dcraw \
exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \
- dcraw:${PORTSDIR}/graphics/dcraw
+ ufraw-batch:${PORTSDIR}/graphics/ufraw
-USES= execinfo gmake desktop-file-utils pkgconfig
-USE_GNOME= gtk30
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USES= desktop-file-utils execinfo gmake pkgconfig
+USE_GNOME= gtk30
ALL_TARGET= fotoxx
-INSTALL_TARGET= install MANDIR=${PREFIX}/man/man1/
-LDFLAGS+= -O3 -g -Wall -rdynamic -lexecinfo
+PORTDOCS= *
+PORTDATA= *
+PLIST_FILES= bin/fotoxx \
+ man/man1/fotoxx.1.gz \
+ share/appdata/fotoxx.appdata.xml \
+ share/applications/fotoxx.desktop
OPTIONS_DEFINE= DOCS
post-patch:
- @# drop xdg-desktop-menu calls, they fail
- ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
- -e '/xdg-desktop-menu/d' \
- -e '/rm -f -R/d' \
- ${WRKSRC}/Makefile
- @# replace obsolete include files
- ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
- ${WRKSRC}/zfuncs.h
- @# fix up icon path in XDG .desktop file
- ${REINPLACE_CMD} -e 's}/usr/share/fotoxx}${DATADIR}}' \
- ${WRKSRC}/desktop
+ @${REINPLACE_CMD} -e \
+ 's|-ggdb|| ; \
+ s|-rdynamic|-Wl,-export-dynamic| ; \
+ s|share/man|man| ; \
+ s|-lpthread|-lexecinfo|' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e \
+ 's|/usr/share/fotoxx|${DATADIR}|' ${WRKSRC}/desktop
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx
-
-.include <bsd.port.pre.mk>
-
-# These hacks are required because the nginx server at the primary
-# master site and most of our fetch(1) versions do not get along well.
-# This code can be removed once r261263 has been merged from
-# base/head into all ports-supported releases.
-# We depend on cURL unless wget is in $LOCALPATH:
-DISABLE_SIZE= yes
-.if exists(${LOCALBASE}/bin/wget) && !exists(${PREFIX}/bin/curl)
-FETCH_CMD= ${LOCALBASE}/bin/wget -c -nc
-.else
-FETCH_DEPENDS= curl:${PORTSDIR}/ftp/curl
-FETCH_CMD= ${PREFIX}/bin/curl -OL0C -
-.endif
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/graphics/fotoxx/distinfo
===================================================================
--- head/graphics/fotoxx/distinfo
+++ head/graphics/fotoxx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fotoxx-14.02.2.tar.gz) = 60b6d9e8a5f19bc92b53d585cb36795d951c7a6d2d0bd1bd30ae3ca0465ed767
-SIZE (fotoxx-14.02.2.tar.gz) = 2715089
+SHA256 (fotoxx-15.05.tar.gz) = 65567adc86087a3a8acdebcb0f15ec299cf690a869129825e3d32da7e50c4604
+SIZE (fotoxx-15.05.tar.gz) = 3573278
Index: head/graphics/fotoxx/files/patch-f.file.cc
===================================================================
--- head/graphics/fotoxx/files/patch-f.file.cc
+++ head/graphics/fotoxx/files/patch-f.file.cc
@@ -1,10 +1,10 @@
---- ./f.file.cc.orig 2014-02-05 20:42:34.000000000 +0100
-+++ ./f.file.cc 2014-02-06 10:32:37.000000000 +0100
-@@ -23,6 +23,7 @@
+--- f.file.cc.orig 2015-05-01 09:40:38 UTC
++++ f.file.cc
+@@ -74,6 +74,7 @@
#define EX extern // disable extern declarations
- #include "fotoxx.h"
+ #include "fotoxx.h" // (variables in fotoxx.h are refs)
+#include <sys/wait.h>
- /**************************************************************************
- Fotoxx image edit - file menu functions
+ /**************************************************************************/
+
Index: head/graphics/fotoxx/files/patch-f.repair.cc
===================================================================
--- head/graphics/fotoxx/files/patch-f.repair.cc
+++ head/graphics/fotoxx/files/patch-f.repair.cc
@@ -1,11 +1,11 @@
---- f.repair.cc.orig 2014-08-15 14:19:11.000000000 -0400
-+++ f.repair.cc 2014-08-15 14:20:01.000000000 -0400
-@@ -1571,7 +1571,7 @@
+--- f.repair.cc.orig 2015-05-01 09:40:38 UTC
++++ f.repair.cc
+@@ -2055,7 +2055,7 @@ void m_smart_erase(GtkWidget *, const ch
int smart_erase_dialog_event(zdialog *zd, const char *event) // overhauled
{
void smart_erase_func(int mode);
- void smart_erase_blur(float radius);
+ int smart_erase_blur(float radius);
-
+
float radius;
int cc;
Index: head/graphics/fotoxx/files/patch-zfuncs.h
===================================================================
--- head/graphics/fotoxx/files/patch-zfuncs.h
+++ head/graphics/fotoxx/files/patch-zfuncs.h
@@ -1,15 +1,19 @@
---- ./zfuncs.h.orig 2014-02-05 20:42:34.000000000 +0100
-+++ ./zfuncs.h 2014-02-06 10:32:37.000000000 +0100
-@@ -22,7 +22,7 @@
+--- zfuncs.h.orig 2015-05-01 09:40:38 UTC
++++ zfuncs.h
+@@ -22,17 +22,18 @@
- // zfuncs.h version v.5.8
+ // zfuncs.h version v.6.1
--#include <sys/sysinfo.h>
-+//#include <sys/sysinfo.h>
+-#include <sys/sysinfo.h>
++//#include <sys/sysinfo.h>
#include <sys/time.h>
#include <sys/stat.h>
#include <sys/resource.h>
-@@ -33,6 +33,7 @@
+ #include <sys/file.h>
+ #include <sys/utsname.h>
+-#include <malloc.h>
++//#include <malloc.h>
+ #include <errno.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
@@ -17,21 +21,3 @@
#include <string.h>
#include <ctype.h>
#include <math.h>
-@@ -60,7 +61,7 @@
-
- #define wstrerror(err) strerror(WEXITSTATUS(err)) // get text status for child process
-
--#define mutex pthread_mutex_t // abbreviations
-+#define mutex_tp pthread_mutex_t // abbreviations
- #define mutex_init pthread_mutex_init
- #define mutex_lock pthread_mutex_lock
- #define mutex_trylock pthread_mutex_trylock
-@@ -625,7 +626,7 @@
- {
- char wmi[8];
- Vxstring * vd; // vector of xstrings
-- mutex qmutex; // for multi-thread access
-+ mutex_tp qmutex; // for multi-thread access
- int qcap; // queue capacity
- int qcount; // curr. queue count
- int ent1; // first entry pointer
Index: head/graphics/fotoxx/files/patch-zfuncs.cc
===================================================================
--- head/graphics/fotoxx/files/patch-zfuncs.cc
+++ head/graphics/fotoxx/files/patch-zfuncs.cc
@@ -1,20 +1,18 @@
---- ./zfuncs.cc.orig 2014-02-05 20:42:34.000000000 +0100
-+++ ./zfuncs.cc 2014-02-06 10:32:37.000000000 +0100
-@@ -854,7 +854,7 @@
- // A mutex lock is used to insure one thread at a time has access to the parameter.
- // Many parameters can be used but there is only one mutex lock.
+--- zfuncs.cc.orig 2015-05-01 09:40:38 UTC
++++ zfuncs.cc
+@@ -262,6 +262,7 @@ char *zstrdup(cchar *string, int addcc)
--mutex zget_lock = PTHREAD_MUTEX_INITIALIZER;
-+mutex_tp zget_lock = PTHREAD_MUTEX_INITIALIZER;
-
- int zget_locked(int &param) // lock and return parameter
+ void zmalloc_report()
{
-@@ -1276,7 +1276,7 @@
- namespace shell_asynch_names {
- char *command[10];
- int status[10];
-- mutex mlock = PTHREAD_MUTEX_INITIALIZER;
-+ mutex_tp mlock = PTHREAD_MUTEX_INITIALIZER;
- }
++#ifdef __linux__
+ using namespace zfuncs;
+
+ static double ptime = 0;
+@@ -282,6 +283,7 @@ void zmalloc_report()
- int shell_asynch(cchar *Fcommand, ...) // v.5.5
+ ptime = jobtime(); // reset some counters
+ Nmalloc = Nstrdup = Nfree = 0;
++#endif
+
+ return;
+ }

File Metadata

Mime Type
text/plain
Expires
Fri, Sep 11, 4:52 AM (10 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38678032
Default Alt Text
D4620.id11556.diff (8 KB)

Event Timeline