summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-10-13 20:20:55 +0000
committerrillig <rillig@pkgsrc.org>2005-10-13 20:20:55 +0000
commitb339c27a4bd06a1ef18d75ff46c9efaa71132fb2 (patch)
tree4ad34819ad4d4b04350a4f8dd0382772303bbba2 /wm
parentfe973dd471561e16c39c960c1957574b7f7d09ab (diff)
downloadpkgsrc-b339c27a4bd06a1ef18d75ff46c9efaa71132fb2.tar.gz
Bumped PKGREVISION to 1.
Made the package build on Solaris.
Diffstat (limited to 'wm')
-rw-r--r--wm/ctwm/Makefile19
-rw-r--r--wm/ctwm/distinfo4
-rw-r--r--wm/ctwm/patches/patch-ac9
3 files changed, 22 insertions, 10 deletions
diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index b7472b4717f..368c1154470 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/10/06 17:28:41 reed Exp $
+# $NetBSD: Makefile,v 1.16 2005/10/13 20:20:55 rillig Exp $
#
DISTNAME= ctwm-3.7
+PKGREVISION= 1
CATEGORIES= x11 wm
MASTER_SITES= http://ctwm.free.lp.se/dist/
@@ -12,8 +13,22 @@ COMMENT= Window manager with support for multiple virtual screens and Gnome 1.x
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_IMAKE= YES
+.include "../../mk/bsd.prefs.mk"
+
+# The Solaris m4 does not understand the -s option.
+.if ${OPSYS} == "SunOS"
+USE_TOOLS+= gm4:run
+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
+MAKE_ENV+= EXTRA_DEFINES=${EXTRA_DEFINES:Q}
+
pre-configure:
- ( ${ECHO} 'USER_JPEGLIBDIR = -L${BUILDLINK_PREFIX.jpeg}/lib -Wl,-rpath,${BUILDLINK_PREFIX.jpeg}/lib'; \
+ ( ${ECHO} 'USER_JPEGLIBDIR = -L${BUILDLINK_PREFIX.jpeg}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.jpeg}/lib'; \
${ECHO} 'USER_JPEGINCDIR = -I${BUILDLINK_PREFIX.jpeg}/include'; \
${CAT} ${WRKSRC}/Imakefile.local-template; \
) >${WRKSRC}/Imakefile.local
diff --git a/wm/ctwm/distinfo b/wm/ctwm/distinfo
index fed301dc067..a426f894178 100644
--- a/wm/ctwm/distinfo
+++ b/wm/ctwm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2005/10/06 17:28:42 reed Exp $
+$NetBSD: distinfo,v 1.11 2005/10/13 20:20:55 rillig Exp $
SHA1 (ctwm-3.7.tar.gz) = 6140e82ec23499146eaab5bf3bd592f92e95683e
RMD160 (ctwm-3.7.tar.gz) = 9809df2555b3eb2bf0c46c041df8c1c089b67255
Size (ctwm-3.7.tar.gz) = 1139461 bytes
-SHA1 (patch-ac) = 99a28b20904207693a4f25aafaaac447dbcdca95
+SHA1 (patch-ac) = 8ccf1e319c0cbe1f2cc8cb941ffc7f8b45814118
diff --git a/wm/ctwm/patches/patch-ac b/wm/ctwm/patches/patch-ac
index a75066ffe91..2d2e5e4de0b 100644
--- a/wm/ctwm/patches/patch-ac
+++ b/wm/ctwm/patches/patch-ac
@@ -1,16 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2003/06/10 07:40:53 wiz Exp $
-
-Remove -s option from call to m4.
+$NetBSD: patch-ac,v 1.2 2005/10/13 20:20:55 rillig Exp $
--- parse.c.dist Tue Dec 11 16:38:52 2001
+++ parse.c Sat Mar 8 13:34:59 2003
-@@ -2097,7 +2097,8 @@
+@@ -2097,7 +2097,7 @@
dup2(fids[1], 1); /* stdout = pipe to parent */
/* get_defs("m4", dpy, display_name) */
tmp_file = m4_defs(dpy, display_name);
- execlp("m4", "m4", "-s", tmp_file, "-", NULL);
-+ /* Not all m4s know about -s */
-+ execlp("m4", "m4", tmp_file, "-", NULL);
++ execlp(PATH_TO_M4, "m4", "-s", tmp_file, "-", NULL);
/* If we get here we are screwed... */
perror("Can't execlp() m4");
exit(124);