pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/xorg-imake Fix the NetBSD.cf pre-formatted manual ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/af24764c50d1
branches:  trunk
changeset: 499201:af24764c50d1
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Sep 13 22:51:42 2005 +0000

description:
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:

 x11/xorg-imake/Makefile         |   4 ++--
 x11/xorg-imake/distinfo         |   4 ++--
 x11/xorg-imake/patches/patch-ac |  19 +++++++++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diffs (66 lines):

diff -r 9198146e2f83 -r af24764c50d1 x11/xorg-imake/Makefile
--- a/x11/xorg-imake/Makefile   Tue Sep 13 22:02:24 2005 +0000
+++ b/x11/xorg-imake/Makefile   Tue Sep 13 22:51:42 2005 +0000
@@ -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 -r 9198146e2f83 -r af24764c50d1 x11/xorg-imake/distinfo
--- a/x11/xorg-imake/distinfo   Tue Sep 13 22:02:24 2005 +0000
+++ b/x11/xorg-imake/distinfo   Tue Sep 13 22:51:42 2005 +0000
@@ -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 @@
 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 -r 9198146e2f83 -r af24764c50d1 x11/xorg-imake/patches/patch-ac
--- a/x11/xorg-imake/patches/patch-ac   Tue Sep 13 22:02:24 2005 +0000
+++ b/x11/xorg-imake/patches/patch-ac   Tue Sep 13 22:51:42 2005 +0000
@@ -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 @@
  /*
   * 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
  



Home | Main Index | Thread Index | Old Index