From 2eda52dcb3c384e12a0c872e115e5931003dda15 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 21 Aug 2008 07:30:16 +0000
Subject: [PATCH] - add sparc64 to the list of apm(4) capable arches (needs
 -current)

---
 sysutils/conky/Makefile              | 4 ++--
 sysutils/wmapm/Makefile              | 4 ++--
 sysutils/xbatt/Makefile              | 4 ++--
 x11/asapm/Makefile                   | 7 ++++---
 x11/gnome/applets2/Makefile          | 4 ++--
 x11/matchbox/matchbox-panel/Makefile | 4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 21f2017a430..188317970e8 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.6 2008/05/19 07:44:37 bernd Exp $
+# $OpenBSD: Makefile,v 1.7 2008/08/21 07:30:16 ajacoutot Exp $
 
 # we use "macppc" and not "powerpc" on purpose here ; i.e. apm(4) needed
-ONLY_FOR_ARCHS= amd64 arm i386 macppc sparc
+ONLY_FOR_ARCHS= amd64 arm i386 macppc sparc sparc64
 
 COMMENT=	light-weight system monitor
 
diff --git a/sysutils/wmapm/Makefile b/sysutils/wmapm/Makefile
index 88695fd60b3..6413773ebfd 100644
--- a/sysutils/wmapm/Makefile
+++ b/sysutils/wmapm/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.18 2008/04/14 14:05:55 jasper Exp $
+# $OpenBSD: Makefile,v 1.19 2008/08/21 07:30:16 ajacoutot Exp $
 
 # we use "macppc" and not "powerpc" on purpose here ; i.e. apm(4) needed
-ONLY_FOR_ARCHS=		amd64 arm i386 macppc sparc
+ONLY_FOR_ARCHS=		amd64 arm i386 macppc sparc sparc64
 
 COMMENT=		wm-dockapp; APM/battery monitor
 
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index 958c96ac71c..fa13382810f 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.19 2008/06/28 16:36:21 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2008/08/21 07:30:16 ajacoutot Exp $
 # $FreeBSD: Makefile,v 1.4 1997/03/10 12:07:35 asami Exp $
 
 # we use "macppc" and not "powerpc" on purpose here ; i.e. apm(4) needed
-ONLY_FOR_ARCHS= amd64 arm i386 macppc sparc
+ONLY_FOR_ARCHS= amd64 arm i386 macppc sparc sparc64
 
 COMMENT=	laptop battery status display for X11
 
diff --git a/x11/asapm/Makefile b/x11/asapm/Makefile
index 1b769e079fc..c48583e8fbc 100644
--- a/x11/asapm/Makefile
+++ b/x11/asapm/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.19 2008/04/14 14:05:56 jasper Exp $
+# $OpenBSD: Makefile,v 1.20 2008/08/21 07:30:16 ajacoutot Exp $
 
 # we use "macppc" and not "powerpc" on purpose here ; i.e. apm(4) needed
-ONLY_FOR_ARCHS= amd64 arm i386 macppc sparc
+ONLY_FOR_ARCHS= amd64 arm i386 macppc sparc sparc64
 
 COMMENT=	Advanced Power Management monitor utility for X
 
@@ -13,11 +13,12 @@ CATEGORIES=	x11
 
 MASTER_SITES=	http://www.tigr.net/afterstep/download/asapm/
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+
 WANTLIB=		ICE SM X11 Xext Xpm c
 
 LIB_DEPENDS=		jpeg.>=62::graphics/jpeg
diff --git a/x11/gnome/applets2/Makefile b/x11/gnome/applets2/Makefile
index 46f0f70e48d..322ad9da1ba 100644
--- a/x11/gnome/applets2/Makefile
+++ b/x11/gnome/applets2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2008/07/30 19:47:10 martynas Exp $
+# $OpenBSD: Makefile,v 1.47 2008/08/21 07:30:16 ajacoutot Exp $
 
 COMMENT-main=		applets for use with the GNOME panel
 COMMENT-battstat=	GNOME applet for monitoring battery level
@@ -54,7 +54,7 @@ FLAVOR?=
 # not all powerpc support apm(4), hence the use of ${MACHINE} and macppc
 .if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm" \
  && ${MACHINE_ARCH} != "i386" && ${MACHINE} != "macppc" \
- && ${MACHINE_ARCH} != "sparc"
+ && ${MACHINE_ARCH} != "sparc" && ${MACHINE_ARCH} != "sparc64"
 FLAVOR+=		no_battstat
 .endif
 
diff --git a/x11/matchbox/matchbox-panel/Makefile b/x11/matchbox/matchbox-panel/Makefile
index b47a8f0f5a1..a9dbe24a2db 100644
--- a/x11/matchbox/matchbox-panel/Makefile
+++ b/x11/matchbox/matchbox-panel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2008/07/23 09:54:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2008/08/21 07:30:16 ajacoutot Exp $
 # XXX hardcoded apm list
 
 COMMENT=	window bar for holding application launchers
@@ -18,7 +18,7 @@ WANTLIB=	X11 Xext Xft Xrender c fontconfig freetype m z \
 # not all powerpc support apm(4), hence the use of ${MACHINE} and macppc
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm" \
  || ${MACHINE_ARCH} == "i386" || ${MACHINE} == "macppc" \
- || ${MACHINE_ARCH} == "sparc"
+ || ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
 PKG_ARGS+=-DAPM=1
 .else
 PKG_ARGS+=-DAPM=0