Attachment #141421 for bug #188218





PORTNAME=	eb
PORTVERSION=	4.4.3
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/}/

		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=	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}


APPENDIXDIR=	${DATADIR}/appendix

NLS_USES=		gettext
NLS_CONFIGURE_ENABLE=	nls
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




--- 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.




--- 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
 

Lines 19-27 Link Here

(-)pkg-plist (-1 / +1 lines)
19	include/eb/zio.h	19	include/eb/zio.h
20	@dirrm include/eb	20	@dirrm include/eb
21	lib/libeb.a	21	lib/libeb.a
22	lib/libeb.la
23	lib/libeb.so	22	lib/libeb.so
24	lib/libeb.so.16	23	lib/libeb.so.16
		24	lib/libeb.so.16.0.0
25	share/aclocal/eb4.m4	25	share/aclocal/eb4.m4
26	%%DATADIR%%/appendix/cencro-1.0/catalog	26	%%DATADIR%%/appendix/cencro-1.0/catalog
27	%%DATADIR%%/appendix/cencro-1.0/catalog.app	27	%%DATADIR%%/appendix/cencro-1.0/catalog.app

Return to bug 188218

Lines 3-9 Link Here

(-)Makefile (-5 / +7 lines)
3		3
4	PORTNAME= eb	4	PORTNAME= eb
5	PORTVERSION= 4.4.3	5	PORTVERSION= 4.4.3
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= japanese	7	CATEGORIES= japanese
8	MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/eb/ \	8	MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/eb/ \
9	ftp://ftp.sra.co.jp/pub/misc/eb/old/eb-${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}/	9	ftp://ftp.sra.co.jp/pub/misc/eb/old/eb-${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}/
Lines 63-70 Link Here
63	ebzip-03.html ebzip-04.html ebzip-05.html ebzip-06.html ebzip-07.html \	63	ebzip-03.html ebzip-04.html ebzip-05.html ebzip-06.html ebzip-07.html \
64	ebzip-08.html ebzip-09.html ebzip-10.html ebzip.html	64	ebzip-08.html ebzip-09.html ebzip-10.html ebzip.html
65		65
66	USE_AUTOTOOLS= libtool	66	USE_AUTOTOOLS= autoconf autoheader automake aclocal
67	USES= perl5 tar:bzip2	67	ACLOCAL_ARGS= -I ${WRKSRC}/m4
		68	USES= iconv libtool perl5 tar:bzip2
68	GNU_CONFIGURE= yes	69	GNU_CONFIGURE= yes
69	USE_LDCONFIG= yes	70	USE_LDCONFIG= yes
70	CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR}	71	CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR}
Lines 75-87 Link Here
75		76
76	APPENDIXDIR= ${DATADIR}/appendix	77	APPENDIXDIR= ${DATADIR}/appendix
77		78
78	NLS_USES= gettext iconv	79	NLS_USES= gettext
79	NLS_CONFIGURE_ENABLE= nls	80	NLS_CONFIGURE_ENABLE= nls
80	NLS_CONFIGURE_ON= \	81	NLS_CONFIGURE_ON= \
81	--with-gettext-includes=${LOCALBASE}/include \	82	--with-gettext-includes=${LOCALBASE}/include \
82	--with-gettext-libraries=${LOCALBASE}/lib \	83	--with-gettext-libraries=${LOCALBASE}/lib \
83	--with-iconv-includes=${ICONV_PREFIX}/include \	84	--with-iconv-includes=${ICONV_PREFIX}/include \
84	--with-iconv-libraries=${ICONV_PREFIX}/lib	85	--with-iconv-libraries=${ICONV_PREFIX}/lib
		86	NLS_CONFIGURE_OFF= --disable-nls
85		87
86	post-extract:	88	post-extract:
87	${RM} -fr ${WRKSRC}/zlib	89	${RM} -fr ${WRKSRC}/zlib

Lines 1-15 Link Here

