diff options
author | wiz <wiz@pkgsrc.org> | 2009-03-06 10:28:32 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2009-03-06 10:28:32 +0000 |
commit | 0e89bfe83884662470f87e00c0453d49f744b67a (patch) | |
tree | 3d7d1fb0a67d461518ab72324361f59c3bdebe5b /x11/xproto | |
parent | 377723c10a33a0a5c092580f3481754bdc1656c5 (diff) | |
download | pkgsrc-0e89bfe83884662470f87e00c0453d49f744b67a.tar.gz |
Update to 7.0.15:
James Cloos (4):
Add dead keysyms for DOUBLE GRAVE and INVERTED BREVE accents
Add a dead_belowcomma keysym
[keysymdef.h] Add dead_currency symbol.
Bump to 7.0.15.
Paulo Cesar Pereira de Andrade (1):
Janitor: Correct make distcheck and dont distribute autogen.sh
Peter Hutterer (1):
Add XF86XK_Suspend and XF86XK_Hibernate keysym defs.
Sayamindu Dasgupta (1):
Add dead vowels in keysymdef.h
Diffstat (limited to 'x11/xproto')
-rw-r--r-- | x11/xproto/Makefile | 4 | ||||
-rw-r--r-- | x11/xproto/distinfo | 12 | ||||
-rw-r--r-- | x11/xproto/patches/patch-ab | 12 | ||||
-rw-r--r-- | x11/xproto/patches/patch-ac | 18 |
4 files changed, 23 insertions, 23 deletions
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile index 623d5445f95..d19a1bbe2ec 100644 --- a/x11/xproto/Makefile +++ b/x11/xproto/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2008/10/24 16:13:37 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2009/03/06 10:28:32 wiz Exp $ # -DISTNAME= xproto-7.0.14 +DISTNAME= xproto-7.0.15 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=proto/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo index ccfebef9868..6d0ef523b14 100644 --- a/x11/xproto/distinfo +++ b/x11/xproto/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.13 2009/01/01 21:56:16 hasso Exp $ +$NetBSD: distinfo,v 1.14 2009/03/06 10:28:32 wiz Exp $ -SHA1 (xproto-7.0.14.tar.bz2) = cb8b35d290c4c57c78dad06b91136fef08e0f80c -RMD160 (xproto-7.0.14.tar.bz2) = e8b63f555ec3c4a91330679271fcd699a39fcdf9 -Size (xproto-7.0.14.tar.bz2) = 152503 bytes +SHA1 (xproto-7.0.15.tar.bz2) = 891e3f8e2c17128a8fc6930583e42fd3db75839a +RMD160 (xproto-7.0.15.tar.bz2) = 6c722c6bf29e24706fb7a06aec2585c03e431134 +Size (xproto-7.0.15.tar.bz2) = 159189 bytes SHA1 (patch-aa) = 2be25c80a096ed895b92bbe60a30bc1c0db42081 -SHA1 (patch-ab) = c1ab51ee280b41f17f7780b880ae6cb70c0e4150 -SHA1 (patch-ac) = f53e93c62711b7c12c525b1267951b63c8783875 +SHA1 (patch-ab) = d01eb0037aa03fff87e349b2cdb34e9753fd99a4 +SHA1 (patch-ac) = f883802e420f9e401511435b7daf915f3bf6d927 SHA1 (patch-ad) = 636ad47ffd0d47e286737b24c768f597ea9da1ab diff --git a/x11/xproto/patches/patch-ab b/x11/xproto/patches/patch-ab index 8008f217304..09c50130eae 100644 --- a/x11/xproto/patches/patch-ab +++ b/x11/xproto/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2006/12/15 19:11:48 joerg Exp $ +$NetBSD: patch-ab,v 1.3 2009/03/06 10:28:32 wiz Exp $ ---- configure.ac.orig 2006-11-02 08:17:10.000000000 +0000 +--- configure.ac.orig 2009-03-02 17:54:21.000000000 +0000 +++ configure.ac @@ -4,6 +4,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -8,9 +8,9 @@ $NetBSD: patch-ab,v 1.2 2006/12/15 19:11:48 joerg Exp $ AC_CONFIG_HEADER([Xfuncproto.h]) +AC_CONFIG_HEADER([Xos_r.h]) - AC_CANONICAL_HOST - -@@ -170,6 +171,15 @@ if test "x$WIDEPROTO" = xno; then + # Require xorg-macros: XORG_CHANGELOG + m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +@@ -200,6 +201,15 @@ if test "x$WIDEPROTO" = xno; then AC_DEFINE(NARROWPROTO, [], [Narrow prototypes]) fi @@ -24,5 +24,5 @@ $NetBSD: patch-ab,v 1.2 2006/12/15 19:11:48 joerg Exp $ +AC_CHECK_FUNC(ttyname_r, [AC_DEFINE(_XOS_R_H_MTSAFE_UNISTDAPI,[],[Assume has ttyname_r and friends from unistd.h])],) + XORG_RELEASE_VERSION + XORG_CHANGELOG - AC_OUTPUT([Makefile diff --git a/x11/xproto/patches/patch-ac b/x11/xproto/patches/patch-ac index e84b99e71e2..54ded708127 100644 --- a/x11/xproto/patches/patch-ac +++ b/x11/xproto/patches/patch-ac @@ -1,17 +1,17 @@ -$NetBSD: patch-ac,v 1.2 2006/12/15 19:11:48 joerg Exp $ +$NetBSD: patch-ac,v 1.3 2009/03/06 10:28:32 wiz Exp $ ---- configure.orig 2006-11-02 08:19:09.000000000 +0000 +--- configure.orig 2009-03-02 18:50:20.000000000 +0000 +++ configure -@@ -2161,6 +2161,8 @@ ac_config_headers="$ac_config_headers do - - ac_config_headers="$ac_config_headers Xfuncproto.h" +@@ -2135,6 +2135,8 @@ else + $as_echo "no" >&6; } + fi +ac_config_headers="$ac_config_headers Xos_r.h" + - # Make sure we can run config.sub. - $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -@@ -3910,6 +3912,743 @@ _ACEOF + test -n "$AWK" && break + done +@@ -4810,6 +4812,743 @@ _ACEOF fi @@ -755,7 +755,7 @@ $NetBSD: patch-ac,v 1.2 2006/12/15 19:11:48 joerg Exp $ # Check whether --with-release-version was given. -@@ -4494,6 +5233,7 @@ do +@@ -5481,6 +6220,7 @@ do case $ac_config_target in "do-not-use-config.h") CONFIG_HEADERS="$CONFIG_HEADERS do-not-use-config.h" ;; "Xfuncproto.h") CONFIG_HEADERS="$CONFIG_HEADERS Xfuncproto.h" ;; |