From wg@FreeBSD.org  Fri Jul 26 12:26:32 2013
Return-Path: <wg@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 746D421B
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 26 Jul 2013 12:26:32 +0000 (UTC)
	(envelope-from wg@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 51A8826AF
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 26 Jul 2013 12:26:32 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r6QCQW23027693
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 26 Jul 2013 12:26:32 GMT
	(envelope-from wg@freefall.freebsd.org)
Received: (from wg@localhost)
	by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r6QCQWPw027692;
	Fri, 26 Jul 2013 12:26:32 GMT
	(envelope-from wg)
Message-Id: <201307261226.r6QCQWPw027692@freefall.freebsd.org>
Date: Fri, 26 Jul 2013 12:26:32 GMT
From: William Grzybowski <wg@FreeBSD.org>
Reply-To: William Grzybowski <wg@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] converters/iconv: optional perl run depend
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         180877
>Category:       ports
>Synopsis:       [PATCH] converters/iconv: optional perl run depend
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bland
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 26 12:30:00 UTC 2013
>Closed-Date:    Wed Aug 21 13:08:58 UTC 2013
>Last-Modified:  Wed Aug 21 13:10:00 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->bland 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Jul 26 12:30:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180877 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Wed Aug 21 13:08:57 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180877 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180877: commit references a PR
Date: Wed, 21 Aug 2013 13:08:52 +0000 (UTC)

 Author: wg
 Date: Wed Aug 21 13:08:44 2013
 New Revision: 325125
 URL: http://svnweb.freebsd.org/changeset/ports/325125
 
 Log:
   converters/iconv: make iconv_mktbl optional
   
   - Add a default option called CSSUTIL which installs iconv_mktbl and pulls in
     perl as a run dependency
   
   PR:		ports/180877
   Submitted by:	wg (myself)
   Approved by:	maintainer (timeout)
 
 Added:
   head/converters/iconv/files/extra-patch-ccs_Makefile   (contents, props changed)
 Modified:
   head/converters/iconv/Makefile
   head/converters/iconv/pkg-plist
 
 Modified: head/converters/iconv/Makefile
 ==============================================================================
 --- head/converters/iconv/Makefile	Wed Aug 21 13:07:03 2013	(r325124)
 +++ head/converters/iconv/Makefile	Wed Aug 21 13:08:44 2013	(r325125)
 @@ -12,7 +12,7 @@ MAINTAINER=	bland@FreeBSD.org
  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 @@ MANCOMPRESSED=	yes
  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>
 
 Added: head/converters/iconv/files/extra-patch-ccs_Makefile
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/converters/iconv/files/extra-patch-ccs_Makefile	Wed Aug 21 13:08:44 2013	(r325125)
 @@ -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
 + 
 
 Modified: head/converters/iconv/pkg-plist
 ==============================================================================
 --- head/converters/iconv/pkg-plist	Wed Aug 21 13:07:03 2013	(r325124)
 +++ head/converters/iconv/pkg-plist	Wed Aug 21 13:08:44 2013	(r325125)
 @@ -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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