(-)files/patch-eb-book.c (-15 lines)
1	--- eb/book.c.orig Sun May 29 09:42:54 2005
2	+++ eb/book.c Sun Jul 31 16:06:39 2005
3	@@ -658,8 +658,11 @@
4	error_code = EB_ERR_FAIL_READ_CAT;
5	break;
6	}
7	- if (*(buffer + 4) == '\0')
8	+ if (*(buffer + 4) == '\0') {
9	+ strcpy(subbook->sound_file_name, subbook->text_file_name);
10	+ strcpy(subbook->graphic_file_name, subbook->text_file_name);
11	continue;
12	+ }
13
14	/*
15	* Set a text file name and its compression hint.

Line 0 Link Here

(-)files/patch-m4-gettext-m4 (+80 lines)
		1	--- m4/gettext.m4.orig 2010-01-03 21:26:04.000000000 +0900
		2	+++ m4/gettext.m4 2014-04-03 10:20:12.000000000 +0900
		3	@@ -87,13 +87,19 @@
		4	save_LIBS=$LIBS
		5	CPPFLAGS="$save_CPPFLAGS $iconv_includes"
		6	LIBS="$save_LIBS $iconv_libraries"
		7	- AC_CHECK_LIB(iconv, iconv_open,
		8	- [ICONVLIBS="$iconv_libraries -liconv"; LIBS="$LIBS -liconv"])
		9	- AC_CHECK_FUNCS(iconv_open locale_charset)
		10	- AC_CHECK_HEADERS(iconv.h libcharset.h)
		11	- if test $ac_cv_func_iconv_open != no; then
		12	- ICONVINCS="$iconv_includes"
		13	- fi
		14	+ initial_LIBS="$LIBS"
		15	+ AC_SEARCH_LIBS([iconv_open],
		16	+ [iconv],
		17	+ [AS_IF([test "$LIBS" = "$initial_LIBS"],
		18	+ [AC_CHECK_HEADERS([iconv.h])
		19	+ AC_CHECK_FUNCS([iconv_open])
		20	+ ICONVLIBS="$iconv_libraries"
		21	+ ICONVINCS="$iconv_includes"],
		22	+ [AC_CHECK_LIB([charset], [locale_charset])
		23	+ AC_CHECK_HEADERS([iconv.h libcharset.h])
		24	+ AC_CHECK_FUNCS([iconv_open locale_charset])
		25	+ ICONVLIBS="$iconv_libraries -lcharset -liconv"
		26	+ ICONVINCS="$iconv_includes"])])
		27	CPPFLAGS=$save_CPPFLAGS
		28	LIBS=$save_LIBS
		29	AC_SUBST(ICONVINCS)
		30	@@ -113,10 +119,10 @@
		31	save_LIBS=$LIBS
		32
		33	dnl *
		34	- dnl * Test 1: Try to link both libintl and libiconv.
		35	+ dnl * Test 1: Try to link libc only.
		36	dnl *
		37	- CPPFLAGS="$save_CPPFLAGS $gettext_includes"
		38	- LIBS="$save_LIBS $gettext_libraries -lintl $iconv_libraries -liconv"
		39	+ CPPFLAGS="$save_CPPFLAGS"
		40	+ LIBS="$save_LIBS"
		41	AC_LINK_IFELSE([
		42	#include <stdio.h>
		43	#ifdef ENABLE_NLS
		44	@@ -143,8 +149,8 @@
		45	try_nls=yes, try_nls=no)
		46
		47	if test "$try_nls" = yes; then
		48	- INTLINCS="$gettext_includes"
		49	- INTLLIBS="$gettext_libraries -lintl $iconv_libraries -liconv"
		50	+ INTLINCS=
		51	+ INTLLIBS=
		52	fi
		53
		54	dnl *
		55	@@ -222,11 +228,11 @@
		56	fi
		57
		58	dnl *
		59	- dnl * Test 4: Try to link libc only.
		60	+ dnl * Test 4: Try to link both libintl and libiconv.
		61	dnl *
		62	if test "$try_nls" = no; then
		63	- CPPFLAGS="$save_CPPFLAGS"
		64	- LIBS="$save_LIBS"
65	+ CPPFLAGS="$save_CPPFLAGS $gettext_includes"
66	+ LIBS="$save_LIBS $gettext_libraries -lintl $iconv_libraries -liconv"
67	AC_LINK_IFELSE([
68	#include <stdio.h>
69	#ifdef ENABLE_NLS
70	@@ -253,8 +259,8 @@
71	try_nls=yes, try_nls=no)
72
73	if test "$try_nls" = yes; then
74	- INTLINCS=
75	- INTLLIBS=
76	+ INTLINCS="$gettext_includes"
77	+ INTLLIBS="$gettext_libraries -lintl $iconv_libraries -liconv"
78	fi
79	fi
80