[pkgsrc/trunk]: pkgsrc/wm/fvwm-devel Make this build on a newly installed Net...

[martti <martti%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c8bdfb81be3e
branches:  trunk
changeset: 515979:c8bdfb81be3e
user:      martti <martti%pkgsrc.org@localhost>
date:      Wed Jul 12 12:08:44 2006 +0000

description:
Make this build on a newly installed NetBSD/i386 3.99.21 with GCC 4.1.x

diffstat:

 wm/fvwm-devel/Makefile         |   5 +++--
 wm/fvwm-devel/distinfo         |   3 ++-
 wm/fvwm-devel/patches/patch-ab |  13 +++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diffs (54 lines):

diff -r 1fda82c642dd -r c8bdfb81be3e wm/fvwm-devel/Makefile
--- a/wm/fvwm-devel/Makefile    Wed Jul 12 11:56:05 2006 +0000
+++ b/wm/fvwm-devel/Makefile    Wed Jul 12 12:08:44 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/07/12 11:52:54 martti Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/12 12:08:44 martti Exp $
 
 DISTNAME=      fvwm-${FVWM_VER}
 #PKGREVISION=  1
@@ -22,13 +22,14 @@
 
 PLIST_SUBST+=          FVWM_VER=${FVWM_VER:Q}
 
+INSTALLATION_DIRS+=    share/examples/fvwm
+
 CONFIGURE_ARGS+=       --disable-bidi
 CONFIGURE_ARGS+=       --without-gnome
 CONFIGURE_ARGS+=       --without-rplay-library
 CONFIGURE_ARGS+=       --without-stroke-library
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/fvwm
        cd ${WRKSRC}/sample.fvwmrc && ${INSTALL_DATA} \
                `${LS} | ${GREP} -v Makefile` \
                ${PREFIX}/share/examples/fvwm
diff -r 1fda82c642dd -r c8bdfb81be3e wm/fvwm-devel/distinfo
--- a/wm/fvwm-devel/distinfo    Wed Jul 12 11:56:05 2006 +0000
+++ b/wm/fvwm-devel/distinfo    Wed Jul 12 12:08:44 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2006/07/02 09:32:55 martti Exp $
+$NetBSD: distinfo,v 1.7 2006/07/12 12:08:44 martti Exp $
 
 SHA1 (fvwm-2.5.16.tar.bz2) = fb12b06bec5992b5d3e640f9a530fe453f5f7a1e
 RMD160 (fvwm-2.5.16.tar.bz2) = 2c0d9c3c1c452d970dbcd4ba4800944714d4c2d4
 Size (fvwm-2.5.16.tar.bz2) = 2018815 bytes
 SHA1 (patch-aa) = 2f9c40c201fb041e71c7553118595f6af1c05030
+SHA1 (patch-ab) = d98b87cadc0e42057b92d01c0e4f51761f530829
diff -r 1fda82c642dd -r c8bdfb81be3e wm/fvwm-devel/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/fvwm-devel/patches/patch-ab    Wed Jul 12 12:08:44 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/07/12 12:08:44 martti Exp $
+
+--- config.h.in.orig   2006-07-12 14:58:37.000000000 +0000
++++ config.h.in        2006-07-12 14:58:52.000000000 +0000
+@@ -519,7 +519,7 @@
+        #pragma alloca
+ #  else
+ #    ifndef alloca /* predefined by HP cc +Olibcalls */
+-       char *alloca ();
++       void *alloca ();
+ #    endif
+ #  endif
+ #endif