Update to xf86-video-apm-1.2.0.

  Remove useless mfb.h include.
  Death to RCS tags.
  apm 1.2.0
  Replace references to XFree86/XF86Config in man page
  renamed: .cvsignore -> .gitignore
  Define APM_*_VERSION using PACKAGE_VERSION_*
  pcirename conversion
  xf1/4 bpp conversion
  further build fixes
  Naming change: Security*Access -> Dix*Access
  Makefile.am: nuke RCS Id

3 files changed, 15 insertions, 15 deletions

diff --git a/x11/xf86-video-apm/Makefile b/x11/xf86-video-apm/Makefile
index 608ad396ea7..09163ed3514 100644
--- a/x11/xf86-video-apm/Makefile
+++ b/x11/xf86-video-apm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/08/09 15:09:00 tnn Exp $
 #
 
-DISTNAME=	xf86-video-apm-1.1.1
+DISTNAME=	xf86-video-apm-1.2.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-apm/distinfo b/x11/xf86-video-apm/distinfo
index e7f31066656..4e2314c2197 100644
--- a/x11/xf86-video-apm/distinfo
+++ b/x11/xf86-video-apm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/08/15 15:39:23 joerg Exp $
+$NetBSD: distinfo,v 1.3 2008/08/09 15:09:00 tnn Exp $
 
-SHA1 (xf86-video-apm-1.1.1.tar.bz2) = 5e0e32f74b50f6834f866aac9a03c22283577ec4
-RMD160 (xf86-video-apm-1.1.1.tar.bz2) = f88b459996bf2f087221d1bd1442f8ccafef04de
-Size (xf86-video-apm-1.1.1.tar.bz2) = 268210 bytes
-SHA1 (patch-aa) = 04eadd9f043d1f11d64413a3409ccc0f3728902b
+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
diff --git a/x11/xf86-video-apm/patches/patch-aa b/x11/xf86-video-apm/patches/patch-aa
index c64c457f8ee..49f34ca1c81 100644
--- a/x11/xf86-video-apm/patches/patch-aa
+++ b/x11/xf86-video-apm/patches/patch-aa
@@ -1,21 +1,21 @@
-$NetBSD: patch-aa,v 1.1 2007/08/15 15:39:24 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2008/08/09 15:09:00 tnn Exp $
 
---- configure.orig	2007-08-15 17:32:02.000000000 +0200
+--- configure.orig	2008-03-19 16:38:17.000000000 +0100
 +++ configure
-@@ -20363,16 +20363,8 @@ echo $ECHO_N "checking for $prefix/share
- if eval "test \"\${$as_ac_File+set}\" = set"; then
+@@ -21532,16 +21532,8 @@ echo $ECHO_N "checking for $XORG_SGML_PA
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&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;}
 -   { (exit 1); exit 1; }; }
--if test -r "$prefix/share/X11/sgml/defs.ent"; then
+-if test -r "$XORG_SGML_PATH/X11/defs.ent"; then
 -  eval "$as_ac_File=yes"
 -else
    eval "$as_ac_File=no"
  fi
 -fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
- if test `eval echo '${'$as_ac_File'}'` = yes; then
+ ac_res=`eval echo '${'$as_ac_File'}'`
+ 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }