summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig>2005-09-24 21:00:25 +0000
committerrillig <rillig>2005-09-24 21:00:25 +0000
commit16abe134fd1463f5f57ace4b3304a9dcb8e06b86 (patch)
treedb51b9566bb34656e6d4a7600b7677706bb5c657
parentdb095e90ed97bfede11ba33f325ac84b5efb7ea9 (diff)
downloadpkgsrc-16abe134fd1463f5f57ace4b3304a9dcb8e06b86.tar.gz
Assembler code is disabled for anything except MACHINE_ARCH=="i386". This
fixes the build on x86_64. Bumped PKGREVISION to 1.
-rw-r--r--doc/CHANGES3
-rw-r--r--wm/windowmaker/Makefile6
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index aed748939ba..fc3af569047 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11186 2005/09/24 09:39:18 dsainty Exp $
+$NetBSD: CHANGES,v 1.11187 2005/09/24 21:01:31 rillig Exp $
Changes to the packages collection and infrastructure in 2005:
@@ -4096,3 +4096,4 @@ Changes to the packages collection and infrastructure in 2005:
Updated devel/cpuflags to 0.93 [abs 2005-09-22]
Updated sysutils/grub to 0.97nb2 [jlam 2005-09-24]
Added devel/picprg version 2.3d [dsainty 2005-09-24]
+ Updated wm/windowmaker to 0.92.0nb1 [rillig 2005-09-24]
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index ca44e992548..a0dcc093296 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2005/07/09 14:57:08 adam Exp $
+# $NetBSD: Makefile,v 1.56 2005/09/24 21:00:25 rillig Exp $
DISTNAME= WindowMaker-0.92.0
PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
+PKGREVISION= 1
CATEGORIES= x11 wm windowmaker
MASTER_SITES= ftp://ftp.windowmaker.org/pub/source/release/ \
ftp://ftp.ics.es.osaka-u.ac.jp/mirrors/WindowMaker/source/release/
@@ -22,6 +23,9 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
CONFIGURE_ENV+= LINGUAS=yes
CONFIGURE_ENV+= CPP_PATH="${CPP}"
+.if ${MACHINE_ARCH} != "i386"
+CONFIGURE_ENV+= ac_cv_c_inline_asm=no
+.endif
INSTALL_TARGET= install-strip