[pkgsrc/trunk]: pkgsrc/devel/xorg-util-macros Add patch to allow cross-compil...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2c1382fe51f3
branches:  trunk
changeset: 531795:2c1382fe51f3
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Aug 06 15:27:06 2007 +0000

description:
Add patch to allow cross-compilation of packaging using the
LINUXDOC macro. Bump revision.

diffstat:

 devel/xorg-util-macros/Makefile         |   3 ++-
 devel/xorg-util-macros/distinfo         |  12 ++----------
 devel/xorg-util-macros/patches/patch-aa |  24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 11 deletions(-)

diffs (62 lines):

diff -r a35d452755dc -r 2c1382fe51f3 devel/xorg-util-macros/Makefile
--- a/devel/xorg-util-macros/Makefile   Mon Aug 06 15:07:56 2007 +0000
+++ b/devel/xorg-util-macros/Makefile   Mon Aug 06 15:27:06 2007 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/04/10 23:33:13 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/06 15:27:06 joerg Exp $
 #
 
 DISTNAME=              util-macros-1.1.5
 PKGNAME=               xorg-${DISTNAME}
+PKGREVISION=           1
 CATEGORIES=            devel x11
 MASTER_SITES=          http://xorg.freedesktop.org/releases/individual/util/
 EXTRACT_SUFX=          .tar.bz2
diff -r a35d452755dc -r 2c1382fe51f3 devel/xorg-util-macros/distinfo
--- a/devel/xorg-util-macros/distinfo   Mon Aug 06 15:07:56 2007 +0000
+++ b/devel/xorg-util-macros/distinfo   Mon Aug 06 15:27:06 2007 +0000
@@ -1,14 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/04/10 23:33:13 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/08/06 15:27:06 joerg Exp $
 
 SHA1 (util-macros-1.1.5.tar.bz2) = c4bbfa389df7e5f568599d6313f2460a381f0502
 RMD160 (util-macros-1.1.5.tar.bz2) = fb9702eb898520fd70b1e7cdc70e2e6e78610a1e
 Size (util-macros-1.1.5.tar.bz2) = 47165 bytes
-SHA1 (patch-aa) = afe809bcc5d93be3b8a74e720faf2dc1daa4634d
-SHA1 (patch-ab) = 42fb5238ca07a25d54069aca72882fd36fb118cc
-SHA1 (patch-ac) = 7ed4cd5b33759736d86cdb6226ef53a42bbf7d7e
-SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
-SHA1 (patch-ae) = bc41dbcfdb45fce8be152cd2ea275954d4aad935
-SHA1 (patch-af) = 6fdcbcb8858bd82d260d00563980e80e314b899c
-SHA1 (patch-ag) = f2e665cc6e67cf2f687652b9adeab0a0de816729
-SHA1 (patch-ah) = f329f44a81c49ba66e8da197ab99a53172a1d247
-SHA1 (patch-ai) = a0795dcd3442471a58c77c667b3eeb50d7bb47bb
+SHA1 (patch-aa) = e4c407804f80c4cdbfeac502551164284c60c4ae
diff -r a35d452755dc -r 2c1382fe51f3 devel/xorg-util-macros/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/xorg-util-macros/patches/patch-aa   Mon Aug 06 15:27:06 2007 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1 2007/08/06 15:27:07 joerg Exp $
+
+--- xorg-macros.m4.in.orig     2006-11-08 15:23:10.000000000 +0100
++++ xorg-macros.m4.in
+@@ -194,7 +194,8 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
+ XORG_SGML_PATH=$prefix/share/sgml
+ HAVE_DEFS_ENT=
+ 
+-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
++AS_IF([test "$cross_compiling" = no],
++      AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]))
+ 
+ AC_PATH_PROG(LINUXDOC, linuxdoc)
+ AC_PATH_PROG(PS2PDF, ps2pdf)
+@@ -250,7 +251,8 @@ BUILDPDFDOC=no
+ BUILDPSDOC=no
+ BUILDHTMLDOC=no
+ 
+-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
++AS_IF([test "$cross_compiling" = no],
++      AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]))
+ 
+ AC_PATH_PROG(DOCBOOKPS, docbook2ps)
+ AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)