[pkgsrc/trunk]: pkgsrc/wm/ctwm Require GNU m4 on all platforms. Fixes PR #318...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b148e4d55162
branches:  trunk
changeset: 501204:b148e4d55162
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Oct 18 20:00:00 2005 +0000

description:
Require GNU m4 on all platforms. Fixes PR #31845. Bumped PKGREVISION.

diffstat:

 wm/ctwm/Makefile |  14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diffs (34 lines):

diff -r d581121b518d -r b148e4d55162 wm/ctwm/Makefile
--- a/wm/ctwm/Makefile  Tue Oct 18 18:09:13 2005 +0000
+++ b/wm/ctwm/Makefile  Tue Oct 18 20:00:00 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/10/13 20:20:55 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2005/10/18 20:00:00 rillig Exp $
 #
 
 DISTNAME=      ctwm-3.7
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11 wm
 MASTER_SITES=  http://ctwm.free.lp.se/dist/
 
@@ -15,16 +15,12 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-# The Solaris m4 does not understand the -s option.
-.if ${OPSYS} == "SunOS"
+# We need an m4 that understands the -s option.
 USE_TOOLS+=            gm4:run
+OPSYSVARS+=            EXTRA_DEFINES
 EXTRA_DEFINES+=                -DPATH_TO_M4=\"${TOOLS_PATH.gm4:Q}\"
 # The __EXTENSIONS__ is needed for sigjmp_buf.
-EXTRA_DEFINES+=                -D__EXTENSIONS__
-.else
-USE_TOOLS+=            m4:run
-EXTRA_DEFINES+=                -DPATH_TO_M4=\"${TOOLS_PATH.m4:Q}\"
-.endif
+EXTRA_DEFINES.SunOS+=  -D__EXTENSIONS__
 MAKE_ENV+=             EXTRA_DEFINES=${EXTRA_DEFINES:Q}
 
 pre-configure: