Upgrade to 2.4. This release includes CAM compatibility.
PR: 8616 Submitted by: Daniel Eischen <eischen@vigrid.com>
This commit is contained in:
parent
24528efcc0
commit
767690825b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=14458
@ -3,14 +3,14 @@
|
||||
# Date created: 16 Februar 1995
|
||||
# Whom: Gennady Sorokopud <gena@NetVision.net.il>
|
||||
#
|
||||
# $Id: Makefile,v 1.13 1998/08/31 03:27:26 hoek Exp $
|
||||
# $Id: Makefile,v 1.14 1998/08/31 06:56:58 asami Exp $
|
||||
#
|
||||
|
||||
DISTNAME= xmcd-2.3
|
||||
DISTNAME= xmcd-2.4
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://mercury.hypersurf.com/~amb/download/xmcd/src/
|
||||
|
||||
MAINTAINER= deischen@iworks.InterWorks.org
|
||||
MAINTAINER= eischen@vigrid.com
|
||||
|
||||
REQUIRES_MOTIF= yes
|
||||
USE_IMAKE= yes
|
||||
@ -18,7 +18,7 @@ USE_IMAKE= yes
|
||||
MAN1= cddbcmd.1 wm2xmcd.1 xmcd.1 cda.1
|
||||
|
||||
post-install:
|
||||
.for man in cddbcmd.1 wm2xmcd.1
|
||||
.for man in cddbcmd.1 wm2xmcd.1 xmcd.1 cda.1
|
||||
${GZIP_CMD} ${PREFIX}/man/man1/${man}
|
||||
.endfor
|
||||
@${CAT} ${PKGDIR}/MESSAGE
|
||||
|
@ -1 +1 @@
|
||||
MD5 (xmcd-2.3.tar.gz) = cd36c43c388f001767495e7edf88182f
|
||||
MD5 (xmcd-2.4.tar.gz) = 34de843d84620b0e0e593faf0fc0fc2f
|
||||
|
@ -1,157 +1,17 @@
|
||||
*** install.sh.orig Sat May 23 00:31:42 1998
|
||||
--- install.sh Wed Aug 12 17:24:14 1998
|
||||
*** Imakefile.orig Wed Oct 28 03:03:10 1998
|
||||
--- Imakefile Sat Nov 7 15:27:39 1998
|
||||
***************
|
||||
*** 46,51 ****
|
||||
--- 46,54 ----
|
||||
ERRFILE=/tmp/xmcd.err
|
||||
TMPFILE=/tmp/xmcdinst.$$
|
||||
*** 66,71 ****
|
||||
|
||||
+ # Flag for indicating we do not want to prompt the user if possible.
|
||||
+ NO_PROMPT=1
|
||||
+
|
||||
#
|
||||
# Utility functions
|
||||
#
|
||||
***************
|
||||
*** 594,600 ****
|
||||
install::
|
||||
@BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) \
|
||||
! MANSUFFIX=$(MANSUFFIX) $(SHELL) ./install.sh -n
|
||||
|
||||
while :
|
||||
do
|
||||
! if getstr "\nEnter X binary directory\n[${BINDIR}]:"
|
||||
then
|
||||
if [ -d "$ANS" ]
|
||||
then
|
||||
--- 597,607 ----
|
||||
|
||||
while :
|
||||
do
|
||||
! if [ -n "$NO_PROMPT" ]
|
||||
! then
|
||||
! $ECHO "X binary directory - using ${BINDIR}"
|
||||
! break
|
||||
! elif getstr "\nEnter X binary directory\n[${BINDIR}]:"
|
||||
then
|
||||
if [ -d "$ANS" ]
|
||||
then
|
||||
***************
|
||||
*** 642,648 ****
|
||||
--- 66,71 ----
|
||||
|
||||
while :
|
||||
do
|
||||
! if getstr "\nEnter X library directory\n[${LIBDIR}]:"
|
||||
then
|
||||
if [ -d "$ANS" ]
|
||||
then
|
||||
--- 649,659 ----
|
||||
install::
|
||||
@BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) \
|
||||
! MANSUFFIX=$(MANSUFFIX) $(SHELL) ./install.sh -n -b
|
||||
|
||||
while :
|
||||
do
|
||||
! if [ -n "$NO_PROMPT" ]
|
||||
! then
|
||||
! $ECHO "X library directory - using ${LIBDIR}"
|
||||
! break
|
||||
! elif getstr "\nEnter X library directory\n[${LIBDIR}]:"
|
||||
then
|
||||
if [ -d "$ANS" ]
|
||||
then
|
||||
***************
|
||||
*** 665,671 ****
|
||||
APPDEFAULTSDIR=$LIBDIR/app-defaults
|
||||
while :
|
||||
do
|
||||
! if getstr "\nEnter X app-defaults directory\n[${APPDEFAULTSDIR}]:"
|
||||
then
|
||||
if [ -d "$ANS" ]
|
||||
then
|
||||
--- 676,686 ----
|
||||
APPDEFAULTSDIR=$LIBDIR/app-defaults
|
||||
while :
|
||||
do
|
||||
! if [ -n "$NO_PROMPT" ]
|
||||
! then
|
||||
! $ECHO "X app-defaults directory - using ${LIBDIR}"
|
||||
! break
|
||||
! elif getstr "\nEnter X app-defaults directory\n[${APPDEFAULTSDIR}]:"
|
||||
then
|
||||
if [ -d "$ANS" ]
|
||||
then
|
||||
***************
|
||||
*** 688,694 ****
|
||||
XMCDLIB=$LIBDIR/xmcd
|
||||
while :
|
||||
do
|
||||
! if getstr "\nEnter xmcd library directory\n[${XMCDLIB}]:"
|
||||
then
|
||||
UDIR="$ANS"
|
||||
if [ -d "$UDIR" ]
|
||||
--- 703,713 ----
|
||||
XMCDLIB=$LIBDIR/xmcd
|
||||
while :
|
||||
do
|
||||
! if [ -n "$NO_PROMPT" ]
|
||||
! then
|
||||
! $ECHO "xmcd library directory - using ${XMCDLIB}"
|
||||
! break
|
||||
! elif getstr "\nEnter xmcd library directory\n[${XMCDLIB}]:"
|
||||
then
|
||||
UDIR="$ANS"
|
||||
if [ -d "$UDIR" ]
|
||||
***************
|
||||
*** 742,748 ****
|
||||
$ECHO "\n\nThe on-line manual directory is where the man pages in"
|
||||
$ECHO "in the xmcd package will be installed."
|
||||
|
||||
! if getstr "\nEnter on-line manual directory\n[${MANDIR}]:"
|
||||
then
|
||||
MANDIR=$ANS
|
||||
fi
|
||||
--- 761,770 ----
|
||||
$ECHO "\n\nThe on-line manual directory is where the man pages in"
|
||||
$ECHO "in the xmcd package will be installed."
|
||||
|
||||
! if [ -n "$NO_PROMPT" ]
|
||||
! then
|
||||
! $ECHO "xmcd on-line manual directory - using ${MANDIR}"
|
||||
! elif getstr "\nEnter on-line manual directory\n[${MANDIR}]:"
|
||||
then
|
||||
MANDIR=$ANS
|
||||
fi
|
||||
***************
|
||||
*** 767,773 ****
|
||||
MANSUFFIX=1
|
||||
fi
|
||||
|
||||
! if getstr "\nEnter on-line manual file name suffix\n[${MANSUFFIX}]:"
|
||||
then
|
||||
MANSUFFIX=$ANS
|
||||
fi
|
||||
--- 789,798 ----
|
||||
MANSUFFIX=1
|
||||
fi
|
||||
|
||||
! if [ -n "$NO_PROMPT" ]
|
||||
! then
|
||||
! $ECHO "xmcd on-line manual file name suffix - using ${MANSUFFIX}"
|
||||
! elif getstr "\nEnter on-line manual file name suffix\n[${MANSUFFIX}]:"
|
||||
then
|
||||
MANSUFFIX=$ANS
|
||||
fi
|
||||
***************
|
||||
*** 939,954 ****
|
||||
fi
|
||||
|
||||
# Run device-dependent config script
|
||||
- if [ -r $XMCDLIB/config/config.sh ]
|
||||
- then
|
||||
- $SHELL $XMCDLIB/config/config.sh
|
||||
- if [ $? != 0 ]
|
||||
- then
|
||||
- logerr -n "$XMCDLIB/config/config.sh failed."
|
||||
- fi
|
||||
- else
|
||||
- logerr -p "Cannot execute $XMCDLIB/config/config.sh"
|
||||
- fi
|
||||
|
||||
# Demo cddb file
|
||||
if [ -d $XMCDLIB/cddb/misc ]
|
||||
--- 964,969 ----
|
||||
|
@ -1,433 +0,0 @@
|
||||
diff -Nrc ../xmcd-2.3.orig/cda_d/Imakefile ./cda_d/Imakefile
|
||||
*** ../xmcd-2.3.orig/cda_d/Imakefile Sat May 23 00:31:57 1998
|
||||
--- ./cda_d/Imakefile Sun Jun 28 19:38:31 1998
|
||||
***************
|
||||
*** 93,98 ****
|
||||
--- 93,104 ----
|
||||
#else
|
||||
#if defined(FreeBSDArchitecture)
|
||||
LOCAL_LIBRARIES=-lncurses -lmytinfo
|
||||
+ /*
|
||||
+ * Check for a CAM system.
|
||||
+ */
|
||||
+ .if exists(/usr/include/camlib.h)
|
||||
+ LOCAL_LIBRARIES+= -lcam
|
||||
+ .endif
|
||||
#else
|
||||
#if defined(NetBSDArchitecture) || defined(__bsdi__)
|
||||
LOCAL_LIBRARIES=
|
||||
diff -Nrc ../xmcd-2.3.orig/libdi_d/Imakefile ./libdi_d/Imakefile
|
||||
*** ../xmcd-2.3.orig/libdi_d/Imakefile Sat May 23 00:31:44 1998
|
||||
--- ./libdi_d/Imakefile Sun Jun 28 18:50:28 1998
|
||||
***************
|
||||
*** 69,74 ****
|
||||
--- 69,80 ----
|
||||
DEFINES=
|
||||
#endif
|
||||
|
||||
+ #if defined(FreeBSDArchitecture)
|
||||
+ .if exists(/usr/include/camlib.h)
|
||||
+ DEFINES+= -DFREEBSD_CAM
|
||||
+ .endif
|
||||
+ #endif
|
||||
+
|
||||
/*
|
||||
* Add local include path
|
||||
*/
|
||||
***************
|
||||
*** 88,93 ****
|
||||
--- 94,100 ----
|
||||
os_bsdi.c \
|
||||
os_dec.c \
|
||||
os_dgux.c \
|
||||
+ os_fbcam.c \
|
||||
os_fnbsd.c \
|
||||
os_hpux.c \
|
||||
os_irix.c \
|
||||
***************
|
||||
*** 121,126 ****
|
||||
--- 128,134 ----
|
||||
os_bsdi.o \
|
||||
os_dec.o \
|
||||
os_dgux.o \
|
||||
+ os_fbcam.o \
|
||||
os_fnbsd.o \
|
||||
os_hpux.o \
|
||||
os_irix.o \
|
||||
diff -Nrc ../xmcd-2.3.orig/libdi_d/os_fbcam.c ./libdi_d/os_fbcam.c
|
||||
*** ../xmcd-2.3.orig/libdi_d/os_fbcam.c Wed Dec 31 17:00:00 1969
|
||||
--- ./libdi_d/os_fbcam.c Wed Sep 16 18:31:47 1998
|
||||
***************
|
||||
*** 0 ****
|
||||
--- 1,202 ----
|
||||
+ /*
|
||||
+ * libdi - scsipt SCSI Device Interface Library
|
||||
+ *
|
||||
+ * Copyright (C) 1993-1998 Ti Kan
|
||||
+ * E-mail: ti@amb.org
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Library General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Library General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Library General Public
|
||||
+ * License along with this library; if not, write to the Free
|
||||
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
+ */
|
||||
+
|
||||
+ /*
|
||||
+ * FreeBSD CAM support.
|
||||
+ *
|
||||
+ * Author: Kenneth D. Merry
|
||||
+ * E-Mail: ken@kdm.org
|
||||
+ *
|
||||
+ * This code provides an interface to the SCSI passthrough driver in
|
||||
+ * FreeBSD's CAM implementation.
|
||||
+ */
|
||||
+ #ifndef LINT
|
||||
+ static char *_os_fbcam_c_ident_ = "@(#)";
|
||||
+ #endif
|
||||
+
|
||||
+ #include "common_d/appenv.h"
|
||||
+ #include "common_d/util.h"
|
||||
+ #include "libdi_d/libdi.h"
|
||||
+ #include "libdi_d/scsipt.h"
|
||||
+
|
||||
+ #if defined(__FreeBSD__) && defined(FREEBSD_CAM)
|
||||
+
|
||||
+ extern appdata_t app_data;
|
||||
+ extern bool_t scsipt_notrom_error;
|
||||
+ extern FILE *errfp;
|
||||
+ extern di_client_t *di_clinfo;
|
||||
+
|
||||
+ struct cam_device *cam_dev;
|
||||
+
|
||||
+ /*
|
||||
+ * pthru_send
|
||||
+ * Send SCSI command to the device.
|
||||
+ *
|
||||
+ * Args:
|
||||
+ * fd - Device file descriptor
|
||||
+ * cmdpt - Pointer to the SCSI command CDB
|
||||
+ * cmdlen - SCSI command size (6, 10 or 12 bytes)
|
||||
+ * datapt - Pointer to the data buffer
|
||||
+ * datalen - Data transfer size (bytes)
|
||||
+ * rw - Data transfer direction flag (OP_NODATA, OP_DATAIN or OP_DATAOUT)
|
||||
+ * tmout - Command timeout interval (seconds)
|
||||
+ * prnerr - Whether an error message should be displayed
|
||||
+ * when a command fails
|
||||
+ *
|
||||
+ * Return:
|
||||
+ * TRUE - command completed successfully
|
||||
+ * FALSE - command failed
|
||||
+ */
|
||||
+ bool_t
|
||||
+ pthru_send(
|
||||
+ int fd,
|
||||
+ byte_t *cmdpt,
|
||||
+ int cmdlen,
|
||||
+ byte_t *datapt,
|
||||
+ int datalen,
|
||||
+ byte_t rw,
|
||||
+ int tmout,
|
||||
+ bool_t prnerr
|
||||
+ )
|
||||
+ {
|
||||
+ union ccb ccb;
|
||||
+ char *path,
|
||||
+ title[FILE_PATH_SZ + 20];
|
||||
+
|
||||
+ if (fd < 0 || scsipt_notrom_error)
|
||||
+ return FALSE;
|
||||
+
|
||||
+ path = di_devgetpath(fd);
|
||||
+
|
||||
+ (void)memset(&ccb, 0, sizeof(ccb));
|
||||
+
|
||||
+ cam_fill_csio(&ccb.csio,
|
||||
+ /* retries */ 0,
|
||||
+ /* cbfcnp */ NULL,
|
||||
+ /* flags */ (rw == OP_DATAIN) ? CAM_DIR_IN :
|
||||
+ (rw == OP_DATAOUT) ? CAM_DIR_OUT :
|
||||
+ CAM_DIR_NONE,
|
||||
+ /* tag_action */ MSG_SIMPLE_Q_TAG,
|
||||
+ /* data_ptr */ (u_int8_t *)datapt,
|
||||
+ /* dxfer_len */ datalen,
|
||||
+ /* sense_len */ SSD_FULL_SIZE,
|
||||
+ /* cdb_len */ cmdlen,
|
||||
+ /* timeout */ (tmout ? tmout : DFLT_CMD_TIMEOUT) * 1000);
|
||||
+
|
||||
+ /* Disable freezing the device queue */
|
||||
+ ccb.ccb_h.flags |= CAM_DEV_QFRZDIS;
|
||||
+
|
||||
+ (void)memcpy(ccb.csio.cdb_io.cdb_bytes, cmdpt, cmdlen);
|
||||
+
|
||||
+ if (app_data.debug) {
|
||||
+ (void) sprintf(title, "SCSI CDB bytes (dev=%s rw=%d to=%d)",
|
||||
+ path, rw, tmout);
|
||||
+ util_dbgdump(title, cmdpt, cmdlen);
|
||||
+ }
|
||||
+
|
||||
+ /* Send the command down via the passthrough driver */
|
||||
+ if (cam_send_ccb(cam_dev, &ccb) < 0) {
|
||||
+ if (app_data.scsierr_msg && prnerr)
|
||||
+ perror("CAMIOCOMMAND ioctl failed");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
|
||||
+ if (((ccb.ccb_h.status & CAM_STATUS_MASK) ==
|
||||
+ CAM_SCSI_STATUS_ERROR)
|
||||
+ && (app_data.scsierr_msg)
|
||||
+ && prnerr) {
|
||||
+ char tmpstr[4096];
|
||||
+ scsi_sense_string(cam_dev, &ccb.csio, tmpstr,
|
||||
+ sizeof(tmpstr));
|
||||
+ (void)fprintf(errfp, "%s: %s\n", APPNAME, tmpstr);
|
||||
+ } else if (app_data.scsierr_msg && prnerr) {
|
||||
+ (void)fprintf(errfp, "%s: error %d returned from"
|
||||
+ " SCSI command\n", APPNAME,
|
||||
+ ccb.ccb_h.status);
|
||||
+ }
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ return TRUE;
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+ /*
|
||||
+ * pthru_open
|
||||
+ * Open SCSI pass-through device
|
||||
+ *
|
||||
+ * Args:
|
||||
+ * path - device path name string
|
||||
+ *
|
||||
+ * Return:
|
||||
+ * Device file descriptor, or -1 on failure.
|
||||
+ */
|
||||
+ int
|
||||
+ pthru_open(char *path)
|
||||
+ {
|
||||
+
|
||||
+ if ((cam_dev = cam_open_device(path, O_RDWR)) == NULL) {
|
||||
+ DBGPRN(errfp, "%s", cam_errbuf);
|
||||
+ return(-1);
|
||||
+ }
|
||||
+
|
||||
+ (void) di_devreg(cam_dev->fd, path);
|
||||
+ return (cam_dev->fd);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+ /*
|
||||
+ * pthru_close
|
||||
+ * Close SCSI pass-through device
|
||||
+ *
|
||||
+ * Args:
|
||||
+ * fd - Device file descriptor
|
||||
+ *
|
||||
+ * Return:
|
||||
+ * Nothing.
|
||||
+ */
|
||||
+ void
|
||||
+ pthru_close(int fd)
|
||||
+ {
|
||||
+ di_devunreg(fd);
|
||||
+ cam_close_device(cam_dev);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+ /*
|
||||
+ * pthru_vers
|
||||
+ * Return OS Interface Module version string
|
||||
+ *
|
||||
+ * Args:
|
||||
+ * Nothing.
|
||||
+ *
|
||||
+ * Return:
|
||||
+ * Module version text string.
|
||||
+ */
|
||||
+ char *
|
||||
+ pthru_vers(void)
|
||||
+ {
|
||||
+ return ("OS Interface module for FreeBSD/CAM\n");
|
||||
+ }
|
||||
+
|
||||
+ #endif /* __FreeBSD__ FREEBSD_CAM */
|
||||
+
|
||||
diff -Nrc ../xmcd-2.3.orig/libdi_d/os_fbcam.h ./libdi_d/os_fbcam.h
|
||||
*** ../xmcd-2.3.orig/libdi_d/os_fbcam.h Wed Dec 31 17:00:00 1969
|
||||
--- ./libdi_d/os_fbcam.h Sun Jun 28 18:49:17 1998
|
||||
***************
|
||||
*** 0 ****
|
||||
--- 1,60 ----
|
||||
+ /*
|
||||
+ * libdi - scsipt SCSI Device Interface Library
|
||||
+ *
|
||||
+ * Copyright (C) 1993-1998 Ti Kan
|
||||
+ * E-mail: ti@amb.org
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Library General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Library General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Library General Public
|
||||
+ * License along with this library; if not, write to the Free
|
||||
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
+ */
|
||||
+
|
||||
+ /*
|
||||
+ * FreeBSD CAM support
|
||||
+ *
|
||||
+ * Author: Kenneth D. Merry
|
||||
+ * E-Mail: ken@kdm.org
|
||||
+ *
|
||||
+ * This code provides an interface to the SCSI passthrough driver in
|
||||
+ * FreeBSD's CAM implementation.
|
||||
+ */
|
||||
+ #ifndef __OS_FBCAM_H__
|
||||
+ #define __OS_FBCAM_H__
|
||||
+
|
||||
+ #if defined(__FreeBSD__) && defined(FREEBSD_CAM)
|
||||
+
|
||||
+ #ifndef LINT
|
||||
+ static char *_os_fnbsd_h_ident_ = "@(#)os_fnbsd.h 6.14 98/01/02";
|
||||
+ #endif
|
||||
+
|
||||
+ #include <cam/cam.h>
|
||||
+ #include <cam/cam_ccb.h>
|
||||
+ #include <cam/scsi/scsi_message.h>
|
||||
+ #include <camlib.h>
|
||||
+
|
||||
+
|
||||
+ #define OS_MODULE /* Indicate that this is compiled on a supported OS */
|
||||
+ #define SETUID_ROOT /* Setuid root privilege is required */
|
||||
+
|
||||
+
|
||||
+ /* Public function prototypes */
|
||||
+ extern bool_t pthru_send(int, byte_t *, int, byte_t *, int, byte_t,
|
||||
+ int, bool_t);
|
||||
+ extern int pthru_open(char *);
|
||||
+ extern void pthru_close(int);
|
||||
+ extern char *pthru_vers(void);
|
||||
+
|
||||
+ #endif /* __FreeBSD__ FREEBSD_CAM*/
|
||||
+
|
||||
+ #endif /* __OS_BCAM_H__ */
|
||||
+
|
||||
diff -Nrc ../xmcd-2.3.orig/libdi_d/os_fnbsd.c ./libdi_d/os_fnbsd.c
|
||||
*** ../xmcd-2.3.orig/libdi_d/os_fnbsd.c Sat May 23 00:31:45 1998
|
||||
--- ./libdi_d/os_fnbsd.c Sun Jun 28 18:21:53 1998
|
||||
***************
|
||||
*** 44,50 ****
|
||||
#include "libdi_d/scsipt.h"
|
||||
|
||||
#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && \
|
||||
! defined(DI_SCSIPT) && !defined(DEMO_ONLY)
|
||||
|
||||
extern appdata_t app_data;
|
||||
extern bool_t scsipt_notrom_error;
|
||||
--- 44,50 ----
|
||||
#include "libdi_d/scsipt.h"
|
||||
|
||||
#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && \
|
||||
! defined(DI_SCSIPT) && !defined(DEMO_ONLY) && !defined(FREEBSD_CAM)
|
||||
|
||||
extern appdata_t app_data;
|
||||
extern bool_t scsipt_notrom_error;
|
||||
***************
|
||||
*** 232,236 ****
|
||||
#endif /* __FreeBSD__ */
|
||||
}
|
||||
|
||||
! #endif /* __FreeBSD__ __NetBSD__ __OpenBSD__ DI_SCSIPT DEMO_ONLY */
|
||||
|
||||
--- 232,236 ----
|
||||
#endif /* __FreeBSD__ */
|
||||
}
|
||||
|
||||
! #endif /* __FreeBSD__ __NetBSD__ __OpenBSD__ DI_SCSIPT DEMO_ONLY FREEBSD_CAM*/
|
||||
|
||||
diff -Nrc ../xmcd-2.3.orig/libdi_d/os_fnbsd.h ./libdi_d/os_fnbsd.h
|
||||
*** ../xmcd-2.3.orig/libdi_d/os_fnbsd.h Sat May 23 00:31:45 1998
|
||||
--- ./libdi_d/os_fnbsd.h Sun Jun 28 18:45:40 1998
|
||||
***************
|
||||
*** 34,40 ****
|
||||
#define __OS_FNBSD_H__
|
||||
|
||||
#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && \
|
||||
! defined(DI_SCSIPT) && !defined(DEMO_ONLY)
|
||||
|
||||
#ifndef LINT
|
||||
static char *_os_fnbsd_h_ident_ = "@(#)os_fnbsd.h 6.14 98/01/02";
|
||||
--- 34,40 ----
|
||||
#define __OS_FNBSD_H__
|
||||
|
||||
#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && \
|
||||
! defined(DI_SCSIPT) && !defined(DEMO_ONLY) && !defined(FREEBSD_CAM)
|
||||
|
||||
#ifndef LINT
|
||||
static char *_os_fnbsd_h_ident_ = "@(#)os_fnbsd.h 6.14 98/01/02";
|
||||
***************
|
||||
*** 54,60 ****
|
||||
extern void pthru_close(int);
|
||||
extern char *pthru_vers(void);
|
||||
|
||||
! #endif /* __FreeBSD__ __NetBSD__ __OpenBSD__ DI_SCSIPT DEMO_ONLY */
|
||||
|
||||
#endif /* __OS_FNBSD_H__ */
|
||||
|
||||
--- 54,60 ----
|
||||
extern void pthru_close(int);
|
||||
extern char *pthru_vers(void);
|
||||
|
||||
! #endif /* __FreeBSD__ __NetBSD__ __OpenBSD__ DI_SCSIPT DEMO_ONLY FREEBSD_CAM*/
|
||||
|
||||
#endif /* __OS_FNBSD_H__ */
|
||||
|
||||
diff -Nrc ../xmcd-2.3.orig/libdi_d/scsipt.h ./libdi_d/scsipt.h
|
||||
*** ../xmcd-2.3.orig/libdi_d/scsipt.h Sat May 23 00:31:44 1998
|
||||
--- ./libdi_d/scsipt.h Sun Jun 28 18:45:08 1998
|
||||
***************
|
||||
*** 587,592 ****
|
||||
--- 587,593 ----
|
||||
#include "libdi_d/os_bsdi.h" /* BSDI BSD/OS */
|
||||
#include "libdi_d/os_dec.h" /* Digital OSF/1 & Ultrix */
|
||||
#include "libdi_d/os_dgux.h" /* Data General DG/UX */
|
||||
+ #include "libdi_d/os_fbcam.h" /* FreeBSD CAM */
|
||||
#include "libdi_d/os_fnbsd.h" /* FreeBSD/NetBSD */
|
||||
#include "libdi_d/os_hpux.h" /* HP-UX */
|
||||
#include "libdi_d/os_irix.h" /* SGI IRIX */
|
||||
diff -Nrc ../xmcd-2.3.orig/xmcd_d/Imakefile ./xmcd_d/Imakefile
|
||||
*** ../xmcd-2.3.orig/xmcd_d/Imakefile Sat May 23 00:31:49 1998
|
||||
--- ./xmcd_d/Imakefile Sun Jun 28 19:39:51 1998
|
||||
***************
|
||||
*** 68,73 ****
|
||||
--- 68,81 ----
|
||||
DEFINES=
|
||||
#endif
|
||||
|
||||
+ /*
|
||||
+ * Check for a FreeBSD/CAM system.
|
||||
+ */
|
||||
+ #if defined(FreeBSDArchitecture)
|
||||
+ .if exists(/usr/include/camlib.h)
|
||||
+ LOCAL_LIBRARIES+= -lcam
|
||||
+ .endif
|
||||
+ #endif
|
||||
|
||||
/*
|
||||
* Add local include path
|
@ -1,6 +1,7 @@
|
||||
bin/xmcd
|
||||
bin/cda
|
||||
bin/cddbcmd
|
||||
bin/dp2xmcd
|
||||
bin/wm2xmcd
|
||||
lib/X11/app-defaults/XMcd
|
||||
lib/X11/xmcd/docs/ACKS
|
||||
@ -19,98 +20,100 @@ lib/X11/xmcd/docs/README
|
||||
lib/X11/xmcd/docs/RELNOTES
|
||||
lib/X11/xmcd/docs/WEB
|
||||
lib/X11/xmcd/help/Ab.btn
|
||||
lib/X11/xmcd/help/DbMode.lbl
|
||||
lib/X11/xmcd/help/DbProg.btn
|
||||
lib/X11/xmcd/help/DdCancel.btn
|
||||
lib/X11/xmcd/help/DdClr.btn
|
||||
lib/X11/xmcd/help/DdDisc.txw
|
||||
lib/X11/xmcd/help/DdOk.btn
|
||||
lib/X11/xmcd/help/Disc.lbl
|
||||
lib/X11/xmcd/help/DiscId.lbl
|
||||
lib/X11/xmcd/help/DiscTitl.lbl
|
||||
lib/X11/xmcd/help/DpAddPgm.btn
|
||||
lib/X11/xmcd/help/DpCancel.btn
|
||||
lib/X11/xmcd/help/DpClrPgm.btn
|
||||
lib/X11/xmcd/help/DpDExt.btn
|
||||
lib/X11/xmcd/help/DpDTitle.txw
|
||||
lib/X11/xmcd/help/DpLink.btn
|
||||
lib/X11/xmcd/help/DpLoad.btn
|
||||
lib/X11/xmcd/help/DpPgmSeq.txw
|
||||
lib/X11/xmcd/help/DpRmDsbl.btn
|
||||
lib/X11/xmcd/help/DpSave.btn
|
||||
lib/X11/xmcd/help/DpSend.btn
|
||||
lib/X11/xmcd/help/DpTExt.btn
|
||||
lib/X11/xmcd/help/DpTTitle.txw
|
||||
lib/X11/xmcd/help/DpTimSel.btn
|
||||
lib/X11/xmcd/help/DpTotTim.lbl
|
||||
lib/X11/xmcd/help/DpTrk.lsw
|
||||
lib/X11/xmcd/help/DpWeb.btn
|
||||
lib/X11/xmcd/help/DsCancel.btn
|
||||
lib/X11/xmcd/help/DsDir.lsw
|
||||
lib/X11/xmcd/help/DsOk.btn
|
||||
lib/X11/xmcd/help/DtAutoTr.btn
|
||||
lib/X11/xmcd/help/DtCancel.btn
|
||||
lib/X11/xmcd/help/DtClr.btn
|
||||
lib/X11/xmcd/help/DtDir.btn
|
||||
lib/X11/xmcd/help/DtOk.btn
|
||||
lib/X11/xmcd/help/DtTrack.txw
|
||||
lib/X11/xmcd/help/Eject.btn
|
||||
lib/X11/xmcd/help/Ff.btn
|
||||
lib/X11/xmcd/help/Help.btn
|
||||
lib/X11/xmcd/help/HpAbout.btn
|
||||
lib/X11/xmcd/help/HpCancel.btn
|
||||
lib/X11/xmcd/help/HpText.txw
|
||||
lib/X11/xmcd/help/HpTopic.opt
|
||||
lib/X11/xmcd/help/Index.lbl
|
||||
lib/X11/xmcd/help/Keypad.btn
|
||||
lib/X11/xmcd/help/Keypad.lbl
|
||||
lib/X11/xmcd/help/KpCancel.btn
|
||||
lib/X11/xmcd/help/KpClear.btn
|
||||
lib/X11/xmcd/help/KpEnter.btn
|
||||
lib/X11/xmcd/help/KpNum.btn
|
||||
lib/X11/xmcd/help/KpSel.btn
|
||||
lib/X11/xmcd/help/KpWarp.scl
|
||||
lib/X11/xmcd/help/Level.scl
|
||||
lib/X11/xmcd/help/LsCancel.btn
|
||||
lib/X11/xmcd/help/LsLink.lsw
|
||||
lib/X11/xmcd/help/LsOk.btn
|
||||
lib/X11/xmcd/help/Main.cbx
|
||||
lib/X11/xmcd/help/Mode.btn
|
||||
lib/X11/xmcd/help/NextDisc.btn
|
||||
lib/X11/xmcd/help/NextIdx.btn
|
||||
lib/X11/xmcd/help/NextTrk.btn
|
||||
lib/X11/xmcd/help/OpBal.scl
|
||||
lib/X11/xmcd/help/OpBalCtr.btn
|
||||
lib/X11/xmcd/help/OpChRt.rbx
|
||||
lib/X11/xmcd/help/OpChgr.cbx
|
||||
lib/X11/xmcd/help/OpDone.cbx
|
||||
lib/X11/xmcd/help/OpEject.cbx
|
||||
lib/X11/xmcd/help/OpExit.rbx
|
||||
lib/X11/xmcd/help/OpLoad.cbx
|
||||
lib/X11/xmcd/help/OpLoad.rbx
|
||||
lib/X11/xmcd/help/OpOk.btn
|
||||
lib/X11/xmcd/help/OpReset.btn
|
||||
lib/X11/xmcd/help/OpSave.btn
|
||||
lib/X11/xmcd/help/OpVolTpr.rbx
|
||||
lib/X11/xmcd/help/Options.btn
|
||||
lib/X11/xmcd/help/PlayMode.lbl
|
||||
lib/X11/xmcd/help/PlayPaus.btn
|
||||
lib/X11/xmcd/help/PrevDisc.btn
|
||||
lib/X11/xmcd/help/PrevIdx.btn
|
||||
lib/X11/xmcd/help/PrevTrk.btn
|
||||
lib/X11/xmcd/help/ProgMode.lbl
|
||||
lib/X11/xmcd/help/Quit.btn
|
||||
lib/X11/xmcd/help/Rew.btn
|
||||
lib/X11/xmcd/help/RptCnt.lbl
|
||||
lib/X11/xmcd/help/Sample.btn
|
||||
lib/X11/xmcd/help/Stop.btn
|
||||
lib/X11/xmcd/help/Time.btn
|
||||
lib/X11/xmcd/help/WwCancel.btn
|
||||
lib/X11/xmcd/help/WwGo.btn
|
||||
lib/X11/xmcd/help/DbMode.lbl
|
||||
lib/X11/xmcd/help/Disc.lbl
|
||||
lib/X11/xmcd/help/DiscId.lbl
|
||||
lib/X11/xmcd/help/DiscTitl.lbl
|
||||
lib/X11/xmcd/help/DpTotTim.lbl
|
||||
lib/X11/xmcd/help/Index.lbl
|
||||
lib/X11/xmcd/help/Keypad.lbl
|
||||
lib/X11/xmcd/help/PlayMode.lbl
|
||||
lib/X11/xmcd/help/ProgMode.lbl
|
||||
lib/X11/xmcd/help/RptCnt.lbl
|
||||
lib/X11/xmcd/help/Time.lbl
|
||||
lib/X11/xmcd/help/TimeMode.lbl
|
||||
lib/X11/xmcd/help/Track.lbl
|
||||
lib/X11/xmcd/help/TrkTitle.lbl
|
||||
lib/X11/xmcd/help/WwCancel.btn
|
||||
lib/X11/xmcd/help/WwGo.btn
|
||||
lib/X11/xmcd/help/WwSearch.opt
|
||||
lib/X11/xmcd/help/DdDisc.txw
|
||||
lib/X11/xmcd/help/DpDTitle.txw
|
||||
lib/X11/xmcd/help/DpPgmSeq.txw
|
||||
lib/X11/xmcd/help/DpTTitle.txw
|
||||
lib/X11/xmcd/help/DtTrack.txw
|
||||
lib/X11/xmcd/help/HpText.txw
|
||||
lib/X11/xmcd/help/KpWarp.scl
|
||||
lib/X11/xmcd/help/Level.scl
|
||||
lib/X11/xmcd/help/OpBal.scl
|
||||
lib/X11/xmcd/help/DpTrk.lsw
|
||||
lib/X11/xmcd/help/DsDir.lsw
|
||||
lib/X11/xmcd/help/LsLink.lsw
|
||||
lib/X11/xmcd/help/OpChRt.rbx
|
||||
lib/X11/xmcd/help/OpExit.rbx
|
||||
lib/X11/xmcd/help/OpLoad.rbx
|
||||
lib/X11/xmcd/help/OpVolTpr.rbx
|
||||
lib/X11/xmcd/help/WwSelect.rbx
|
||||
lib/X11/xmcd/help/Main.cbx
|
||||
lib/X11/xmcd/help/OpChgr.cbx
|
||||
lib/X11/xmcd/help/OpDone.cbx
|
||||
lib/X11/xmcd/help/OpEject.cbx
|
||||
lib/X11/xmcd/help/OpLoad.cbx
|
||||
lib/X11/xmcd/help/HpTopic.opt
|
||||
lib/X11/xmcd/help/WwSearch.opt
|
||||
lib/X11/xmcd/pixmaps/xmcd.icon
|
||||
lib/X11/xmcd/pixmaps/xmcd_a.px
|
||||
lib/X11/xmcd/pixmaps/xmcd_b.px
|
||||
@ -144,7 +147,9 @@ lib/X11/xmcd/config/.tbl/Philips
|
||||
lib/X11/xmcd/config/.tbl/Pioneer
|
||||
lib/X11/xmcd/config/.tbl/Plextor
|
||||
lib/X11/xmcd/config/.tbl/Procom
|
||||
lib/X11/xmcd/config/.tbl/Regal
|
||||
lib/X11/xmcd/config/.tbl/SGI
|
||||
lib/X11/xmcd/config/.tbl/Samsung
|
||||
lib/X11/xmcd/config/.tbl/Sanyo
|
||||
lib/X11/xmcd/config/.tbl/Sony
|
||||
lib/X11/xmcd/config/.tbl/Stratus
|
||||
@ -154,11 +159,15 @@ lib/X11/xmcd/config/.tbl/Teac
|
||||
lib/X11/xmcd/config/.tbl/Toshiba
|
||||
lib/X11/xmcd/config/.tbl/Yamaha
|
||||
lib/X11/xmcd/config/config.sh
|
||||
@dirrm lib/X11/xmcd/docs
|
||||
@dirrm lib/X11/xmcd/pixmaps
|
||||
@dirrm lib/X11/xmcd/help
|
||||
lib/X11/xmcd/scripts/ncsarmt
|
||||
lib/X11/xmcd/scripts/ncsawrap
|
||||
lib/X11/xmcd/scripts/nswrap
|
||||
@dirrm lib/X11/xmcd/config/.tbl
|
||||
@dirrm lib/X11/xmcd/config
|
||||
@dirrm lib/X11/xmcd/docs
|
||||
@dirrm lib/X11/xmcd/help
|
||||
@dirrm lib/X11/xmcd/pixmaps
|
||||
@dirrm lib/X11/xmcd/scripts
|
||||
@unexec rmdir lib/X11/xmcd/cddb/soundtrack 2>/dev/null || true
|
||||
@unexec rmdir lib/X11/xmcd/cddb/rock 2>/dev/null || true
|
||||
@unexec rmdir lib/X11/xmcd/cddb/reggae 2>/dev/null || true
|
||||
|
Loading…
Reference in New Issue
Block a user