From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 3 08:10:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 ESMTPS id 3AFC8627 for ; Thu, 3 Apr 2014 08:10:01 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 10511942 for ; Thu, 3 Apr 2014 08:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s338A0uO021028 for ; Thu, 3 Apr 2014 08:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s338A0Q2021027; Thu, 3 Apr 2014 08:10:00 GMT (envelope-from gnats) Resent-Date: Thu, 3 Apr 2014 08:10:00 GMT Resent-Message-Id: <201404030810.s338A0Q2021027@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yasuhiro KIMURA 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 ESMTPS id A1BC02C2 for ; Thu, 3 Apr 2014 08:05:37 +0000 (UTC) Received: from gate.utahime.jp (ipq210.utahime.jp [183.180.29.210]) by mx1.freebsd.org (Postfix) with ESMTP id 432C891C for ; Thu, 3 Apr 2014 08:05:33 +0000 (UTC) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) by gate.utahime.jp (Postfix) with ESMTP id CCF584E62A; Thu, 3 Apr 2014 17:00:02 +0900 (JST) Received: from eastasia.home.utahime.org (localhost [127.0.0.1]) by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id 9AE5575922; Thu, 3 Apr 2014 17:00:02 +0900 (JST) Received: from rolling-vm-freebsd1.home.utahime.org (rolling-vm-freebsd1.home.utahime.org [192.168.174.51]) by eastasia.home.utahime.org (Postfix) with ESMTP id 7F30675923; Thu, 3 Apr 2014 17:00:02 +0900 (JST) Received: by rolling-vm-freebsd1.home.utahime.org (Postfix, from userid 1000) id 77CB9EC931; Thu, 3 Apr 2014 17:00:02 +0900 (JST) Message-Id: <20140403080002.77CB9EC931@rolling-vm-freebsd1.home.utahime.org> Date: Thu, 3 Apr 2014 17:00:02 +0900 (JST) From: Yasuhiro KIMURA To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/188218: [MAINTAINER] japanese/ja-eb: Always set 'USES=iconv' etc. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2014 08:10:01 -0000 >Number: 188218 >Category: ports >Synopsis: [MAINTAINER] japanese/ja-eb: Always set 'USES=iconv' etc. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Apr 03 08:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Yasuhiro KIMURA >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD xxxx 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260673: Tue Apr 1 21:41:08 >Description: - Alway set 'USES=iconv' because iconv is required regardless of NLS option. - Change detection order of iconv so base iconv is preferred to libiconv. - Remove file/patch-eb-book.c. Generated with FreeBSD Port Tools 1.00.2014.03.23 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- ja-eb-4.4.3.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 349976) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= eb PORTVERSION= 4.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/eb/ \ ftp://ftp.sra.co.jp/pub/misc/eb/old/eb-${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}/ @@ -63,8 +63,9 @@ ebzip-03.html ebzip-04.html ebzip-05.html ebzip-06.html ebzip-07.html \ ebzip-08.html ebzip-09.html ebzip-10.html ebzip.html -USE_AUTOTOOLS= libtool -USES= perl5 tar:bzip2 +USE_AUTOTOOLS= autoconf autoheader automake aclocal libtool +ACLOCAL_ARGS= -I ${WRKSRC}/m4 +USES= iconv perl5 tar:bzip2 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR} @@ -75,13 +76,14 @@ APPENDIXDIR= ${DATADIR}/appendix -NLS_USES= gettext iconv +NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -NLS_CONFIGURE_ON= \ +NLS_CONFIGURE_ON= \ --with-gettext-includes=${LOCALBASE}/include \ --with-gettext-libraries=${LOCALBASE}/lib \ --with-iconv-includes=${ICONV_PREFIX}/include \ --with-iconv-libraries=${ICONV_PREFIX}/lib +NLS_CONFIGURE_OFF= --disable-nls post-extract: ${RM} -fr ${WRKSRC}/zlib Index: files/patch-eb-book.c =================================================================== --- files/patch-eb-book.c (revision 349976) +++ files/patch-eb-book.c (working copy) @@ -1,15 +0,0 @@ ---- eb/book.c.orig Sun May 29 09:42:54 2005 -+++ eb/book.c Sun Jul 31 16:06:39 2005 -@@ -658,8 +658,11 @@ - error_code = EB_ERR_FAIL_READ_CAT; - break; - } -- if (*(buffer + 4) == '\0') -+ if (*(buffer + 4) == '\0') { -+ strcpy(subbook->sound_file_name, subbook->text_file_name); -+ strcpy(subbook->graphic_file_name, subbook->text_file_name); - continue; -+ } - - /* - * Set a text file name and its compression hint. Index: files/patch-m4-gettext-m4 =================================================================== --- files/patch-m4-gettext-m4 (revision 0) +++ files/patch-m4-gettext-m4 (working copy) @@ -0,0 +1,80 @@ +--- m4/gettext.m4.orig 2010-01-03 21:26:04.000000000 +0900 ++++ m4/gettext.m4 2014-04-03 10:20:12.000000000 +0900 +@@ -87,13 +87,19 @@ + save_LIBS=$LIBS + CPPFLAGS="$save_CPPFLAGS $iconv_includes" + LIBS="$save_LIBS $iconv_libraries" +- AC_CHECK_LIB(iconv, iconv_open, +- [ICONVLIBS="$iconv_libraries -liconv"; LIBS="$LIBS -liconv"]) +- AC_CHECK_FUNCS(iconv_open locale_charset) +- AC_CHECK_HEADERS(iconv.h libcharset.h) +- if test $ac_cv_func_iconv_open != no; then +- ICONVINCS="$iconv_includes" +- fi ++ initial_LIBS="$LIBS" ++ AC_SEARCH_LIBS([iconv_open], ++ [iconv], ++ [AS_IF([test "$LIBS" = "$initial_LIBS"], ++ [AC_CHECK_HEADERS([iconv.h]) ++ AC_CHECK_FUNCS([iconv_open]) ++ ICONVLIBS="$iconv_libraries" ++ ICONVINCS="$iconv_includes"], ++ [AC_CHECK_LIB([charset], [locale_charset]) ++ AC_CHECK_HEADERS([iconv.h libcharset.h]) ++ AC_CHECK_FUNCS([iconv_open locale_charset]) ++ ICONVLIBS="$iconv_libraries -lcharset -liconv" ++ ICONVINCS="$iconv_includes"])]) + CPPFLAGS=$save_CPPFLAGS + LIBS=$save_LIBS + AC_SUBST(ICONVINCS) +@@ -113,10 +119,10 @@ + save_LIBS=$LIBS + + dnl * +- dnl * Test 1: Try to link both libintl and libiconv. ++ dnl * Test 1: Try to link libc only. + dnl * +- CPPFLAGS="$save_CPPFLAGS $gettext_includes" +- LIBS="$save_LIBS $gettext_libraries -lintl $iconv_libraries -liconv" ++ CPPFLAGS="$save_CPPFLAGS" ++ LIBS="$save_LIBS" + AC_LINK_IFELSE([ + #include + #ifdef ENABLE_NLS +@@ -143,8 +149,8 @@ + try_nls=yes, try_nls=no) + + if test "$try_nls" = yes; then +- INTLINCS="$gettext_includes" +- INTLLIBS="$gettext_libraries -lintl $iconv_libraries -liconv" ++ INTLINCS= ++ INTLLIBS= + fi + + dnl * +@@ -222,11 +228,11 @@ + fi + + dnl * +- dnl * Test 4: Try to link libc only. ++ dnl * Test 4: Try to link both libintl and libiconv. + dnl * + if test "$try_nls" = no; then +- CPPFLAGS="$save_CPPFLAGS" +- LIBS="$save_LIBS" ++ CPPFLAGS="$save_CPPFLAGS $gettext_includes" ++ LIBS="$save_LIBS $gettext_libraries -lintl $iconv_libraries -liconv" + AC_LINK_IFELSE([ + #include + #ifdef ENABLE_NLS +@@ -253,8 +259,8 @@ + try_nls=yes, try_nls=no) + + if test "$try_nls" = yes; then +- INTLINCS= +- INTLLIBS= ++ INTLINCS="$gettext_includes" ++ INTLLIBS="$gettext_libraries -lintl $iconv_libraries -liconv" + fi + fi + Property changes on: files/patch-m4-gettext-m4 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property --- ja-eb-4.4.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: