Upgrade, 1.4 -> 2.0. Also modified to conform to our new Motif

standards to allow shared and static linkage.

Submitted by:	Daniel M. Eischen <deischen@iworks.InterWorks.org>

5 files changed, 202 insertions, 19 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 48ab868edfaf..0516cbaf5ac8 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,20 +1,23 @@
 # New ports collection makefile for:	xmcd
-# Version required:	1.4
+# Version required:	2.0
 # Date created:		16 Februar 1995
-# Whom:			gena
+# Whom:			Gennady Sorokopud <gena@NetVision.net.il>
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:44:07 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/11 19:46:58 asami Exp $
 #
 
-DISTNAME=	xmcd-1.4
+DISTNAME=	xmcd-2.0
 CATEGORIES+=	audio
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/xmcd/
-DISTFILES=	xmcd-1.4.tar.gz
+MASTER_SITES=	ftp://ftp.x.org/contrib/applications/xmcd/ \
+		ftp://crl.dec.com/pub/X11/contrib/applications/xmcd/
 
+MAINTAINER=	deischen@iworks.InterWorks.org
+
+REQUIRES_MOTIF=	yes
 USE_IMAKE=	yes
-IS_INTERACTIVE=	yes
+IS_INTERACTIVE=	yes	# asks a lot of questions
 
-pre-install:
-	@(cd ${WRKSRC}; ${MAKE} Makefiles)
+post-install:
+	cp ${WRKSRC}/README ${PREFIX}/lib/X11/xmcd
 
 .include <bsd.port.mk>
diff --git a/audio/xmcd/distinfo b/audio/xmcd/distinfo
index 125813d0e53c..eb5293c97aea 100644
--- a/audio/xmcd/distinfo
+++ b/audio/xmcd/distinfo
@@ -1 +1 @@
-MD5 (xmcd-1.4.tar.gz) = c01d84db2a599dbadc78749704cc6a65
+MD5 (xmcd-2.0.tar.gz) = 2503f8fb16854a8043e6f6a08c894baa
diff --git a/audio/xmcd/files/patch-aa b/audio/xmcd/files/patch-aa
index a7f88482e42e..c017651968f6 100644
--- a/audio/xmcd/files/patch-aa
+++ b/audio/xmcd/files/patch-aa
@@ -1,5 +1,5 @@
-*** xmcd.d/Imakefile~	Thu Feb 16 20:48:56 1995
---- xmcd.d/Imakefile	Thu Feb 16 20:49:17 1995
+*** ./xmcd_d/Imakefile.orig	Thu Apr  4 21:42:31 1996
+--- ./xmcd_d/Imakefile	Thu Apr  4 23:31:17 1996
 ***************
 *** 43,49 ****
    * #include "Motif.tmpl"
@@ -13,7 +13,76 @@
    * #include "Motif.tmpl"
    * #include "Motif.rules"
    */
-! LOCAL_LIBRARIES= -lXm -lXt -lX11 -lXext
+! LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
   
   
   /**** Optional defines:  Change as you see fit. *****************************
+***************
+*** 67,78 ****
+  DEFINES=
+  #endif
+  
+  
+  /*
+   * Add local include path
+   */
+  INCLUDES=-I..
+- 
+  
+  /*
+   * C Source files
+--- 67,78 ----
+  DEFINES=
+  #endif
+  
++ MANSUFFIX = 1
+  
+  /*
+   * Add local include path
+   */
+  INCLUDES=-I..
+  
+  /*
+   * C Source files
+*** ./cda_d/Imakefile.orig	Thu Apr  4 21:43:05 1996
+--- ./cda_d/Imakefile	Thu Apr  4 23:32:25 1996
+***************
+*** 90,96 ****
+  #if defined(SNIArchitecture) 
+  LOCAL_LIBRARIES=/usr/ccs/lib/libcurses.a
+  #else
+! LOCAL_LIBRARIES=-lcurses
+  #endif	/* SINIX */
+  #endif	/* ultrix */
+  #endif	/* NetBSDArchitecture __bsdi__ */
+--- 90,96 ----
+  #if defined(SNIArchitecture) 
+  LOCAL_LIBRARIES=/usr/ccs/lib/libcurses.a
+  #else
+! LOCAL_LIBRARIES=-lncurses -lmytinfo
+  #endif	/* SINIX */
+  #endif	/* ultrix */
+  #endif	/* NetBSDArchitecture __bsdi__ */
+***************
+*** 98,103 ****
+--- 98,104 ----
+  #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 --git a/audio/xmcd/pkg-comment b/audio/xmcd/pkg-comment
index 8b5ca0a9dbbb..76dcbc12d27f 100644
--- a/audio/xmcd/pkg-comment
+++ b/audio/xmcd/pkg-comment
@@ -1 +1 @@
-xmcd-1.4-patchlevel 1 - Motif CD player
+Motif CD player.
diff --git a/audio/xmcd/pkg-plist b/audio/xmcd/pkg-plist
index 7a4e466aedd6..e11f9b877e5f 100644
--- a/audio/xmcd/pkg-plist
+++ b/audio/xmcd/pkg-plist
@@ -1,11 +1,122 @@
-@cwd ${X11BASE}
-@mode 755
 bin/xmcd
 bin/cda
 bin/wm2xmcd
