[pkgsrc/trunk]: pkgsrc/audio/xmcd make this work on solaris.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dbfd4320ab9f
branches:  trunk
changeset: 499388:dbfd4320ab9f
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Wed Sep 21 23:19:14 2005 +0000

description:
make this work on solaris.

diffstat:

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

diffs (78 lines):

diff -r 5950099dea74 -r dbfd4320ab9f audio/xmcd/Makefile
--- a/audio/xmcd/Makefile       Wed Sep 21 23:17:20 2005 +0000
+++ b/audio/xmcd/Makefile       Wed Sep 21 23:19:14 2005 +0000
@@ -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 @@
 
 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 @@
                done;                                                   \
        fi
 
+.if ${OPSYS} != "SunOS"
 .include "../../devel/ncurses/buildlink3.mk"
+.endif
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
diff -r 5950099dea74 -r dbfd4320ab9f audio/xmcd/PLIST
--- a/audio/xmcd/PLIST  Wed Sep 21 23:17:20 2005 +0000
+++ b/audio/xmcd/PLIST  Wed Sep 21 23:19:14 2005 +0000
@@ -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/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 @@
 @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