Date: Wed, 18 Jun 2014 22:07:17 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358324 - in head/japanese/eb: . files Message-ID: <201406182207.s5IM7HZY096516@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Jun 18 22:07:17 2014 New Revision: 358324 URL: http://svnweb.freebsd.org/changeset/ports/358324 QAT: https://qat.redports.org/buildarchive/r358324/ Log: japanese/eb: Always set USES=iconv, move to USES+= libtool PR: 188218 Submitted by: maintainer (Yasuhiro KIMURA) Added: head/japanese/eb/files/patch-m4-gettext-m4 (contents, props changed) Deleted: head/japanese/eb/files/patch-eb-book.c Modified: head/japanese/eb/Makefile head/japanese/eb/pkg-plist Modified: head/japanese/eb/Makefile ============================================================================== --- head/japanese/eb/Makefile Wed Jun 18 22:03:34 2014 (r358323) +++ head/japanese/eb/Makefile Wed Jun 18 22:07:17 2014 (r358324) @@ -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 @@ PORTDOCS= eb-01.html eb-02.html eb-03.ht 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 +ACLOCAL_ARGS= -I ${WRKSRC}/m4 +USES= iconv libtool perl5 tar:bzip2 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR} @@ -75,13 +76,14 @@ OPTIONS_SUB= yes 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 Added: head/japanese/eb/files/patch-m4-gettext-m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/eb/files/patch-m4-gettext-m4 Wed Jun 18 22:07:17 2014 (r358324) @@ -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 <stdio.h> + #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 <stdio.h> + #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 + Modified: head/japanese/eb/pkg-plist ============================================================================== --- head/japanese/eb/pkg-plist Wed Jun 18 22:03:34 2014 (r358323) +++ head/japanese/eb/pkg-plist Wed Jun 18 22:07:17 2014 (r358324) @@ -19,9 +19,9 @@ include/eb/text.h include/eb/zio.h @dirrm include/eb lib/libeb.a -lib/libeb.la lib/libeb.so lib/libeb.so.16 +lib/libeb.so.16.0.0 share/aclocal/eb4.m4 %%DATADIR%%/appendix/cencro-1.0/catalog %%DATADIR%%/appendix/cencro-1.0/catalog.app
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406182207.s5IM7HZY096516>