Subject: Update to Xmcd-3.0 patchlevel 1
To: None <hubertf@netbsd.org>
From: Kevin Sindhu <kevin@lucifer.at>
List: tech-pkg
Date: 07/17/2001 15:49:55
--VbJkn9YxBvnuCH5J
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

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. 

Regards

-Kevin Sindhu

-- 
Age, n.:
	That period of life in which we compound for the vices that we
still cherish by reviling those that we no longer have the enterprise
to commit.
		-- Ambrose Bierce

--VbJkn9YxBvnuCH5J
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=NetBSD-patch

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
 
 
Only in ../xmcd-3.0-patched: Imakefile.orig
Only in ../xmcd-3.0-patched: Makefile
Only in ../xmcd-3.0-patched: Makefile.bak
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)
Only in ../xmcd-3.0-patched/cda_d: Imakefile.orig
Only in ../xmcd-3.0-patched/cda_d: Imakefile.rej
Only in ../xmcd-3.0-patched/cda_d: Imakefile.rej.orig
Only in ../xmcd-3.0-patched/cda_d: Makefile
Only in ../xmcd-3.0-patched/cda_d: Makefile.bak
Only in ../xmcd-3.0-patched/cda_d: cda
Only in ../xmcd-3.0-patched/cda_d: cda.o
Only in ../xmcd-3.0-patched/cda_d: libdi.o
Only in ../xmcd-3.0-patched/cda_d: rl
Only in ../xmcd-3.0-patched/cda_d: userreg.o
Only in ../xmcd-3.0-patched/cda_d: visual.o
Only in ../xmcd-3.0-patched/cddb_d: Makefile
Only in ../xmcd-3.0-patched/cddb_d: cddbkey1.o
Only in ../xmcd-3.0-patched/cddb_d: control.o
Only in ../xmcd-3.0-patched/cddb_d: credit.o
Only in ../xmcd-3.0-patched/cddb_d: disc.o
Only in ../xmcd-3.0-patched/cddb_d: discs.o
Only in ../xmcd-3.0-patched/cddb_d: fcddb.o
Only in ../xmcd-3.0-patched/cddb_d: fullname.o
Only in ../xmcd-3.0-patched/cddb_d: gen.o
Only in ../xmcd-3.0-patched/cddb_d: genre.o
Only in ../xmcd-3.0-patched/cddb_d: genrelist.o
Only in ../xmcd-3.0-patched/cddb_d: genretree.o
Only in ../xmcd-3.0-patched/cddb_d: libcddb.a
Only in ../xmcd-3.0-patched/cddb_d: libcddbkey.a
Only in ../xmcd-3.0-patched/cddb_d: libcddbkey1.a
Only in ../xmcd-3.0-patched/cddb_d: options.o
Only in ../xmcd-3.0-patched/cddb_d: region.o
Only in ../xmcd-3.0-patched/cddb_d: regionlist.o
Only in ../xmcd-3.0-patched/cddb_d: role.o
Only in ../xmcd-3.0-patched/cddb_d: rolelist.o
Only in ../xmcd-3.0-patched/cddb_d: roletree.o
Only in ../xmcd-3.0-patched/cddb_d: segment.o
Only in ../xmcd-3.0-patched/cddb_d: track.o
Only in ../xmcd-3.0-patched/cddb_d: url.o
Only in ../xmcd-3.0-patched/cddb_d: urllist.o
Only in ../xmcd-3.0-patched/cddb_d: urlmanager.o
Only in ../xmcd-3.0-patched/cddb_d: userinfo.o
Only in ../xmcd-3.0-patched/cdinfo_d: Makefile
Only in ../xmcd-3.0-patched/cdinfo_d: cdinfo_i.o
Only in ../xmcd-3.0-patched/cdinfo_d: cdinfo_x.o
Only in ../xmcd-3.0-patched/cdinfo_d: hist.o
Only in ../xmcd-3.0-patched/cdinfo_d: libcdinfo.a
Only in ../xmcd-3.0-patched/common_d: Makefile
Only in ../xmcd-3.0-patched/common_d: libutil.a
Only in ../xmcd-3.0-patched/common_d: util.o
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
Only in ../xmcd-3.0-patched: install.sh.orig
Only in ../xmcd-3.0-patched/libdi_d: Makefile
Only in ../xmcd-3.0-patched/libdi_d: aixioc.o
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" ]
Only in ../xmcd-3.0-patched/libdi_d: config.sh.orig
Only in ../xmcd-3.0-patched/libdi_d: fbioc.o
Only in ../xmcd-3.0-patched/libdi_d: libdi.a
Only in ../xmcd-3.0-patched/libdi_d: libdi.o
Only in ../xmcd-3.0-patched/libdi_d: os_aix.o
Only in ../xmcd-3.0-patched/libdi_d: os_aux.o
Only in ../xmcd-3.0-patched/libdi_d: os_bsdi.o
Only in ../xmcd-3.0-patched/libdi_d: os_cdsim.o
Only in ../xmcd-3.0-patched/libdi_d: os_dec.o
Only in ../xmcd-3.0-patched/libdi_d: os_demo.o
Only in ../xmcd-3.0-patched/libdi_d: os_dgux.o
Only in ../xmcd-3.0-patched/libdi_d: os_fnbsd.o
Only in ../xmcd-3.0-patched/libdi_d: os_hpux.o
Only in ../xmcd-3.0-patched/libdi_d: os_irix.o
Only in ../xmcd-3.0-patched/libdi_d: os_linux.o
Only in ../xmcd-3.0-patched/libdi_d: os_news.o
Only in ../xmcd-3.0-patched/libdi_d: os_odt.o
Only in ../xmcd-3.0-patched/libdi_d: os_sinix.o
Only in ../xmcd-3.0-patched/libdi_d: os_sun.o
Only in ../xmcd-3.0-patched/libdi_d: os_svr4.o
Only in ../xmcd-3.0-patched/libdi_d: os_vms.o
Only in ../xmcd-3.0-patched/libdi_d: scsipt.o
Only in ../xmcd-3.0-patched/libdi_d: slioc.o
Only in ../xmcd-3.0-patched/libdi_d: vu_chin.o
Only in ../xmcd-3.0-patched/libdi_d: vu_hita.o
Only in ../xmcd-3.0-patched/libdi_d: vu_nec.o
Only in ../xmcd-3.0-patched/libdi_d: vu_pana.o
Only in ../xmcd-3.0-patched/libdi_d: vu_pion.o
Only in ../xmcd-3.0-patched/libdi_d: vu_sony.o
Only in ../xmcd-3.0-patched/libdi_d: vu_tosh.o
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
Only in ../xmcd-3.0-patched/misc_d: start.sh.orig
Only in ../xmcd-3.0-patched/util_d: Makefile
Only in ../xmcd-3.0-patched/util_d: gobrowser
Only in ../xmcd-3.0-patched/util_d: gobrowser.o
Only in ../xmcd-3.0-patched/xmcd_d: Makefile
Only in ../xmcd-3.0-patched/xmcd_d: callback.o
Only in ../xmcd-3.0-patched/xmcd_d: cdfunc.o
Only in ../xmcd-3.0-patched/xmcd_d: command.o
Only in ../xmcd-3.0-patched/xmcd_d: dbprog.o
Only in ../xmcd-3.0-patched/xmcd_d: geom.o
Only in ../xmcd-3.0-patched/xmcd_d: help.o
Only in ../xmcd-3.0-patched/xmcd_d: hotkey.o
Only in ../xmcd-3.0-patched/xmcd_d: main.o
Only in ../xmcd-3.0-patched/xmcd_d: userreg.o
Only in ../xmcd-3.0-patched/xmcd_d: widget.o
Only in ../xmcd-3.0-patched/xmcd_d: wwwwarp.o
Only in ../xmcd-3.0-patched/xmcd_d: xmcd

--VbJkn9YxBvnuCH5J--