From 6ce2b617094ff37282d2e669d3e343ca24f9a209 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Fri, 17 Sep 2010 07:31:36 +0000 Subject: [PATCH] - Desupport USE_CDRTOOLS=cjk PR: ports/150362 Submitted by: marius --- Mk/bsd.port.mk | 9 +-------- UPDATING | 7 +++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index c51b18177be2..3d2f8d097676 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -539,9 +539,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org ## # USE_APACHE - If set, this port relies on an apache webserver. # -# USE_CDRTOOLS - If set, this port depends on sysutils/cdrtools, unless -# cdrtools-cjk is present or USE_CDRTOOLS=cjk is set, then -# it depends on sysutils/cdrtools-cjk. +# USE_CDRTOOLS - If set, this port depends on sysutils/cdrtools. # # Conflict checking. Use if your port cannot be installed at the same time as # another package. @@ -2238,14 +2236,9 @@ RUN_DEPENDS+= gs:${PORTSDIR}/${GHOSTSCRIPT_PORT} # Set up the cdrtools. .if defined(USE_CDRTOOLS) -.if exists(${DOCSDIR}/cdrtools-cjk/README) || defined(WITH_CJK) || ${USE_CDRTOOLS:L} == "cjk" -BUILD_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk -RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk -.else BUILD_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools .endif -.endif # Macro for doing in-place file editing using regexps REINPLACE_ARGS?= -i.bak diff --git a/UPDATING b/UPDATING index d3ab28821ea6..d22fe9861087 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,13 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20100917: + AFFECTS: users of sysutils/cdrtools-cjk + AUTHOR: marius@FreeBSD.org + + sysutils/cdrtools-cjk port has been removed, as the required functionality is + now available in cdrtools 3.0.0 in the standard sysutils/cdrtools port. + 20100915: AFFECTS: autoconf, automake AUTHOR: autotools@FreeBSD.org