summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authormartti <martti@pkgsrc.org>2006-07-12 12:08:44 +0000
committermartti <martti@pkgsrc.org>2006-07-12 12:08:44 +0000
commitbe9e051e2454a9b47ca89b1e040b792d7f4446ab (patch)
tree6344c74d3e02c73d8530703c8fe1bcc00914f4b4 /wm
parentff59a4c806807d9944e523deb95db201b2539032 (diff)
downloadpkgsrc-be9e051e2454a9b47ca89b1e040b792d7f4446ab.tar.gz
Make this build on a newly installed NetBSD/i386 3.99.21 with GCC 4.1.x
Diffstat (limited to 'wm')
-rw-r--r--wm/fvwm-devel/Makefile5
-rw-r--r--wm/fvwm-devel/distinfo3
-rw-r--r--wm/fvwm-devel/patches/patch-ab13
3 files changed, 18 insertions, 3 deletions
diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index d4ad4d62f77..51201facb41 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -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 @@ USE_TOOLS+= perl:run
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 --git a/wm/fvwm-devel/distinfo b/wm/fvwm-devel/distinfo
index 660a9988187..578ca42211a 100644
--- a/wm/fvwm-devel/distinfo
+++ b/wm/fvwm-devel/distinfo
@@ -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 --git a/wm/fvwm-devel/patches/patch-ab b/wm/fvwm-devel/patches/patch-ab
new file mode 100644
index 00000000000..fb4b3c804d8
--- /dev/null
+++ b/wm/fvwm-devel/patches/patch-ab
@@ -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