From 42a8bd3089c8597c006d13e89bbb917758a56486 Mon Sep 17 00:00:00 2001 From: bland Date: Thu, 11 Oct 2007 08:42:30 +0000 Subject: Merge latest changes from FreeBSD repo. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9783 df743ca5-7f9a-e211-a948-0013205c9059 --- converters/libiconv/Makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'converters/libiconv/Makefile') diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index cdbdb8371..6dc2b375a 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -28,11 +28,16 @@ CONFIGURE_ENV= gl_cv_cc_visibility="no" MAN1= iconv.1 MAN3= iconv.3 iconv_open.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 + .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 + .if !defined(WITHOUT_EXTRA_ENCODINGS) CONFIGURE_ARGS+= --enable-extra-encodings .endif @@ -40,19 +45,12 @@ CONFIGURE_ARGS+= --enable-extra-encodings #.if defined(WITH_EXTRA_PATCHES) #PATCH_SITES+= http://www2d.biglobe.ne.jp/~msyk/software/libiconv/ #PATCH_SITES+= ${MASTER_SITE_LOCAL} -#PATCH_SITE_SUBDIR= nork +#PATCH_SITE_SUBDIR= nork #PATCHFILES+= ${DISTNAME}-cp932.patch.gz #PATCH_DIST_STRIP+= -p1 #.endif -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "libiconv has the following tunable option(s):" - @${ECHO_MSG} " WITHOUT_EXTRA_ENCODINGS=yes Disable extra character sets" -# @${ECHO_MSG} " WITH_EXTRA_PATCHES=yes Apply extra patches (fixes cp932, adds EUCJP-MS)" - @${ECHO_MSG} "" - post-patch: @${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h -.include +.include -- cgit v1.2.3