ports/173986: [PATCH] converters/libiconv: Re-enable EXTRA_PATCHES option

[Takumi Takahashi]

>Number:         173986
>Category:       ports
>Synopsis:       [PATCH] converters/libiconv: Re-enable EXTRA_PATCHES option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 29 11:00:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Takumi Takahashi <takumi+ports at tmfam.com
>Release:        FreeBSD 9.1-PRERELEASE amd64
>Organization:
>Environment:
	System: FreeBSD srv.tmfam.com 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r243164: Sat Nov 17 11:17:30 JST 2012 root at srv.tmfam.com:/usr/obj/usr/src/sys/ML115 amd64
>Description:
	Re-enable EXTRA_PATCHES option.
>How-To-Repeat:
>Fix:
--- libiconv-1.14.patch begins here ---
diff -u -r -N libiconv.orig/Makefile libiconv/Makefile
--- libiconv.orig/Makefile	2012-11-29 08:33:38.057179260 +0900
+++ libiconv/Makefile	2012-11-29 08:42:00.388041078 +0900
@@ -28,8 +28,8 @@
 MAN1=		iconv.1
 MAN3=		iconv.3 iconv_open.3 iconv_open_into.3 iconv_close.3 iconvctl.3
 
-OPTIONS=	EXTRA_ENCODINGS	"Include extra character sets" on
-#		EXTRA_PATCHES	"Apply patches to fix CP932, add EUCJP-MS" off
+OPTIONS=	EXTRA_ENCODINGS	"Include extra character sets" on \
+		EXTRA_PATCHES	"Apply patches to fix CP932, add EUCJP-MS" off
 
 .ifdef USE_ICONV
 .error USE_ICONV is defined as an environment variable, or in the arguments \
@@ -42,13 +42,13 @@
 CONFIGURE_ARGS+=	--enable-extra-encodings
 .endif
 
-#.if defined(WITH_EXTRA_PATCHES)
-#PATCH_SITES+=	http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
-#PATCH_SITES+=	${MASTER_SITE_LOCAL}
-#PATCH_SITE_SUBDIR=	nork
-#PATCHFILES+=	${DISTNAME:C/1\.13\.1/1.13/}-ja-1.patch.gz
-#PATCH_DIST_STRIP+=	-p1
-#.endif
+.if defined(WITH_EXTRA_PATCHES)
+PATCH_SITES+=	http://apolloron.org/software/libiconv-1.14-ja/
+PATCH_SITES+=	${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	nork
+PATCHFILES+=	${DISTNAME}-ja-1.patch
+PATCH_DIST_STRIP+=	-p1
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
diff -u -r -N libiconv.orig/distinfo libiconv/distinfo
--- libiconv.orig/distinfo	2012-11-29 08:33:38.057179260 +0900
+++ libiconv/distinfo	2012-11-29 08:42:49.723045135 +0900
@@ -1,2 +1,4 @@
 SHA256 (libiconv-1.14.tar.gz) = 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613
 SIZE (libiconv-1.14.tar.gz) = 4984397
+SHA256 (libiconv-1.14-ja-1.patch) = f110d55d2c41c923d7f5fd3694b1c0ebc5b9acd22b725a30f3818b10afa68cda
+SIZE (libiconv-1.14-ja-1.patch) = 1463786
--- libiconv-1.14.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: