Date: Tue, 26 May 1998 16:33:43 -0600 (MDT) From: brett@peloton.physics.montana.edu To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/6768: UPDATE - xmcd port to version 2.3 Message-ID: <199805262233.QAA04330@peloton.physics.montana.edu>
next in thread | raw e-mail | index | archive | help
>Number: 6768
>Category: ports
>Synopsis: update of xmcd to version 2.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue May 26 15:30:00 PDT 1998
>Last-Modified:
>Originator: Brett Taylor
>Organization:
Montana State University, Bozeman
>Release: FreeBSD 2.2.6-STABLE i386
>Environment:
FreeBSD 2.2.6-STABLE #0: Thu Apr 2 14:31:47 MST 1998
(I should make world again soon!)
>Description:
I updated xmcd. I only have Lesstif, but xmcd has always pretty
much compiled fine w/ Lesstif and this appears to also. I did
the following things to update:
- broke up the old patch-aa, which patched 3 files, to 2 patches
(3rd file no longer exists)
- fixed PLIST to represent new files (not sure how to generally
make the configured device name go away in
/usr/X11R6/lib/X11/xmcd/config/r*cd0c - obviously different for
SCSI or ATAPI drives...) so I let that go as it appears to have
in previous versions
- compressed 2 new man pages that weren't getting compressed for
some reason (although the other 2 were...)
>How-To-Repeat:
apply patch below to update - someone w/ the real(tm) Motif may
want to try this and check w/ it
>Fix:
diff -ruN xmcd/Makefile xmcd-2.3/Makefile
--- xmcd/Makefile Mon Sep 8 07:20:10 1997
+++ xmcd-2.3/Makefile Tue May 26 16:25:09 1998
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmcd
-# Version required: 2.2
+# Version required: 2.3
# Date created: 16 Februar 1995
# Whom: Gennady Sorokopud <gena@NetVision.net.il>
#
# $Id: Makefile,v 1.8 1997/09/08 13:20:10 tg Exp $
#
-DISTNAME= xmcd-2.2
+DISTNAME= xmcd-2.3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications/xmcd
@@ -16,6 +16,7 @@
REQUIRES_MOTIF= yes
USE_IMAKE= yes
IS_INTERACTIVE= yes # asks a lot of questions
+MAN1= cddbcmd.1 wm2xmcd.1
post-install:
${CP} ${WRKSRC}/README ${PREFIX}/lib/X11/xmcd
diff -ruN xmcd/files/md5 xmcd-2.3/files/md5
--- xmcd/files/md5 Sat Jan 17 15:58:49 1998
+++ xmcd-2.3/files/md5 Tue May 26 16:25:09 1998
@@ -1 +1 @@
-MD5 (xmcd-2.2.tar.gz) = a47e379e7b93c597b9bf729d79c13ded
+MD5 (xmcd-2.3.tar.gz) = cd36c43c388f001767495e7edf88182f
diff -ruN xmcd/patches/patch-aa xmcd-2.3/patches/patch-aa
--- xmcd/patches/patch-aa Mon Sep 8 07:20:13 1997
+++ xmcd-2.3/patches/patch-aa Tue May 26 16:25:08 1998
@@ -1,5 +1,5 @@
-*** ./xmcd_d/Imakefile.orig Thu Apr 4 21:42:31 1996
---- ./xmcd_d/Imakefile Thu Apr 4 23:31:17 1996
+*** xmcd_d/Imakefile.orig Sat May 23 00:31:49 1998
+--- xmcd_d/Imakefile Tue May 26 15:45:33 1998
***************
*** 43,49 ****
* #include "Motif.tmpl"
@@ -18,7 +18,7 @@
/**** Optional defines: Change as you see fit. *****************************
***************
-*** 67,78 ****
+*** 68,79 ****
DEFINES=
#endif
@@ -31,7 +31,7 @@
/*
* C Source files
---- 67,78 ----
+--- 68,79 ----
DEFINES=
#endif
@@ -44,45 +44,3 @@
/*
* C Source files
-*** cda_d/Imakefile.orig Tue Aug 12 19:13:31 1997
---- cda_d/Imakefile Sun Sep 7 15:34:34 1997
-***************
-*** 95,101 ****
- #if defined(__QNX__)
- LOCAL_LIBRARIES=-lncurses
- #else
-! LOCAL_LIBRARIES=-lcurses
- #endif /* __QNX__ */
- #endif /* SINIX */
- #endif /* ultrix */
---- 95,101 ----
- #if defined(__QNX__)
- LOCAL_LIBRARIES=-lncurses
- #else
-! LOCAL_LIBRARIES=-lcurses -lmytinfo
- #endif /* __QNX__ */
- #endif /* SINIX */
- #endif /* ultrix */
-***************
-*** 104,109 ****
---- 104,110 ----
- #endif /* LinuxArchitecture */
- #endif /* SunArchitecture */
-
-+ MANSUFFIX = 1
-
- /*
- * C Source files
-*** ./dbconv_d/Imakefile.orig Thu Apr 4 23:33:09 1996
---- ./dbconv_d/Imakefile Thu Apr 4 23:33:53 1996
-***************
-*** 24,29 ****
---- 24,31 ----
- *
- */
-
-+ MANSUFFIX = 1
-+
-
- /*
- * Add local include path
diff -ruN xmcd/patches/patch-ab xmcd-2.3/patches/patch-ab
--- xmcd/patches/patch-ab Mon Sep 8 07:20:14 1997
+++ xmcd-2.3/patches/patch-ab Tue May 26 16:25:08 1998
@@ -1,138 +1,29 @@
-*** install.sh.orig Tue Aug 12 19:12:27 1997
---- install.sh Sun Sep 7 16:23:43 1997
+*** cda_d/Imakefile.orig Sat May 23 00:31:57 1998
+--- cda_d/Imakefile Tue May 26 15:45:33 1998
***************
-*** 48,53 ****
---- 48,56 ----
- ERRFILE=/tmp/xmcd.err
- TMPFILE=/tmp/xmcdinst.$$
+*** 109,115 ****
+ #if defined(__QNX__)
+ LOCAL_LIBRARIES=-lncurses
+ #else
+! LOCAL_LIBRARIES=-lcurses
+ #endif /* __QNX__ */
+ #endif /* SINIX */
+ #endif /* ultrix */
+--- 109,115 ----
+ #if defined(__QNX__)
+ LOCAL_LIBRARIES=-lncurses
+ #else
+! LOCAL_LIBRARIES=-lcurses -lmytinfo
+ #endif /* __QNX__ */
+ #endif /* SINIX */
+ #endif /* ultrix */
+***************
+*** 119,124 ****
+--- 119,125 ----
+ #endif /* LinuxArchitecture OpenBSDArchitecture */
+ #endif /* SunArchitecture */
-+ # Flag for indicating we do not want to prompt the user if possible.
-+ NO_PROMPT=1
-+
- #
- # Utility functions
- #
-***************
-*** 586,592 ****
-
- while :
- do
-! if getstr "\nEnter X binary directory\n[${BINDIR}]:"
- then
- if [ -d "$ANS" ]
- then
---- 589,599 ----
-
- 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
-***************
-*** 634,640 ****
-
- while :
- do
-! if getstr "\nEnter X library directory\n[${LIBDIR}]:"
- then
- if [ -d "$ANS" ]
- then
---- 641,651 ----
-
- 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
-***************
-*** 657,663 ****
- APPDEFAULTSDIR=$LIBDIR/app-defaults
- while :
- do
-! if getstr "\nEnter X app-defaults directory\n[${APPDEFAULTSDIR}]:"
- then
- if [ -d "$ANS" ]
- then
---- 668,678 ----
- 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
-***************
-*** 680,686 ****
- XMCDLIB=$LIBDIR/xmcd
- while :
- do
-! if getstr "\nEnter xmcd library directory\n[${XMCDLIB}]:"
- then
- if [ -d "$ANS" ]
- then
---- 695,705 ----
- 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
- if [ -d "$ANS" ]
- then
-***************
-*** 733,739 ****
- $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
---- 752,761 ----
- $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
-***************
-*** 758,764 ****
- MANSUFFIX=1
- fi
-
-! if getstr "\nEnter on-line manual file name suffix\n[${MANSUFFIX}]:"
- then
- MANSUFFIX=$ANS
- fi
---- 780,789 ----
- MANSUFFIX=1
- fi
++ MANSUFFIX = 1
-! 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
+ /*
+ * C Source files
diff -ruN xmcd/patches/patch-ac xmcd-2.3/patches/patch-ac
--- xmcd/patches/patch-ac Wed Dec 31 17:00:00 1969
+++ xmcd-2.3/patches/patch-ac Tue May 26 16:25:08 1998
@@ -0,0 +1,138 @@
+*** install.sh.orig Sat May 23 00:31:42 1998
+--- install.sh Tue May 26 15:51:33 1998
+***************
+*** 46,51 ****
+--- 46,54 ----
+ ERRFILE=/tmp/xmcd.err
+ TMPFILE=/tmp/xmcdinst.$$
+
++ # Flag for indicating we do not want to prompt the user if possible.
++ NO_PROMPT=1
++
+ #
+ # Utility functions
+ #
+***************
+*** 594,600 ****
+
+ 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 ****
+
+ while :
+ do
+! if getstr "\nEnter X library directory\n[${LIBDIR}]:"
+ then
+ if [ -d "$ANS" ]
+ then
+--- 649,659 ----
+
+ 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
diff -ruN xmcd/pkg/PLIST xmcd-2.3/pkg/PLIST
--- xmcd/pkg/PLIST Mon Sep 8 07:20:16 1997
+++ xmcd-2.3/pkg/PLIST Tue May 26 16:25:08 1998
@@ -7,7 +7,6 @@
lib/X11/xmcd/help/DdCancel.btn
lib/X11/xmcd/help/DdClr.btn
lib/X11/xmcd/help/DdOk.btn
-lib/X11/xmcd/help/DpAbout.btn
lib/X11/xmcd/help/DpAddPgm.btn
lib/X11/xmcd/help/DpCancel.btn
lib/X11/xmcd/help/DpClrPgm.btn
@@ -18,14 +17,18 @@
lib/X11/xmcd/help/DpSend.btn
lib/X11/xmcd/help/DpTExt.btn
lib/X11/xmcd/help/DpTimSel.btn
+lib/X11/xmcd/help/DpWeb.btn
lib/X11/xmcd/help/DsCancel.btn
lib/X11/xmcd/help/DsOk.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/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/Keypad.btn
lib/X11/xmcd/help/KpCancel.btn
lib/X11/xmcd/help/KpClear.btn
@@ -34,6 +37,7 @@
lib/X11/xmcd/help/KpSel.btn
lib/X11/xmcd/help/LsCancel.btn
lib/X11/xmcd/help/LsOk.btn
+lib/X11/xmcd/help/Mode.btn
lib/X11/xmcd/help/NextDisc.btn
lib/X11/xmcd/help/NextIdx.btn
lib/X11/xmcd/help/NextTrk.btn
@@ -43,18 +47,21 @@
lib/X11/xmcd/help/OpSave.btn
lib/X11/xmcd/help/Options.btn
lib/X11/xmcd/help/PlayPaus.btn
-lib/X11/xmcd/help/Power.btn
lib/X11/xmcd/help/PrevDisc.btn
lib/X11/xmcd/help/PrevIdx.btn
lib/X11/xmcd/help/PrevTrk.btn
+lib/X11/xmcd/help/Quit.btn
lib/X11/xmcd/help/Rew.btn
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
@@ -64,11 +71,14 @@
lib/X11/xmcd/help/TimeMode.lbl
lib/X11/xmcd/help/Track.lbl
lib/X11/xmcd/help/TrkTitle.lbl
+lib/X11/xmcd/help/HpTopic.opt
+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
@@ -79,6 +89,7 @@
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
@@ -122,12 +133,15 @@
lib/X11/xmcd/config/.tbl/Sony
lib/X11/xmcd/config/.tbl/Stratus
lib/X11/xmcd/config/.tbl/Sun
+lib/X11/xmcd/config/.tbl/Tatung
lib/X11/xmcd/config/.tbl/Teac
lib/X11/xmcd/config/.tbl/Toshiba
lib/X11/xmcd/config/.tbl/Yamaha
lib/X11/xmcd/config/config.sh
+lib/X11/xmcd/config/sites
man/man1/xmcd.1.gz
man/man1/cda.1.gz
+man/man1/cddbcmd.1.gz
man/man1/wm2xmcd.1.gz
@dirrm lib/X11/xmcd/pixmaps
@dirrm lib/X11/xmcd/help
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199805262233.QAA04330>