summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2005-10-09 05:11:32 +0000
committerreed <reed@pkgsrc.org>2005-10-09 05:11:32 +0000
commitc59d4320a1cb266bc19fbc9c465c8a8160d717af (patch)
tree78f145f9514715b424f7e16de92c283e2aa64322 /x11
parent2923403c64b706baebc96b59484f21ff8daa1fd3 (diff)
downloadpkgsrc-c59d4320a1cb266bc19fbc9c465c8a8160d717af.tar.gz
Add more to patch-ad. This is from XFree86 CVS:
xc/config/cf/NetBSD.cf,v 3.128 141. Avoid /tmp files in NetBSD.cf's man page creation (Jeremy C. Reed). Bump PKGREVISION.
Diffstat (limited to 'x11')
-rw-r--r--x11/imake/Makefile4
-rw-r--r--x11/imake/distinfo4
-rw-r--r--x11/imake/patches/patch-ad17
3 files changed, 18 insertions, 7 deletions
diff --git a/x11/imake/Makefile b/x11/imake/Makefile
index 15b6666ce3d..61ee14ea7f9 100644
--- a/x11/imake/Makefile
+++ b/x11/imake/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/09/28 20:52:28 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2005/10/09 05:11:32 reed Exp $
DISTNAME= ${DISTFILES}
PKGNAME= imake-${XF_VER}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
DISTFILES= XFree86-${XF_VER}-src-1.tgz XFree86-${XF_VER}-src-3.tgz
diff --git a/x11/imake/distinfo b/x11/imake/distinfo
index 5dae5331494..25d6f8a1f50 100644
--- a/x11/imake/distinfo
+++ b/x11/imake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:12 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/10/09 05:11:32 reed Exp $
SHA1 (XFree86-4.4.0-src-1.tgz) = 44b38a7044c82d0b2f785b0e6a935349abcb5d79
RMD160 (XFree86-4.4.0-src-1.tgz) = 40917951f1f661bfa28450771bbe86e8f0dd2549
@@ -9,7 +9,7 @@ Size (XFree86-4.4.0-src-3.tgz) = 11239253 bytes
SHA1 (patch-aa) = 554472267b9a5bc6614b11c6688325c1fd7ffc0e
SHA1 (patch-ab) = ae70833052df746763d7e02fe364e851357be7fd
SHA1 (patch-ac) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
-SHA1 (patch-ad) = 90584e5732fb882f431afd69f6fd1c26c9d22bee
+SHA1 (patch-ad) = c50bff9b7c8e1e8d17c25579f76bf1f3cced3eda
SHA1 (patch-ae) = b34f46d715e90159df3897cf20023b58b9deff67
SHA1 (patch-af) = a06752ee9f55e64a407fac6fbde3547fd096c71d
SHA1 (patch-ag) = 2431b04483928ddd281d37e09b2e5c6fc37895f5
diff --git a/x11/imake/patches/patch-ad b/x11/imake/patches/patch-ad
index 59880c05ad9..56eb6c38a07 100644
--- a/x11/imake/patches/patch-ad
+++ b/x11/imake/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2004/03/28 22:06:16 xtraeme Exp $
+$NetBSD: patch-ad,v 1.3 2005/10/09 05:11:32 reed Exp $
---- config/cf/NetBSD.cf.in.orig 2004-03-03 07:53:38.000000000 +0000
-+++ config/cf/NetBSD.cf.in 2004-03-03 07:54:59.000000000 +0000
+--- config/cf/NetBSD.cf.in.orig 2003-11-20 08:18:18.000000000 -0800
++++ config/cf/NetBSD.cf.in 2005-10-08 19:20:49.000000000 -0700
@@ -143,7 +143,7 @@
#define MkdirHierCmd mkdir -p
@@ -44,3 +44,14 @@ $NetBSD: patch-ad,v 1.2 2004/03/28 22:06:16 xtraeme Exp $
# if defined(SparcArchitecture)
# define ServerOSDefines -DDDXOSINIT
# elif defined(AlphaArchitecture)
+@@ -465,9 +459,7 @@
+ file.0:: file.$(MANNEWSUFFIX) @@\
+ @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\
+ then \ @@\
+- cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\
+- cp /tmp/$$$$.man file.0; \ @@\
+- $(RM) /tmp/$$$$.man; \ @@\
++ cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) > file.0; \ @@\
+ fi @@\
+ @@\
+ install.man:: @@\