>Number:         13519
>Category:       pkg
>Synopsis:       Update to Xmcd pkg
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Jul 20 11:12:02 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Kevin Sindhu
>Release:        NetBSD-current July 14 2001
>Organization:
>Environment:
	
System: NetBSD lucifer 1.5W NetBSD 1.5W (Devil's Minion) #16: Sat Jul 14 08:19:16 PDT 2001 kevin@lucifer:/usr/src/sys/arch/i386/compile/LUCIFER i386
Architecture: i386
Machine: i386
>Description:

I was looking around for this in pkgsrc, but we have an older copy.
Attached is a patch which needs to be applied to the xmcd-3.0.1.tar.gz
source to get xmcd to work with NetBSD.
As per Hubert's mail, sending the update for xmcd in pkgsrc via send-pr.

If no-one has come forward to take reponsibility for this port, I'll be happy toupdate and maintain it, and give a better port than this ugly patch;-). Please contact me if this is the case, as I can start working on  fixed and updated port.

-Kevin

>How-To-Repeat:
	
>Fix:

Apply the below patch to xmcd-3.0.1 source.

diff -ur ../xmcd-3.0-patched/Imakefile ./Imakefile
--- ../xmcd-3.0-patched/Imakefile	Tue Jul 17 15:01:57 2001
+++ ./Imakefile	Mon Jul 16 10:51:58 2001
@@ -74,6 +74,6 @@
 
 install::
 	@BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) \
-		MANSUFFIX=$(MANSUFFIX) $(SHELL) ./install.sh -n -b
+		MANSUFFIX=$(MANSUFFIX) $(SHELL) ./install.sh -n
 
 
diff -ur ../xmcd-3.0-patched/cda_d/Imakefile ./cda_d/Imakefile
--- ../xmcd-3.0-patched/cda_d/Imakefile	Tue Jul 17 15:11:11 2001
+++ ./cda_d/Imakefile	Mon Jul 16 10:52:16 2001
@@ -50,7 +50,7 @@
 DEFINES= -DBSDCOMPAT -DUSE_TERMIOS
 #else
 #if defined(NetBSDArchitecture)
-DEFINES= -DBSDCOMPAT -DUSE_TERMIOS
+DEFINES= -DBSDCOMPAT -DNOVISUAL -DUSE_TERMIOS
 #else
 #if defined(__bsdi__)
 .if exists(/usr/include/ncurses.h)
@@ -90,7 +90,7 @@
 #endif	/* LinuxArchitecture */
 #endif	/* SunArchitecture */
 
-INCLUDES=-I.. -I/usr/pkg/include
+INCLUDES=-I..
 
 
 /*
@@ -120,13 +120,13 @@
 .endif
 #else
 #if defined(NetBSDArchitecture)
-LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
+LOCAL_LIBRARIES=
 #else
 #if defined(__bsdi__)
 .if exists(/usr/include/ncurses.h)
-LOCAL_LIBRARIES=-I/usr/pkg/include -L/usr/pkg/lib -lncurses
+LOCAL_LIBRARIES=-lncurses
 .else
-LOCAL_LIBRARIES= -I/usr/pkg/include -L/usr/pkg/lib -lncurses
+LOCAL_LIBRARIES=
 .endif
 #else
 #if defined(OpenBSDArchitecture)
diff -ur ../xmcd-3.0-patched/install.sh ./install.sh
--- ../xmcd-3.0-patched/install.sh	Tue Jul 17 15:02:01 2001
+++ ./install.sh	Mon Jul 16 10:51:58 2001
@@ -57,7 +57,7 @@
 XBINGROUP=bin
 ERRFILE=/tmp/xmcd.err
 TMPFILE=/tmp/xmcdinst.$$
-STARTUP_SCRIPT=xmcd_start
+STARTUP_SCRIPT=.xmcd_start
 
 #
 # Utility functions
@@ -493,7 +493,7 @@
 #
 OS_SYS=`(uname -s) 2>/dev/null`
 OS_REL=`(uname -r) 2>/dev/null`
-OS_MACH=@MACHINE_ARCH@
+OS_MACH=`(uname -m) 2>/dev/null`
 
 if [ -z "$OS_SYS" ]
 then
diff -ur ../xmcd-3.0-patched/libdi_d/config.sh ./libdi_d/config.sh
--- ../xmcd-3.0-patched/libdi_d/config.sh	Tue Jul 17 15:02:05 2001
+++ ./libdi_d/config.sh	Mon Jul 16 10:52:02 2001
@@ -2001,7 +2001,7 @@
 # Get platform information
 OS_SYS=`(uname -s) 2>/dev/null`
 OS_REL=`(uname -r) 2>/dev/null`
-OS_MACH=@MACHINE_ARCH@
+OS_MACH=`(uname -m) 2>/dev/null`
 OS_NODE=`(uname -n) 2>/dev/null`
 
 if [ -z "$OS_SYS" ]
diff -ur ../xmcd-3.0-patched/misc_d/start.sh ./misc_d/start.sh
--- ../xmcd-3.0-patched/misc_d/start.sh	Tue Jul 17 15:02:03 2001
+++ ./misc_d/start.sh	Mon Jul 16 10:52:17 2001
@@ -116,7 +116,7 @@
 
 PROG=`(basename $0) 2>/dev/null`
 SYS=`(uname -s) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
-MACH=`echo @MACHINE_ARCH@ | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
+MACH=`(uname -m) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
 REL=`(uname -r) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
 
 o_path=$PATH
>Release-Note:
>Audit-Trail:
>Unformatted: