Fix backtrace linking on NetBSD. Fix inline use.

5 files changed, 49 insertions, 2 deletions

diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index b38b25ab4f2..12737ddbc73 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2013/06/06 12:55:08 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2013/06/26 21:17:44 joerg Exp $
 
 DISTNAME=	AfterStep-2.2.11
 PKGNAME=	${DISTNAME:S/AfterStep/afterstep/}
@@ -22,6 +22,14 @@ REPLACE_BASH+=		tools/importasmenu
 
 INSTALLATION_DIRS+=	share/gnome/wm-properties
 
+.include "../../mk/bsd.prefs.mk"
+
+# for backtrace
+.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
+LIBS+=	-lexecinfo
+MAKE_ENV+=	EXTRA_LIBRARIES=-lexecinfo
+.endif
+
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/giflib.buildlink3.mk"
diff --git a/wm/afterstep/distinfo b/wm/afterstep/distinfo
index fe2d0544f56..26a92649bc9 100644
--- a/wm/afterstep/distinfo
+++ b/wm/afterstep/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2013/04/09 09:44:01 cheusov Exp $
+$NetBSD: distinfo,v 1.18 2013/06/26 21:17:44 joerg Exp $
 
 SHA1 (AfterStep-2.2.11.tar.bz2) = ecfd815b659046281530441af0bc4fc42900d0da
 RMD160 (AfterStep-2.2.11.tar.bz2) = a82a4b3fddcbcd97862212669c11d14629e51a4d
@@ -9,6 +9,8 @@ SHA1 (patch-configure) = 081192b46d025d9da4c5bc1bbb1e65717a8ed655
 SHA1 (patch-libAfterBase_ashash.c) = 36a1e19a017186aac7829071fa551eb6fe187609
 SHA1 (patch-libAfterBase_asvector.c) = d892e192304a23f32d2c088932f3777b36a026d4
 SHA1 (patch-libAfterBase_asvector.h) = d96a967b81d47c3c4a3c1f82e4e8e42fc2e15d7b
+SHA1 (patch-libAfterBase_parse.c) = 8d4b65a5d22ffe90c62c6169cebba204d99c73ac
+SHA1 (patch-libAfterBase_parse.h) = 18dfeb9444a7760df18a41069557b01b8b723c3b
 SHA1 (patch-libAfterImage_asfont.c) = f7ed285b39ba13126531b3e755e20895b1c3857b
 SHA1 (patch-libAfterImage_export.c) = 0b450561673cb3351c2f8685ba7357cc6a1de366
 SHA1 (patch-libAfterImage_import.c) = 46034b8fac4dd59c46d7491f522512a5de462def
@@ -17,5 +19,6 @@ SHA1 (patch-libAfterStep_functions.h) = 501e1a95419a8933b918f7d8df28df38e810f69a
 SHA1 (patch-libAfterStep_mylook.c) = 56dea9a5acb65dee3faa5adf350c8901bbd495e2
 SHA1 (patch-libAfterStep_mylook.h) = 8fede622d4737510880b88c3cf4b94f13e4892f1
 SHA1 (patch-src_ASDocGen_Makefile.in) = 36185b1db36dfda33ef1503d55855e9bbf1ea286
+SHA1 (patch-src_Animate_Makefile.in) = 5a0db32f7e6acc70cd8778b9d6c2d8d8b379acc9
 SHA1 (patch-src_afterstep_asinternals.h) = c19f912d19635dba8c8e07e9ccf7b7463728c9ef
 SHA1 (patch-src_afterstep_misc.c) = 5aad3beb297d64896f286a1eebc5f0d931993c3f
diff --git a/wm/afterstep/patches/patch-libAfterBase_parse.c b/wm/afterstep/patches/patch-libAfterBase_parse.c
new file mode 100644
index 00000000000..2bfed336340
--- /dev/null
+++ b/wm/afterstep/patches/patch-libAfterBase_parse.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-libAfterBase_parse.c,v 1.1 2013/06/26 21:17:45 joerg Exp $
+
+--- libAfterBase/parse.c.orig	2013-06-26 19:46:08.000000000 +0000
++++ libAfterBase/parse.c
+@@ -1027,7 +1027,7 @@ parse_geometry (register char *tline,
+ 
+ static char _as_hex_to_char_table[] = "0123456789ABCDEF";
+ 
+-inline int
++int
+ unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val)
+ {
+ 	int i = buffer_size-1 ; 
diff --git a/wm/afterstep/patches/patch-libAfterBase_parse.h b/wm/afterstep/patches/patch-libAfterBase_parse.h
new file mode 100644
index 00000000000..785e2389153
--- /dev/null
+++ b/wm/afterstep/patches/patch-libAfterBase_parse.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-libAfterBase_parse.h,v 1.1 2013/06/26 21:17:45 joerg Exp $
+
+--- libAfterBase/parse.h.orig	2013-06-26 19:42:15.000000000 +0000
++++ libAfterBase/parse.h
+@@ -73,7 +73,7 @@ format_geometry ( int x, int y, unsigned
+ 
+ double parse_math(const char* str, char** endptr, double size);
+ 
+-inline int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val);
++int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val);
+ char *string_from_int (int param);
+ char *hex_to_buffer_reverse(void *data, size_t bytes, char* buffer);
+ char *hex_to_buffer(void *data, size_t bytes, char* buffer);
diff --git a/wm/afterstep/patches/patch-src_Animate_Makefile.in b/wm/afterstep/patches/patch-src_Animate_Makefile.in
new file mode 100644
index 00000000000..67fc384beb8
--- /dev/null
+++ b/wm/afterstep/patches/patch-src_Animate_Makefile.in
@@ -0,0 +1,10 @@
+$NetBSD: patch-src_Animate_Makefile.in,v 1.1 2013/06/26 21:17:45 joerg Exp $
+
+--- src/Animate/Makefile.in.orig	2013-06-26 19:51:06.000000000 +0000
++++ src/Animate/Makefile.in
+@@ -1,5 +1,3 @@
+-EXTRA_LIBRARIES	= -lm
+-
+ OBJS		= Animate.o
+ 
+ PROG		= Animate