Update asapm to 2.9. Changes from 2.7:

2.8	25 Nov 1999

	Fixed a bug reported by Hartmut M. Bromkamp <Bromkamp@istgmbh.com>
	".... But what really led me into some confusion
	is the fact that the -rc option doesn't work:
	Everytime I launch asapm by
	asapm -rc /root/.asapmrc
	it will only display its options and ceases...."
	This should at the same time fixed the bug that asapm
	did not understand '-fail' anymore (-f was used in the code
	instead of -rc).

2.9	19 Nov 1999

	Stephen Crane <jsc@darkstar.szyzygy.org> proposed the following:
	"I've attached a patch to asapm-2.7 to share or use the closest colours
	when creating the pixmaps.  (It would also be good to do this for the
	battery and other colours but I don't know enough X, yet.)  I need this
	for my graphically-challenged portable: I think it's better to go with
	ugly colours than do without the APM data."
	So here is the new version with his patch.

6 files changed, 31 insertions, 36 deletions

diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index ff935f9d9ce..aaa779630b8 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.6 1999/10/06 22:54:20 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/01/16 18:37:05 jlam Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp
 #
 
-DISTNAME=		asapm-2.7
+DISTNAME=		asapm-2.9
 CATEGORIES=		sysutils x11
 MASTER_SITES=		http://www.tigr.net/afterstep/as-apps/download/asapm/ \
 			ftp://ftp.afterstep.org/apps/asapm/ \
 			ftp://fuf.sh.cvut.cz/pub/AfterStep/apps/asapm/
 
 MAINTAINER=		jlam@netbsd.org
-HOMEPAGE=		http://www.tigr.net/afterstep/as-apps/applet-list.html
+HOMEPAGE=		http://www.tigr.net/afterstep/as-apps/download/asapm/
 
-DEPENDS=		xpm-3.4k:../../graphics/xpm
+DEPENDS=		xpm-*:../../graphics/xpm
 
 ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc	# needs APM support
 
diff --git a/sysutils/asapm/files/md5 b/sysutils/asapm/files/md5
index edce24d0484..5ae08b39e61 100644
--- a/sysutils/asapm/files/md5
+++ b/sysutils/asapm/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/10/06 22:54:21 jlam Exp $
+$NetBSD: md5,v 1.4 2000/01/16 18:37:05 jlam Exp $
 
-MD5 (asapm-2.7.tar.gz) = 12671dcbc3dcc8bf85e994d892d788fc
+MD5 (asapm-2.9.tar.gz) = 81b39ff2827f1c60992b739c0352b24b
diff --git a/sysutils/asapm/files/patch-sum b/sysutils/asapm/files/patch-sum
index 19b3bb06a08..9f77b61cecf 100644
--- a/sysutils/asapm/files/patch-sum
+++ b/sysutils/asapm/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/07/12 00:05:48 jlam Exp $
+$NetBSD: patch-sum,v 1.3 2000/01/16 18:37:05 jlam Exp $
 
-MD5 (patch-aa) = 0486996fc784dc2fab9e285738521881
-MD5 (patch-ab) = 2f109b1f7cb70b34dbed0221fb9adb79
-MD5 (patch-ac) = 9569bf3241f894339f5f1ca040848c91
+MD5 (patch-aa) = 3c987f4cee7f7f5665ba25c057c7b291
+MD5 (patch-ab) = a3836b1c338fbdd5bf72f3c2d0947a0d
diff --git a/sysutils/asapm/patches/patch-aa b/sysutils/asapm/patches/patch-aa
index 5a3ae4113b4..50d932dbe17 100644
--- a/sysutils/asapm/patches/patch-aa
+++ b/sysutils/asapm/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 1999/04/12 17:39:47 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2000/01/16 18:37:05 jlam Exp $
 
---- autoconf/Makefile.common.in.orig	Tue Feb 23 04:56:05 1999
-+++ autoconf/Makefile.common.in	Sat Mar 20 17:02:15 1999
+--- autoconf/Makefile.common.in.orig	Tue Mar  9 05:35:24 1999
++++ autoconf/Makefile.common.in	Sun Jan 16 13:23:25 2000
 @@ -13,11 +13,11 @@
  		$(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR)
  
@@ -16,3 +16,12 @@ $NetBSD: patch-aa,v 1.2 1999/04/12 17:39:47 jlam Exp $
  
  clean:
  		$(RMF) $(PROG) *.o *~ *% *.bak \#* core
+@@ -34,7 +34,7 @@
+ 		done
+ 
+ $(PROG):        $(OBJS)
+-		$(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
++		$(CC) $(LDFLAGS) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
+ 
+ .c.o:
+ 		$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
diff --git a/sysutils/asapm/patches/patch-ab b/sysutils/asapm/patches/patch-ab
index 737b229c758..e1787d4eb22 100644
--- a/sysutils/asapm/patches/patch-ab
+++ b/sysutils/asapm/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.1 1999/07/12 00:04:58 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2000/01/16 18:37:05 jlam Exp $
 
---- autoconf/Makefile.common.in.orig	Sun Jul 11 04:53:01 1999
-+++ autoconf/Makefile.common.in	Sun Jul 11 04:57:53 1999
-@@ -34,7 +34,7 @@
- 		done
+--- autoconf/Makefile.defines.in.orig	Tue Mar  9 05:35:24 1999
++++ autoconf/Makefile.defines.in	Sun Jan 16 13:24:05 2000
+@@ -28,6 +28,7 @@
+ INCS_XPM	= @XPM_CFLAGS@
+ INCLUDES	= $(INCS_X) $(INCS_XPM)
  
- $(PROG):        $(OBJS)
--		$(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
-+		$(CC) -o $(@) $(OBJS) $(LDFLAGS) $(LIBRARIES) $(EXTRA_LIBRARIES)
- 
- .c.o:
- 		$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
++LDFLAGS		= @LDFLAGS@
+ LIBS_X		= @X_LIBS@ @x_libs@
+ LIBS_XPM	= 
+ LIBS_JPEG	= @JPEG_LIB@
diff --git a/sysutils/asapm/patches/patch-ac b/sysutils/asapm/patches/patch-ac
deleted file mode 100644
index 167483215d8..00000000000
--- a/sysutils/asapm/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/07/12 00:04:58 jlam Exp $
-
---- autoconf/Makefile.defines.in.orig	Tue Feb 23 04:56:05 1999
-+++ autoconf/Makefile.defines.in	Sun Jul 11 04:58:26 1999
-@@ -28,6 +28,7 @@
- INCS_XPM	= @XPM_CFLAGS@
- INCLUDES	= $(INCS_X) $(INCS_XPM)
- 
-+LDFLAGS		= @LDFLAGS@
- LIBS_X		= @X_LIBS@ @x_libs@
- LIBS_XPM	= 
- LIBS_JPEG	= @JPEG_LIB@