-@mode 444
 man/man1/xmcd.1.gz
 man/man1/cda.1.gz
 man/man1/wm2xmcd.1.gz
-@mode 755
-lib/X11/xmcd
+lib/X11/app-defaults/XMcd
+lib/X11/xmcd/README
+lib/X11/xmcd/help/Ab.btn
+lib/X11/xmcd/help/DbProg.btn
+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
+lib/X11/xmcd/help/DpDExt.btn
+lib/X11/xmcd/help/DpLink.btn
+lib/X11/xmcd/help/DpLoad.btn
+lib/X11/xmcd/help/DpSave.btn
+lib/X11/xmcd/help/DpSend.btn
+lib/X11/xmcd/help/DpTExt.btn
+lib/X11/xmcd/help/DpTimSel.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/DtOk.btn
+lib/X11/xmcd/help/Eject.btn
+lib/X11/xmcd/help/Ff.btn
+lib/X11/xmcd/help/Help.btn
+lib/X11/xmcd/help/Keypad.btn
+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/LsCancel.btn
+lib/X11/xmcd/help/LsOk.btn
+lib/X11/xmcd/help/NextIdx.btn
+lib/X11/xmcd/help/NextTrk.btn
+lib/X11/xmcd/help/OpBalCtr.btn
+lib/X11/xmcd/help/OpOk.btn
+lib/X11/xmcd/help/OpReset.btn
+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/PrevIdx.btn
+lib/X11/xmcd/help/PrevTrk.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/DbMode.lbl
+lib/X11/xmcd/help/DiscId.lbl
+lib/X11/xmcd/help/DiscTitl.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/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/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/Main.cbx
+lib/X11/xmcd/help/OpDone.cbx
+lib/X11/xmcd/help/OpEject.cbx
+lib/X11/xmcd/help/OpLoad.cbx
+lib/X11/xmcd/cddb/misc/4102560a
+lib/X11/xmcd/pixmaps/xmcd.icon
+lib/X11/xmcd/pixmaps/xmcd_a.px
+lib/X11/xmcd/pixmaps/xmcd_b.px
+lib/X11/xmcd/pixmaps/xmcd.xpm
+lib/X11/xmcd/config/common.cfg
+lib/X11/xmcd/config/device.cfg
+lib/X11/xmcd/config/.tbl/Apple
+lib/X11/xmcd/config/.tbl/Aztech
+lib/X11/xmcd/config/.tbl/Chinon
+lib/X11/xmcd/config/.tbl/Compaq
+lib/X11/xmcd/config/.tbl/Creative
+lib/X11/xmcd/config/.tbl/DEC
+lib/X11/xmcd/config/.tbl/HP
+lib/X11/xmcd/config/.tbl/Hitachi
+lib/X11/xmcd/config/.tbl/IBM
+lib/X11/xmcd/config/.tbl/Longshin
+lib/X11/xmcd/config/.tbl/MDI
+lib/X11/xmcd/config/.tbl/MediaVis
+lib/X11/xmcd/config/.tbl/Mitsumi
+lib/X11/xmcd/config/.tbl/NEC
+lib/X11/xmcd/config/.tbl/Okano
+lib/X11/xmcd/config/.tbl/Opticsto
+lib/X11/xmcd/config/.tbl/Orchid
+lib/X11/xmcd/config/.tbl/Panasoni
+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/SGI
+lib/X11/xmcd/config/.tbl/Sanyo
+lib/X11/xmcd/config/.tbl/Sony
+lib/X11/xmcd/config/.tbl/Stratus
+lib/X11/xmcd/config/.tbl/Sun
+lib/X11/xmcd/config/.tbl/Teac
+lib/X11/xmcd/config/.tbl/Toshiba
+lib/X11/xmcd/config/config.sh