Date: Tue, 20 Mar 2007 12:56:33 +0100 (CET) From: Martin Tournoij <carpetsmoker@xs4all.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/110582: [PATCH] audio/xcd - Update to TCL/YK 8.4 Message-ID: <20070320115633.DCFD3B82A@mail.rwxrwxrwx.net> Resent-Message-ID: <200703201200.l2KC0F84076832@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110582
>Category: ports
>Synopsis: [PATCH] audio/xcd - Update to TCL/YK 8.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 20 12:00:14 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Martin Tournoij
>Release: FreeBSD 6.2-RELEASE-p1 i386
>Organization:
>Environment:
FreeBSD glitch.carpetsmoker.net 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #0: Thu Feb 15 20:56:16 CET 2007 carpetsmoker@glitch.carpetsmoker.net:/usr/obj/nfs/tinderbox/jails/6.2/src/sys/GENERICri386
>Description:
- Update to TCL/TK 8.4
>How-To-Repeat:
>Fix:
--- patch-xcd begins here ---
diff -urN /ports/audio/xcd/Makefile ./Makefile
--- /ports/audio/xcd/Makefile Fri Mar 7 06:56:06 2003
+++ ./Makefile Tue Mar 20 07:59:24 2007
@@ -7,16 +7,33 @@
PORTNAME= xcd
PORTVERSION= 1.7
-CATEGORIES= audio tk82
+PORTREVISION= 1
+CATEGORIES= audio tk84
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jmz
MAINTAINER= jmz@FreeBSD.org
COMMENT= A Tcl/Tk CD player
-RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
-
+USE_TK= yes
WRKSRC= ${WRKDIR}/xcd
MAN1= xcd.1
+
+.if !defined(WITH_CDROM_PLAYER)
+WITH_CDROM_PLAYER= acd0
+.endif
+
+pre-extract:
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} "You can define WITH_CDROM_PLAYER to set the default CD/DVD player"
+ @${ECHO_CMD} "Default: acd0"
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} "Use the CDPLAYER environment variable to override it."
+ @${ECHO_CMD} ""
+
+post-patch:
+ @${REINPLACE_CMD} 's|cd0c|${WITH_CDROM_PLAYER}|' ${WRKSRC}/cdplayer.cc
+ @${REINPLACE_CMD} 's|/usr/local/bin/wish8.0|${WISH}|' ${WRKSRC}/xcd.in
+ @${REINPLACE_CMD} 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile
.include <bsd.port.mk>
diff -urN /ports/audio/xcd/scripts/configure ./scripts/configure
--- /ports/audio/xcd/scripts/configure Sun Nov 28 19:17:25 1999
+++ ./scripts/configure Thu Jan 1 01:00:00 1970
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-cd $WRKSRC || exit 1;
-
-cat >> Makefile << END
-
-BINDIR = $PREFIX/bin
-CDDIR = $PREFIX/lib/xcd
-MANDIR = $PREFIX/man/man1
-
-END
-
-mv xcd.in xcd.in~
-sed -e 's/wish8\.0/wish8.2/' < xcd.in~ > xcd.in
-exit 0;
--- patch-xcd ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070320115633.DCFD3B82A>