Date: Tue, 7 Sep 2010 21:25:36 +0200 (CEST) From: Marius Strobl <marius@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/150362: Mk/bsd.port.mk: remove support for support for USE_CDRTOOLS=cjk in preparation for updating sysutils/cdrtools to 3.00 Message-ID: <201009071925.o87JPaeH029287@alchemy.franken.de> Resent-Message-ID: <201009071940.o87Je2Mh065888@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 150362
>Category: ports
>Synopsis: Mk/bsd.port.mk: remove support for support for USE_CDRTOOLS=cjk in preparation for updating sysutils/cdrtools to 3.00
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 07 19:40:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Marius Strobl
>Release:
>Organization:
>Environment:
>Description:
With cdrtools 3.00 the sysutils/cdrtools-cjk slave-port is obsolete
as mkisofs now employs iconv for character conversion. This means
that in preparation for updating sysutils/cdrtools 3.00 support for
USE_CDRTOOLS=cjk as well as USE_CDRTOOLS together with the WITH_CJK
knob in order to depend on sysutils/cdrtools-cjk instead of
sysutils/cdrtools needs to be removed from bsd.port.mk. Ideally both
the update of sysutils/cdrtools and bsd.port.mk should be comitted
atomically of course, but I assume that portmgr@ is not interested
in committing port updates and other committers are not allowed to
touch bsd.port.mk.
>How-To-Repeat:
>Fix:
Please resolve conflicts in the UPDATING part of the below patch
and update the date as needed.
Index: UPDATING
===================================================================
RCS file: /usr/data/bsd/cvs/fbsd/ports/UPDATING,v
retrieving revision 1.965
diff -u -r1.965 UPDATING
--- UPDATING 7 Sep 2010 14:30:02 -0000 1.965
+++ UPDATING 7 Sep 2010 18:39:11 -0000
@@ -5,6 +5,16 @@
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+2010XXYY:
+ AFFECTS: users of sysutils/cdrtools-cjk
+ AUTHOR: marius@FreeBSD.org
+
+ In preparation for updating sysutils/cdrtools to 3.00, which obsoletes
+ sysutils/cdrtools-cjk as mkisofs now employs iconv for character
+ conversion, support for USE_CDRTOOLS=cjk as well as USE_CDRTOOLS together
+ with the WITH_CJK knob in order to depend on sysutils/cdrtools-cjk
+ instead of sysutils/cdrtools has been removed from bsd.port.mk.
+
20100907
AFFECTS: sysutils/pecl-fileinfo
AUTHOR: ale@FreeBSD.org
Index: Mk/bsd.port.mk
===================================================================
RCS file: /usr/data/bsd/cvs/fbsd/ports/Mk/bsd.port.mk,v
retrieving revision 1.644
diff -u -r1.644 bsd.port.mk
--- Mk/bsd.port.mk 20 Aug 2010 12:15:02 -0000 1.644
+++ Mk/bsd.port.mk 7 Sep 2010 15:38:27 -0000
@@ -535,9 +535,7 @@
##
# 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.
@@ -2214,14 +2212,9 @@
# 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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009071925.o87JPaeH029287>