aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--converters/libiconv/Makefile32
-rw-r--r--converters/libiconv/distinfo2
2 files changed, 17 insertions, 17 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index ddec8effa5a0..bdc415cb8f7a 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: libiconv
-# Date created: 17 July 2000
-# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= libiconv
PORTVERSION= 1.14
@@ -28,29 +24,31 @@ MAKE_JOBS_UNSAFE= yes
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_DEFINE= ENCODINGS PATCHES
+OPTIONS_DEFAULT=ENCODINGS
+ENCODINGS_DESC= Include extra character sets
+PATCHES_DESC= Apply patches to fix CP932, add EUCJP-MS
.ifdef USE_ICONV
.error USE_ICONV is defined as an environment variable, or in the arguments \
to "make". Please unset it and restart the build.
.endif
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_EXTRA_ENCODINGS)
+.if ${PORT_OPTIONS:MENCODINGS}
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 ${PORT_OPTIONS:MPATCHES}
+PATCH_SITES+= http://apolloron.org/software/libiconv-1.14-ja/
+PATCH_SITES+= ${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR+= kwm
+PATCHFILES+= ${DISTNAME}-ja-1.patch.gz
+PATCH_DIST_STRIP+= -p1
+.endif
post-patch:
@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index 692f78bac944..57fd4d50a5dc 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -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.gz) = cb82aa499b028a34d61fde1c3aa41f106cddf4a25d7c778a0180d633808d7cf9
+SIZE (libiconv-1.14-ja-1.patch.gz) = 291963