diff options
author | hasso <hasso@pkgsrc.org> | 2009-05-18 18:16:14 +0000 |
---|---|---|
committer | hasso <hasso@pkgsrc.org> | 2009-05-18 18:16:14 +0000 |
commit | dc6763e32ff9d4171860eef2421bf2488d1e8967 (patch) | |
tree | 39f40d2c9b4e1874bd1e7fb5262af938f46607b5 | |
parent | cc6b881993868217ebd9d7e2537f12a3f0a21fc6 (diff) | |
download | pkgsrc-dc6763e32ff9d4171860eef2421bf2488d1e8967.tar.gz |
Update to 1.2.1.
Changes in 1.2.0:
Peter Breitenlohner (5):
reorganize autoconf macro files
define and use XORG_CHANGELOG macro
define XORG_CWARNFLAGS macro
fix XORG_PROG_RAWCPP for cygwin
bump to 1.2.0
Changes in 1.2.1:
Alan Coopersmith (3):
Allow setting XORG_SGML_PATH to a non-default path when running configure
Replace gitweb URL with cgit URL in README
Version bump: 1.2.1
Matthieu Herrb (2):
Fix CWARNFLAGS for gcc versions < 4
use more CWARNFLAGS with gcc 3.4 too.
Peter Breitenlohner (1):
fix distcheck target
-rw-r--r-- | devel/xorg-util-macros/Makefile | 5 | ||||
-rw-r--r-- | devel/xorg-util-macros/PLIST | 3 | ||||
-rw-r--r-- | devel/xorg-util-macros/distinfo | 9 | ||||
-rw-r--r-- | devel/xorg-util-macros/patches/patch-aa | 24 |
4 files changed, 7 insertions, 34 deletions
diff --git a/devel/xorg-util-macros/Makefile b/devel/xorg-util-macros/Makefile index 825cba3db50..ea3472581b2 100644 --- a/devel/xorg-util-macros/Makefile +++ b/devel/xorg-util-macros/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:20 tnn Exp $ +# $NetBSD: Makefile,v 1.4 2009/05/18 18:16:14 hasso Exp $ # -DISTNAME= util-macros-1.1.5 +DISTNAME= util-macros-1.2.1 PKGNAME= xorg-${DISTNAME} -PKGREVISION= 1 CATEGORIES= devel x11 MASTER_SITES= ${MASTER_SITE_XORG:=util/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/xorg-util-macros/PLIST b/devel/xorg-util-macros/PLIST index e72740ceec8..3e5e3b0b4bf 100644 --- a/devel/xorg-util-macros/PLIST +++ b/devel/xorg-util-macros/PLIST @@ -1,3 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/04/10 23:33:13 joerg Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/05/18 18:16:14 hasso Exp $ share/aclocal/xorg-macros.m4 -share/aclocal/xorgversion.m4 diff --git a/devel/xorg-util-macros/distinfo b/devel/xorg-util-macros/distinfo index 0c31f38b697..64766818155 100644 --- a/devel/xorg-util-macros/distinfo +++ b/devel/xorg-util-macros/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.2 2007/08/06 15:27:06 joerg Exp $ +$NetBSD: distinfo,v 1.3 2009/05/18 18:16:14 hasso 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) = e4c407804f80c4cdbfeac502551164284c60c4ae +SHA1 (util-macros-1.2.1.tar.bz2) = 820737f9aaac814f0e0898ab8cca3be71a689afd +RMD160 (util-macros-1.2.1.tar.bz2) = 89df6a48adae2372269a1c2c1bd6c791a1690c04 +Size (util-macros-1.2.1.tar.bz2) = 48602 bytes diff --git a/devel/xorg-util-macros/patches/patch-aa b/devel/xorg-util-macros/patches/patch-aa deleted file mode 100644 index 639e265e4c7..00000000000 --- a/devel/xorg-util-macros/patches/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$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) |