Date: Fri, 26 Jul 2013 12:26:32 GMT From: William Grzybowski <wg@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/180877: [PATCH] converters/iconv: optional perl run depend Message-ID: <201307261226.r6QCQWPw027692@freefall.freebsd.org> Resent-Message-ID: <201307261230.r6QCU0RH027808@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180877 >Category: ports >Synopsis: [PATCH] converters/iconv: optional perl run depend >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jul 26 12:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: William Grzybowski >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r251226: Sat Jun 1 21:56:43 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64 >Description: Currently perl is a run dependency due to iconv_mktbl which is written in perl. Proposed patch add an option to do not install it, leaving us free of perl as run dependency. I also removed the PROFILE plist sub which is not used. >How-To-Repeat: >Fix: See attached patch --- iconv.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 323528) +++ Makefile (working copy) @@ -12,7 +12,7 @@ COMMENT= Charset conversion library and utilities USES= shebangfix -USE_PERL5= yes +USE_PERL5_BUILD=yes USE_LDCONFIG= yes SHEBANG_FILES= iconv_builtin ccs/iconv_mktbl @@ -20,10 +20,19 @@ MAN1= biconv.1 MAN3= biconv.3 biconv_open.3 biconv_close.3 -.if defined(NO_PROFILE) || defined(NOPROFILE) || defined(WITHOUT_PROFILE) -PLIST_SUB= PROFILE:="@comment " +OPTIONS_DEFINE= CCSUTIL +OPTIONS_DEFAULT=CCSUTIL + +OPTIONS_SUB= yes + +CCSUTIL_DESC= Install Coded character set (CCS) util + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MCCSUTIL} +USE_PERL5_RUN= yes .else -PLIST_SUB= PROFILE:="" +EXTRA_PATCHES= ${FILESDIR}/extra-patch-ccs_Makefile .endif .include <bsd.port.mk> Index: files/extra-patch-ccs_Makefile =================================================================== --- files/extra-patch-ccs_Makefile (revision 0) +++ files/extra-patch-ccs_Makefile (working copy) @@ -0,0 +1,13 @@ +diff --git ccs/Makefile ccs/Makefile +index b61420c..faffe0f 100644 +--- ccs/Makefile ++++ ccs/Makefile +@@ -67,8 +67,6 @@ beforeinstall: + cd ${.CURDIR}; \ + ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 444 \ + ${INSTALLFLAGS} ${CHARSETS_TBL} ${DESTDIR}${TABLEDIR}; \ +- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ +- iconv_mktbl ${DESTDIR}${BINDIR} + + CLEANFILES += *.c *.cct + Property changes on: files/extra-patch-ccs_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 323528) +++ pkg-plist (working copy) @@ -1,10 +1,10 @@ bin/biconv -bin/iconv_mktbl +%%CCSUTIL%%bin/iconv_mktbl include/biconv.h lib/libbiconv.a lib/libbiconv.so lib/libbiconv.so.2 -%%PROFILE:%%lib/libbiconv_p.a +lib/libbiconv_p.a libexec/iconv/euc-jp.so libexec/iconv/euc-kr.so libexec/iconv/euc-tw.so --- iconv.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307261226.r6QCQWPw027692>