summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorreed <reed>2005-09-13 22:51:42 +0000
committerreed <reed>2005-09-13 22:51:42 +0000
commit8aad3b021f57ab3faa8a926f881c6f47f913a616 (patch)
tree18c8328c7b8724e68e7073ffd017372b3ddb9ea7 /x11
parentd15e5db73ee10678e395027711c416c5a478f9db (diff)
downloadpkgsrc-8aad3b021f57ab3faa8a926f881c6f47f913a616.tar.gz
Fix the NetBSD.cf pre-formatted manual page make target so it
creates the manpage in current build directory instead of unsafely in tmp directory. Discussed with Xorg and XFree86 security teams and fixed there also. Bump PKGREVISION.
Diffstat (limited to 'x11')
-rw-r--r--x11/xorg-imake/Makefile4
-rw-r--r--x11/xorg-imake/distinfo4
-rw-r--r--x11/xorg-imake/patches/patch-ac19
3 files changed, 19 insertions, 8 deletions
diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index b689de86ee9..ef56d249dd4 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/08/19 16:46:52 reed Exp $
+# $NetBSD: Makefile,v 1.21 2005/09/13 22:51:42 reed Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-imake-${XORG_VER}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG}
DISTFILES= X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src3.tar.gz
diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo
index 7b0fe193c04..0b3aaa2b33b 100644
--- a/x11/xorg-imake/distinfo
+++ b/x11/xorg-imake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/06/07 02:43:26 xtraeme Exp $
+$NetBSD: distinfo,v 1.15 2005/09/13 22:51:42 reed Exp $
SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
@@ -8,7 +8,7 @@ RMD160 (X11R6.8.2-src3.tar.gz) = d3c90401ba81dfeea843373d0d0d386962b636a6
Size (X11R6.8.2-src3.tar.gz) = 10379299 bytes
SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322
SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
-SHA1 (patch-ac) = 1c12d9c5b976ac5c9b6667e0f3a98792eef433fc
+SHA1 (patch-ac) = 998b6f0f2541306ccba576974e83aa79be5c1bb8
SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
SHA1 (patch-af) = 178d556fa11818420cd685308cf179ee5f6f7dac
diff --git a/x11/xorg-imake/patches/patch-ac b/x11/xorg-imake/patches/patch-ac
index 27ebe20945c..5e846c521c4 100644
--- a/x11/xorg-imake/patches/patch-ac
+++ b/x11/xorg-imake/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2004/12/27 17:26:18 xtraeme Exp $
+$NetBSD: patch-ac,v 1.4 2005/09/13 22:51:42 reed Exp $
---- config/cf/NetBSD.cf.in.orig 2004-08-15 02:03:36.000000000 +0200
-+++ config/cf/NetBSD.cf.in 2004-12-20 15:33:15.000000000 +0100
+--- config/cf/NetBSD.cf.in.orig 2004-08-14 17:03:36.000000000 -0700
++++ config/cf/NetBSD.cf.in 2005-09-12 15:21:11.000000000 -0700
@@ -123,7 +123,7 @@
# define ThreadedX YES
# define HasThreadSafeAPI YES
@@ -103,7 +103,18 @@ $NetBSD: patch-ac,v 1.3 2004/12/27 17:26:18 xtraeme Exp $
/*
* agpgart support (NetBSD 1.5Y and up)
*/
-@@ -588,7 +597,7 @@
+@@ -468,9 +477,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:: @@\
+@@ -588,7 +595,7 @@
# define BuildXInputLib YES
#endif