From fd4a72dd88c46620cef40b6125ba70e945182124 Mon Sep 17 00:00:00 2001
From: stu <stu@openbsd.org>
Date: Mon, 31 Oct 2011 16:55:41 +0000
Subject: [PATCH] Tidy up Makefile, use modern ports bits, take MAINTAINER, and
 most importantly, have it use Tcl/Tk 8.5 instead of 8.4.

ok sebastia@, sthen@
---
 audio/xcd/Makefile                  | 42 ++++++++++++++---------------
 audio/xcd/patches/patch-cdplayer_cc |  8 +++---
 audio/xcd/patches/patch-xcd_in      | 12 +++++----
 audio/xcd/pkg/PLIST                 |  4 +--
 4 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index 9768dbf3cb3..f4eccbb87b9 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -1,37 +1,37 @@
-# $OpenBSD: Makefile,v 1.26 2010/10/18 16:52:47 espie Exp $
+# $OpenBSD: Makefile,v 1.27 2011/10/31 16:55:41 stu Exp $
 
-COMMENT=	Tcl/Tk CD player
-DISTNAME=	xcd-1.7
-REVISION=	2
-CATEGORIES=	audio
+COMMENT =	Tcl/Tk CD player
+DISTNAME =	xcd-1.7
+REVISION =	3
+CATEGORIES =	audio
+MAINTAINER =	Stuart Cassoff <stwo@users.sourceforge.net>
 
 # custom free license; see top of cdplayer.cc
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
 
-MODULES=	x11/tk
-WANTLIB=	c m stdc++
+WANTLIB =	c m stdc++
 
-MASTER_SITES=	${MASTER_SITE_FREEBSD_LOCAL:=jmz/}
+MASTER_SITES =	${MASTER_SITE_FREEBSD_LOCAL:=jmz/}
 
-MAKE_FLAGS=	BINDIR=${PREFIX}/bin \
+MODULES =	x11/tk
+RUN_DEPENDS =	${MODTK_RUN_DEPENDS}
+
+MAKE_FLAGS =	BINDIR=${PREFIX}/bin \
 		CDDIR=${PREFIX}/lib/xcd \
 		MANDIR=${PREFIX}/man/man1
 
-FAKE_FLAGS=	BINDIR=${WRKINST}${PREFIX}/bin \
+FAKE_FLAGS =	BINDIR=${WRKINST}${PREFIX}/bin \
 		CDDIR=${WRKINST}${PREFIX}/lib/xcd \
 		MANDIR=${WRKINST}${PREFIX}/man/man1
-WRKDIST=	${WRKDIR}/xcd
+
 USE_GROFF =	Yes
-
-MODTK_VERSION=	8.4
-RUN_DEPENDS=	${MODTK_RUN_DEPENDS}
-
-NO_REGRESS=	Yes
+NO_REGRESS =	Yes
+WRKDIST =	${WRKDIR}/xcd
 
 do-configure:
-	@perl -pi -e "s,!!WISH!!,${MODTK_BIN}," ${WRKDIST}/xcd.in
+	@${MODTCL_WISH_ADJ} ${WRKSRC}/xcd.in
 
 .include <bsd.port.mk>
diff --git a/audio/xcd/patches/patch-cdplayer_cc b/audio/xcd/patches/patch-cdplayer_cc
index 5a48378112c..355decde56c 100644
--- a/audio/xcd/patches/patch-cdplayer_cc
+++ b/audio/xcd/patches/patch-cdplayer_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-cdplayer_cc,v 1.1 2006/01/08 15:44:50 alek Exp $
---- cdplayer.cc.orig	Sun Jan  8 15:56:08 2006
-+++ cdplayer.cc	Sun Jan  8 15:56:14 2006
-@@ -29,7 +29,7 @@ private:
+$OpenBSD: patch-cdplayer_cc,v 1.2 2011/10/31 16:55:41 stu Exp $
+--- cdplayer.cc.orig	Tue Feb  2 18:28:24 1999
++++ cdplayer.cc	Sun Oct 30 13:07:48 2011
+@@ -29,7 +29,7 @@ class button { (private)
  public:
      button (char *s) {state=0; strcpy (name, s);}
      ~button () {}
diff --git a/audio/xcd/patches/patch-xcd_in b/audio/xcd/patches/patch-xcd_in
index e53b041ff28..828ff663ded 100644
--- a/audio/xcd/patches/patch-xcd_in
+++ b/audio/xcd/patches/patch-xcd_in
@@ -1,9 +1,11 @@
-$OpenBSD: patch-xcd_in,v 1.1 2006/01/08 15:44:50 alek Exp $
---- xcd.in.orig	Sun Jan  8 16:15:06 2006
-+++ xcd.in	Sun Jan  8 16:15:18 2006
-@@ -1,4 +1,4 @@
+$OpenBSD: patch-xcd_in,v 1.2 2011/10/31 16:55:41 stu Exp $
+--- xcd.in.orig	Sun Nov  1 19:01:47 1998
++++ xcd.in	Sun Oct 30 11:26:44 2011
+@@ -1,4 +1,6 @@
 -#!/usr/local/bin/wish8.0 -f
-+#!!!WISH!! -f
++#! /bin/sh
++# the next line restarts with wish \
++exec wish "$0" ${1+"$@"}
  # -*- tcl -*-
  
  #  Copyright (C) 1998 by Jean-Marc Zucconi (jmz@FreeBSD.ORG)
diff --git a/audio/xcd/pkg/PLIST b/audio/xcd/pkg/PLIST
index 8e1b03ab1f9..ba3d094b974 100644
--- a/audio/xcd/pkg/PLIST
+++ b/audio/xcd/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.6 2006/01/08 15:44:50 alek Exp $
+@comment $OpenBSD: PLIST,v 1.7 2011/10/31 16:55:41 stu Exp $
 bin/xcd
 lib/xcd/
-lib/xcd/cdplayer
+@bin lib/xcd/cdplayer
 lib/xcd/eject.xbm
 lib/xcd/eject_s.xbm
 lib/xcd/ff.xbm