[pkgsrc/trunk]: pkgsrc/x11/xf86-video-apm Update to 1.2.1:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/28f70af99651
branches:  trunk
changeset: 555176:28f70af99651
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Feb 25 18:36:09 2009 +0000

description:
Update to 1.2.1:

Dave Airlie (1):
       apm 1.2.1

Paulo Cesar Pereira de Andrade (1):
       Protect xf86rush dependent code around #ifdef XF86RUSH

diffstat:

 x11/xf86-video-apm/Makefile         |   5 ++---
 x11/xf86-video-apm/distinfo         |  10 +++++-----
 x11/xf86-video-apm/patches/patch-aa |  18 +++++++++---------
 3 files changed, 16 insertions(+), 17 deletions(-)

diffs (63 lines):

diff -r 9752d5434b12 -r 28f70af99651 x11/xf86-video-apm/Makefile
--- a/x11/xf86-video-apm/Makefile       Wed Feb 25 18:08:22 2009 +0000
+++ b/x11/xf86-video-apm/Makefile       Wed Feb 25 18:36:09 2009 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2008/09/18 20:57:50 bjs Exp $
+# $NetBSD: Makefile,v 1.5 2009/02/25 18:36:09 wiz Exp $
 #
 
-DISTNAME=      xf86-video-apm-1.2.0
-PKGREVISION=   1
+DISTNAME=      xf86-video-apm-1.2.1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 9752d5434b12 -r 28f70af99651 x11/xf86-video-apm/distinfo
--- a/x11/xf86-video-apm/distinfo       Wed Feb 25 18:08:22 2009 +0000
+++ b/x11/xf86-video-apm/distinfo       Wed Feb 25 18:36:09 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/08/09 15:09:00 tnn Exp $
+$NetBSD: distinfo,v 1.4 2009/02/25 18:36:09 wiz Exp $
 
-SHA1 (xf86-video-apm-1.2.0.tar.bz2) = 6ca22e88d5cbb70a09f04b6f89c3a3c061d7d6d6
-RMD160 (xf86-video-apm-1.2.0.tar.bz2) = 1dce7784aecc3dcceb74bbbeacacb2bd07fbb217
-Size (xf86-video-apm-1.2.0.tar.bz2) = 278307 bytes
-SHA1 (patch-aa) = 8be09e55476d2c81b2f95c92e5dc452cdb98765e
+SHA1 (xf86-video-apm-1.2.1.tar.bz2) = 881eaf215c9f111e513e90d4765582af89f72a25
+RMD160 (xf86-video-apm-1.2.1.tar.bz2) = bc3ed95b370ac9475cdf2fb88434e90aa6985e3a
+Size (xf86-video-apm-1.2.1.tar.bz2) = 282068 bytes
+SHA1 (patch-aa) = af7400416793854b2401480c70d3ee3843706792
diff -r 9752d5434b12 -r 28f70af99651 x11/xf86-video-apm/patches/patch-aa
--- a/x11/xf86-video-apm/patches/patch-aa       Wed Feb 25 18:08:22 2009 +0000
+++ b/x11/xf86-video-apm/patches/patch-aa       Wed Feb 25 18:36:09 2009 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.2 2008/08/09 15:09:00 tnn Exp $
+$NetBSD: patch-aa,v 1.3 2009/02/25 18:36:09 wiz Exp $
 
---- configure.orig     2008-03-19 16:38:17.000000000 +0100
+--- configure.orig     2008-12-22 04:13:44.000000000 +0000
 +++ configure
-@@ -21532,16 +21532,8 @@ echo $ECHO_N "checking for $XORG_SGML_PA
+@@ -22171,16 +22171,8 @@ $as_echo_n "checking for $XORG_SGML_PATH
  if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
 -  test "$cross_compiling" = yes &&
--  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
 -   { (exit 1); exit 1; }; }
 -if test -r "$XORG_SGML_PATH/X11/defs.ent"; then
 -  eval "$as_ac_File=yes"
@@ -16,6 +16,6 @@
    eval "$as_ac_File=no"
  fi
 -fi
- ac_res=`eval echo '${'$as_ac_File'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
+ ac_res=`eval 'as_val=${'$as_ac_File'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5