Fri Aug 24 12:48:11 2012 UTC ()
Fix build on older NetBSD current.

* Improve libexecinfo detection


(ryoon)
diff -r1.23 -r1.24 pkgsrc/graphics/fotoxx/Makefile
diff -r1.8 -r1.9 pkgsrc/graphics/fotoxx/patches/patch-ab
cvs diff -r1.23 -r1.24 pkgsrc/graphics/fotoxx/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/Makefile 2012/08/12 07:20:15 1.23
+++ pkgsrc/graphics/fotoxx/Makefile 2012/08/24 12:48:11 1.24
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.23 2012/08/12 07:20:15 ryoon Exp $ 1# $NetBSD: Makefile,v 1.24 2012/08/24 12:48:11 ryoon Exp $
2# 2#
3 3
4DISTNAME= fotoxx-12.08 4DISTNAME= fotoxx-12.08
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= http://www.kornelix.com/uploads/1/3/0/3/13035936/ 6MASTER_SITES= http://www.kornelix.com/uploads/1/3/0/3/13035936/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.kornelix.com/fotoxx.html 9HOMEPAGE= http://www.kornelix.com/fotoxx.html
10COMMENT= Program for editing image files from a digital camera 10COMMENT= Program for editing image files from a digital camera
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 15DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
16DEPENDS+= p5-Image-ExifTool-[0-9]*:../../graphics/p5-Image-ExifTool 16DEPENDS+= p5-Image-ExifTool-[0-9]*:../../graphics/p5-Image-ExifTool
17DEPENDS+= gimp-ufraw-[0-9]*:../../graphics/gimp-ufraw 17DEPENDS+= gimp-ufraw-[0-9]*:../../graphics/gimp-ufraw
18 18
19USE_LANGUAGES= c++ 19USE_LANGUAGES= c++
20USE_TOOLS+= pkg-config 20USE_TOOLS+= pkg-config
21TOOLS_NOOP+= xdg-desktop-menu 21TOOLS_NOOP+= xdg-desktop-menu
22 22
23BUILD_TARGET= fotoxx 23BUILD_TARGET= fotoxx
24INSTALL_TARGET= install 24INSTALL_TARGET= install
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28.if (${OPSYS} == "NetBSD" && \ 28.if exists(/usr/include/execinfo.h)
29 (!empty(OS_VERSION:M6.99.*) || !empty(OS_VERSION:M[7-9].*))) 29CXXFLAGS+= -DHAVE_LIBEXECINFO
30LDFLAGS+= -lexecinfo 30LDFLAGS+= -lexecinfo
31.endif 31.endif
32 32
33.include "../../graphics/tiff/buildlink3.mk" 33.include "../../graphics/tiff/buildlink3.mk"
34.include "../../x11/gtk3/buildlink3.mk" 34.include "../../x11/gtk3/buildlink3.mk"
35.include "../../sysutils/desktop-file-utils/desktopdb.mk" 35.include "../../sysutils/desktop-file-utils/desktopdb.mk"
36.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/graphics/fotoxx/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/patches/patch-ab 2012/08/12 07:20:15 1.8
+++ pkgsrc/graphics/fotoxx/patches/patch-ab 2012/08/24 12:48:11 1.9
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: patch-ab,v 1.8 2012/08/12 07:20:15 ryoon Exp $ 1$NetBSD: patch-ab,v 1.9 2012/08/24 12:48:11 ryoon Exp $
2 2
3--- zfuncs.cc.orig 2012-08-04 11:58:30.000000000 +0000 3--- zfuncs.cc.orig 2012-08-04 11:58:30.000000000 +0000
4+++ zfuncs.cc 4+++ zfuncs.cc
5@@ -81,6 +81,7 @@ void zappcrash(cchar *pMess, ... ) 5@@ -81,6 +81,7 @@ void zappcrash(cchar *pMess, ... )
6  6
7 printf("*** zappcrash: \n %s \n",message); // output message to stdout 7 printf("*** zappcrash: \n %s \n",message); // output message to stdout
8  8
9+#if defined (__linux__) || (defined (__NetBSD__) && (__NetBSD_Version__ >= 699000000)) 9+#if defined (HAVE_LINEXECINFO)
10 nstack = backtrace(stacklist,nstack); // get traceback data 10 nstack = backtrace(stacklist,nstack); // get traceback data
11 stackents = backtrace_symbols(stacklist,nstack); 11 stackents = backtrace_symbols(stacklist,nstack);
12  12
13@@ -90,6 +91,7 @@ void zappcrash(cchar *pMess, ... ) 13@@ -90,6 +91,7 @@ void zappcrash(cchar *pMess, ... )
14 fid1 = fopen("zappcrash","w"); // text file for backtrace 14 fid1 = fopen("zappcrash","w"); // text file for backtrace
15  15
16 fprintf(fid1,"zappcrash: \n %s \n",message); // output message to text file 16 fprintf(fid1,"zappcrash: \n %s \n",message); // output message to text file
17+#endif 17+#endif
18  18
19 cc = readlink("/proc/self/exe",progexe,300); // get own program path 19 cc = readlink("/proc/self/exe",progexe,300); // get own program path
20 if (cc <= 0) { 20 if (cc <= 0) {
21@@ -98,6 +100,7 @@ void zappcrash(cchar *pMess, ... ) 21@@ -98,6 +100,7 @@ void zappcrash(cchar *pMess, ... )
22 } 22 }
23 progexe[cc] = 0; 23 progexe[cc] = 0;
24  24
25+#if defined (__linux__) || (defined (__NetBSD__) && (__NetBSD_Version__ >= 699000000)) 25+#if defined (HAVE_LINEXECINFO)
26 for (ii = 0; ii < nstack; ii++) // output backtrace to text file 26 for (ii = 0; ii < nstack; ii++) // output backtrace to text file
27 { 27 {
28 pfunc = 0; 28 pfunc = 0;
29@@ -117,6 +120,7 @@ void zappcrash(cchar *pMess, ... ) 29@@ -117,6 +120,7 @@ void zappcrash(cchar *pMess, ... )
30  30
31 fprintf(fid1," %s %s \n",stackents[ii],pfunc); // write to text file 31 fprintf(fid1," %s %s \n",stackents[ii],pfunc); // write to text file
32 } 32 }
33+#endif 33+#endif
34  34
35 fclose(fid1); 35 fclose(fid1);
36  36