svn commit: r325125 - in head/converters/iconv: . files

[William Grzybowski]

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 at 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