From 24fd25f29f26df9f87438d7ce7d948e863e9447a Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill>
Date: Wed, 21 Sep 2005 23:19:14 +0000
Subject: make this work on solaris.

---
 audio/xmcd/Makefile | 14 ++++++++++++--
 audio/xmcd/PLIST    | 16 ++++++++--------
 2 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'audio')

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 761209ef327..1a751a7d323 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2005/09/21 23:19:14 dmcmahill Exp $
 
 DISTNAME=	xmcd-3.0.2
 PKGREVISION=    5
@@ -27,8 +27,16 @@ MAKE_ENV+=		SHELL=${SH}
 
 INCOMPAT_CURSES=	NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-S]*
 
-ARCHBIN=	${PREFIX}/lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "SunOS"
+ARCH=	Solaris
+.else
+ARCH=	${OPSYS}
+.endif
+
+ARCHBIN=	${PREFIX}/lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}
 XMCDDIR=	${PREFIX}/lib/X11/xmcd
+PLIST_SUBST+=	ARCH=${ARCH}
 
 _SETUID_ROOT=	${ROOT_USER} ${ROOT_GROUP} 4711
 SPECIAL_PERMS=	${ARCHBIN}/cda ${_SETUID_ROOT}
@@ -54,7 +62,9 @@ post-install:
 		done;							\
 	fi
 
+.if ${OPSYS} != "SunOS"
 .include "../../devel/ncurses/buildlink3.mk"
+.endif
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
diff --git a/audio/xmcd/PLIST b/audio/xmcd/PLIST
index 1bfc5dda4bd..bf83f67d166 100644
--- a/audio/xmcd/PLIST
+++ b/audio/xmcd/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2002/10/08 11:50:04 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/09/21 23:19:14 dmcmahill Exp $
 bin/cda
 bin/xmcd
 bin/xmcd_start
 lib/X11/xmcd/app-defaults/XKeysymDB
 lib/X11/xmcd/app-defaults/XMcd
-lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/README
-lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/cda
-lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/gobrowser
-lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/xmcd
+lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}/README
+lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}/cda
+lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}/gobrowser
+lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}/xmcd
 lib/X11/xmcd/config/.tbl/Acer
 lib/X11/xmcd/config/.tbl/Apple
 lib/X11/xmcd/config/.tbl/Aztech
@@ -231,7 +231,7 @@ lib/X11/xmcd/help/Xm/TimeMode.lbl
 lib/X11/xmcd/help/Xm/Track.lbl
 lib/X11/xmcd/help/Xm/TrkTitle.lbl
 lib/X11/xmcd/help/Xm/WWWwarp.btn
-@exec ${MKDIR} %D/lib/X11/xmcd/lib-${OPSYS}-${MACHINE_ARCH}
+@exec ${MKDIR} %D/lib/X11/xmcd/lib-${ARCH}-${MACHINE_ARCH}
 lib/X11/xmcd/pixmaps/xmcd.icon
 lib/X11/xmcd/pixmaps/xmcd.xpm
 lib/X11/xmcd/pixmaps/xmcd_a.px
@@ -258,7 +258,7 @@ man/man1/xmcd.1
 @dirrm lib/X11/xmcd/help
 @dirrm lib/X11/xmcd/docs
 @dirrm lib/X11/xmcd/config/.tbl
-@dirrm lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}
-@dirrm lib/X11/xmcd/lib-${OPSYS}-${MACHINE_ARCH}
+@dirrm lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}
+@dirrm lib/X11/xmcd/lib-${ARCH}-${MACHINE_ARCH}
 @dirrm lib/X11/xmcd/scripts
 @dirrm lib/X11/xmcd/app-defaults
-- 
cgit v1.2.3