Update eb to 4.1.1.

Changes since 3.3.4 are:

* Accept remote access.
* Adopt BSD license.
* Include only Japanese HTML documents (English documents are removed!).
* Accept Japanese encodings other than EUC-JP.
* Improve EB_BookList API.
* Many bug fixes.

While here, enable pkgviews installation.

7 files changed, 88 insertions, 165 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index e8be700f04f..cc1a46cb5b4 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7927 2004/11/20 12:47:40 rh Exp $
+$NetBSD: CHANGES,v 1.7928 2004/11/20 16:00:35 uebayasi Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -5356,3 +5356,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Added p5-Log-LogLite-0.82 [minskim 2004-11-20]
 	Updated cgoban-java to 2.6.7 [rh 2004-11-20]
 	Added RealPlayerGold-10.0.1 [rh 2004-11-20]
+	Updated eb to 4.1.1 [uebayasi 2004-11-20]
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index bd59ff950d4..9ed8bed9a05 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/10/03 00:18:19 tv Exp $
+# $NetBSD: Makefile,v 1.22 2004/11/20 16:00:35 uebayasi Exp $
 # FreeBSD Id: ports/japanese/eb/Makefile,v 1.21 2000/08/21 03:39:42 kevlo Exp
 #
 
-DISTNAME=	eb-3.3.4
-PKGREVISION=	1
+DISTNAME=	eb-4.1.1
 CATEGORIES=	textproc japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/appendix/ \
 		ftp://ftp.sra.co.jp/pub/misc/eb/
@@ -52,17 +51,14 @@ EB_APPENDICES=	\
 EXTRACT_ONLY=	${EB_DISTFILES}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
-USE_MAKEINFO=	YES
-INFO_FILES=	eb-ja.info ebfont-ja.info ebfont.info ebinfo-ja.info
-INFO_FILES+=	ebinfo.info ebrefile-ja.info ebrefile.info ebzip-ja.info
-INFO_FILES+=	ebzip.info
-
 CONFIGURE_ARGS+=	--with-zlib
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
@@ -71,6 +67,14 @@ CONF_FILES=		${EGDIR}/eb.conf.default ${PKG_SYSCONFDIR}/eb.conf
 EB_APPENDIXDIR=	${PREFIX}/share/eb/appendix
 EGDIR=		${PREFIX}/share/examples/eb/
 
+# XXX Better than having unflexible/static patches.  IMO.
+# -    ZLIBLIBS="-L$z_libdir -lz"
+# +    ZLIBLIBS="-Wl,-R$z_libdir -L$z_libdir -lz"
+SUBST_CLASSES=		dynlink
+SUBST_STAGE.dynlink=	post-patch
+SUBST_FILES.dynlink=	configure configure.ac
+SUBST_SED.dynlink=	-e 's|^\(.*LIBS=.\)-L\(\$$[^[:blank:]][^[:blank:]]*\)\(.*\)$$|\1-Wl,-R\2 -L\2\3|'
+
 post-extract:
 	${RM} -rf ${WRKSRC}/zlib
 
diff --git a/textproc/eb/buildlink3.mk b/textproc/eb/buildlink3.mk
index 3482b1ffbf9..f24a8a1c31a 100644
--- a/textproc/eb/buildlink3.mk
+++ b/textproc/eb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:19 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/11/20 16:00:35 uebayasi Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EB_BUILDLINK3_MK:=	${EB_BUILDLINK3_MK}+
@@ -10,8 +10,13 @@ BUILDLINK_DEPENDS+=	eb
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Neb}
 BUILDLINK_PACKAGES+=	eb
 
+# XXX We need something generic.
+.include "../../mk/bsd.prefs.mk"
+PKG_SYSCONFDIR.eb!=	${PKG_INFO} -B eb | \
+			sed -ne '/^PKG_SYSCONFDIR/ { s/^PKG_SYSCONFDIR=//; p; }'
+
 .if !empty(EB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.eb+=	eb>=3.3.2nb1
+BUILDLINK_DEPENDS.eb+=		eb>=3.3.2nb1
 BUILDLINK_RECOMMENDED.eb+=	eb>=3.3.4nb1
 BUILDLINK_PKGSRCDIR.eb?=	../../textproc/eb
 .endif	# EB_BUILDLINK3_MK
diff --git a/textproc/eb/distinfo b/textproc/eb/distinfo
index 5e6c5910db4..661a285d911 100644
--- a/textproc/eb/distinfo
+++ b/textproc/eb/distinfo
@@ -1,71 +1,68 @@
-$NetBSD: distinfo,v 1.10 2004/03/28 12:47:42 uebayasi Exp $
+$NetBSD: distinfo,v 1.11 2004/11/20 16:00:35 uebayasi Exp $
 
-SHA1 (eb-3.3.4/eb-3.3.4.tar.gz) = 8dda7d5e244be71669bb4d336ba108784739ba69
-Size (eb-3.3.4/eb-3.3.4.tar.gz) = 1059932 bytes
-SHA1 (eb-3.3.4/LIST) = 9c059b159f624b8f962daa695d52f60598ba1a3e
-Size (eb-3.3.4/LIST) = 11210 bytes
-SHA1 (eb-3.3.4/LIST-ja) = b9278c27bcf952aa84812c4c9440bb1b2fd2561a
-Size (eb-3.3.4/LIST-ja) = 13396 bytes
-SHA1 (eb-3.3.4/cencro-1.0.tar.gz) = 3b5c692fc8273e0e61c6b28e29a30875d9f609ad
-Size (eb-3.3.4/cencro-1.0.tar.gz) = 1666 bytes
-SHA1 (eb-3.3.4/chujiten-2.3.tar.gz) = 7d995a898666ab611e58d3d0087df0c1a62938d1
-Size (eb-3.3.4/chujiten-2.3.tar.gz) = 2133 bytes
-SHA1 (eb-3.3.4/chujiten2-2.0.tar.gz) = 0e697a713963ae09d54ade5a981e66042af32d69
-Size (eb-3.3.4/chujiten2-2.0.tar.gz) = 2629 bytes
-SHA1 (eb-3.3.4/chujiten6-2.3.tar.gz) = 08fd4efcc9035a5fef4cc0cf30f0a66bf0cd8a1e
-Size (eb-3.3.4/chujiten6-2.3.tar.gz) = 2868 bytes
-SHA1 (eb-3.3.4/colloc-2.0.tar.gz) = 48159f17792416d55b5055b7b02136e756357a3b
-Size (eb-3.3.4/colloc-2.0.tar.gz) = 1313 bytes
-SHA1 (eb-3.3.4/crownfj-2.0.tar.gz) = 19317cc4c0391ee0c6f95f552b1c47a56c4484f5
-Size (eb-3.3.4/crownfj-2.0.tar.gz) = 4463 bytes
-SHA1 (eb-3.3.4/crownfj2-1.0.tar.gz) = 04fb0ebd074a51091d8e45000ac429fafcbd6168
-Size (eb-3.3.4/crownfj2-1.0.tar.gz) = 2164 bytes
-SHA1 (eb-3.3.4/crowngj-1.0.tar.gz) = 2d3318c878cba97f8d2b31e42025f2d9e7651306
-Size (eb-3.3.4/crowngj-1.0.tar.gz) = 2155 bytes
-SHA1 (eb-3.3.4/daihyakka-1.0.tar.gz) = 99ad06bb7dcd68ea6713f5d9d71ecc567f9bb2cd
-Size (eb-3.3.4/daihyakka-1.0.tar.gz) = 3748 bytes
-SHA1 (eb-3.3.4/daijirin-2.0.tar.gz) = 0a4dd911fb196155fae32904873bd3a21060f4d5
-Size (eb-3.3.4/daijirin-2.0.tar.gz) = 2095 bytes
-SHA1 (eb-3.3.4/dd75-2.0.tar.gz) = f2a0141a259bcaeddb972d2b228fa1ed8e712c37
-Size (eb-3.3.4/dd75-2.0.tar.gz) = 4062 bytes
-SHA1 (eb-3.3.4/gendai2000-1.0.tar.gz) = 030c72e8bfccad041551c95d9c95c6e29e80f12b
-Size (eb-3.3.4/gendai2000-1.0.tar.gz) = 1063 bytes
-SHA1 (eb-3.3.4/genius-1.0.tar.gz) = 4dc04040ee19ed5d0817015db8b621fc4ead9b46
-Size (eb-3.3.4/genius-1.0.tar.gz) = 2241 bytes
-SHA1 (eb-3.3.4/genius2-1.1.tar.gz) = 16b3b16aa30f42088074f006b3103a9aad47e56e
-Size (eb-3.3.4/genius2-1.1.tar.gz) = 887 bytes
-SHA1 (eb-3.3.4/global-2.0.tar.gz) = e7df085181d795ade8e1e743e05a56d15119db06
-Size (eb-3.3.4/global-2.0.tar.gz) = 4034 bytes
-SHA1 (eb-3.3.4/heritage-2.2.tar.gz) = 32f22976e72f214dbed0322f20f6f5d1a6a3cc3f
-Size (eb-3.3.4/heritage-2.2.tar.gz) = 3968 bytes
-SHA1 (eb-3.3.4/izumi-2.0.tar.gz) = e1d549957568ddaa9678bdee8d1bf1c964ac1edc
-Size (eb-3.3.4/izumi-2.0.tar.gz) = 984 bytes
-SHA1 (eb-3.3.4/jitenban-2.4.tar.gz) = 0b6196e3ffc18d8c52faf444a853254b2e73a774
-Size (eb-3.3.4/jitenban-2.4.tar.gz) = 7459 bytes
-SHA1 (eb-3.3.4/jitenban97-2.1.tar.gz) = 9b6398485fb39f4c6a18b567625fc61d158f122b
-Size (eb-3.3.4/jitenban97-2.1.tar.gz) = 6866 bytes
-SHA1 (eb-3.3.4/kanjigen-2.0.tar.gz) = 9543df9017a2186b1a0cec7ad86ef9ee6d695252
-Size (eb-3.3.4/kanjigen-2.0.tar.gz) = 2046 bytes
-SHA1 (eb-3.3.4/kanjigen2-2.0.tar.gz) = 5c936d603cfca33473cc6da0d6b5ed531ca8f715
-Size (eb-3.3.4/kanjigen2-2.0.tar.gz) = 897 bytes
-SHA1 (eb-3.3.4/kojien-2.3.tar.gz) = c5b2bc7252da585d5c613d9c8d807cb1e5de17f2
-Size (eb-3.3.4/kojien-2.3.tar.gz) = 2008 bytes
-SHA1 (eb-3.3.4/kojien2-2.0.tar.gz) = 086809041f34c2d24c274010f79469eb46cbf110
-Size (eb-3.3.4/kojien2-2.0.tar.gz) = 4526 bytes
-SHA1 (eb-3.3.4/kojien4-2.2.tar.gz) = c522c7e0e2af47ec12d623085f9bea5393faec74
-Size (eb-3.3.4/kojien4-2.2.tar.gz) = 2272 bytes
-SHA1 (eb-3.3.4/oxford-2.0.tar.gz) = 27765bdc6fe71e1033b69a9add09bc6c7d435ad0
-Size (eb-3.3.4/oxford-2.0.tar.gz) = 3849 bytes
-SHA1 (eb-3.3.4/plus-2.0.tar.gz) = 28dc0dd9d58a1d8b864858b82388e0f2fb406a0a
-Size (eb-3.3.4/plus-2.0.tar.gz) = 3632 bytes
-SHA1 (eb-3.3.4/readers-2.2.tar.gz) = b8948b2f466cd017cc71d418ab2a96edce59ad00
-Size (eb-3.3.4/readers-2.2.tar.gz) = 2194 bytes
-SHA1 (eb-3.3.4/readers2-2.0.tar.gz) = 08f6dc279a09ef1094d1b36152c857f6e3890d84
-Size (eb-3.3.4/readers2-2.0.tar.gz) = 2698 bytes
-SHA1 (eb-3.3.4/ruigigo-1.0.tar.gz) = a50a361e2d022919672ffe08fc1875c1913f7d77
-Size (eb-3.3.4/ruigigo-1.0.tar.gz) = 1326 bytes
-SHA1 (eb-3.3.4/superdic98-1.0.tar.gz) = 4e74ecf887e0c1cf257b718d0e0922d03dfe8138
-Size (eb-3.3.4/superdic98-1.0.tar.gz) = 5252 bytes
-SHA1 (patch-aa) = 9dde77605b151e22c0b0ea96cb9d58788d259360
-SHA1 (patch-ab) = c135fd66475eac600226b672e7963b696720a3cf
-SHA1 (patch-ac) = 1b3dabf92cf820dbb5d56e6384502366b2e9a314
+SHA1 (eb-4.1.1/eb-4.1.1.tar.gz) = f84ec64262c8d95189ec19452c307c6cadeaec78
+Size (eb-4.1.1/eb-4.1.1.tar.gz) = 1051857 bytes
+SHA1 (eb-4.1.1/LIST) = 9c059b159f624b8f962daa695d52f60598ba1a3e
+Size (eb-4.1.1/LIST) = 11210 bytes
+SHA1 (eb-4.1.1/LIST-ja) = b9278c27bcf952aa84812c4c9440bb1b2fd2561a
+Size (eb-4.1.1/LIST-ja) = 13396 bytes
+SHA1 (eb-4.1.1/cencro-1.0.tar.gz) = 3b5c692fc8273e0e61c6b28e29a30875d9f609ad
+Size (eb-4.1.1/cencro-1.0.tar.gz) = 1666 bytes
+SHA1 (eb-4.1.1/chujiten-2.3.tar.gz) = 7d995a898666ab611e58d3d0087df0c1a62938d1
+Size (eb-4.1.1/chujiten-2.3.tar.gz) = 2133 bytes
+SHA1 (eb-4.1.1/chujiten2-2.0.tar.gz) = 0e697a713963ae09d54ade5a981e66042af32d69
+Size (eb-4.1.1/chujiten2-2.0.tar.gz) = 2629 bytes
+SHA1 (eb-4.1.1/chujiten6-2.3.tar.gz) = 08fd4efcc9035a5fef4cc0cf30f0a66bf0cd8a1e
+Size (eb-4.1.1/chujiten6-2.3.tar.gz) = 2868 bytes
+SHA1 (eb-4.1.1/colloc-2.0.tar.gz) = 48159f17792416d55b5055b7b02136e756357a3b
+Size (eb-4.1.1/colloc-2.0.tar.gz) = 1313 bytes
+SHA1 (eb-4.1.1/crownfj-2.0.tar.gz) = 19317cc4c0391ee0c6f95f552b1c47a56c4484f5
+Size (eb-4.1.1/crownfj-2.0.tar.gz) = 4463 bytes
+SHA1 (eb-4.1.1/crownfj2-1.0.tar.gz) = 04fb0ebd074a51091d8e45000ac429fafcbd6168
+Size (eb-4.1.1/crownfj2-1.0.tar.gz) = 2164 bytes
+SHA1 (eb-4.1.1/crowngj-1.0.tar.gz) = 2d3318c878cba97f8d2b31e42025f2d9e7651306
+Size (eb-4.1.1/crowngj-1.0.tar.gz) = 2155 bytes
+SHA1 (eb-4.1.1/daihyakka-1.0.tar.gz) = 99ad06bb7dcd68ea6713f5d9d71ecc567f9bb2cd
+Size (eb-4.1.1/daihyakka-1.0.tar.gz) = 3748 bytes
+SHA1 (eb-4.1.1/daijirin-2.0.tar.gz) = 0a4dd911fb196155fae32904873bd3a21060f4d5
+Size (eb-4.1.1/daijirin-2.0.tar.gz) = 2095 bytes
+SHA1 (eb-4.1.1/dd75-2.0.tar.gz) = f2a0141a259bcaeddb972d2b228fa1ed8e712c37
+Size (eb-4.1.1/dd75-2.0.tar.gz) = 4062 bytes
+SHA1 (eb-4.1.1/gendai2000-1.0.tar.gz) = 030c72e8bfccad041551c95d9c95c6e29e80f12b
+Size (eb-4.1.1/gendai2000-1.0.tar.gz) = 1063 bytes
+SHA1 (eb-4.1.1/genius-1.0.tar.gz) = 4dc04040ee19ed5d0817015db8b621fc4ead9b46
+Size (eb-4.1.1/genius-1.0.tar.gz) = 2241 bytes
+SHA1 (eb-4.1.1/genius2-1.1.tar.gz) = 16b3b16aa30f42088074f006b3103a9aad47e56e
+Size (eb-4.1.1/genius2-1.1.tar.gz) = 887 bytes
+SHA1 (eb-4.1.1/global-2.0.tar.gz) = e7df085181d795ade8e1e743e05a56d15119db06
+Size (eb-4.1.1/global-2.0.tar.gz) = 4034 bytes
+SHA1 (eb-4.1.1/heritage-2.2.tar.gz) = 32f22976e72f214dbed0322f20f6f5d1a6a3cc3f
+Size (eb-4.1.1/heritage-2.2.tar.gz) = 3968 bytes
+SHA1 (eb-4.1.1/izumi-2.0.tar.gz) = e1d549957568ddaa9678bdee8d1bf1c964ac1edc
+Size (eb-4.1.1/izumi-2.0.tar.gz) = 984 bytes
+SHA1 (eb-4.1.1/jitenban-2.4.tar.gz) = 0b6196e3ffc18d8c52faf444a853254b2e73a774
+Size (eb-4.1.1/jitenban-2.4.tar.gz) = 7459 bytes
+SHA1 (eb-4.1.1/jitenban97-2.1.tar.gz) = 9b6398485fb39f4c6a18b567625fc61d158f122b
+Size (eb-4.1.1/jitenban97-2.1.tar.gz) = 6866 bytes
+SHA1 (eb-4.1.1/kanjigen-2.0.tar.gz) = 9543df9017a2186b1a0cec7ad86ef9ee6d695252
+Size (eb-4.1.1/kanjigen-2.0.tar.gz) = 2046 bytes
+SHA1 (eb-4.1.1/kanjigen2-2.0.tar.gz) = 5c936d603cfca33473cc6da0d6b5ed531ca8f715
+Size (eb-4.1.1/kanjigen2-2.0.tar.gz) = 897 bytes
+SHA1 (eb-4.1.1/kojien-2.3.tar.gz) = c5b2bc7252da585d5c613d9c8d807cb1e5de17f2
+Size (eb-4.1.1/kojien-2.3.tar.gz) = 2008 bytes
+SHA1 (eb-4.1.1/kojien2-2.0.tar.gz) = 086809041f34c2d24c274010f79469eb46cbf110
+Size (eb-4.1.1/kojien2-2.0.tar.gz) = 4526 bytes
+SHA1 (eb-4.1.1/kojien4-2.2.tar.gz) = c522c7e0e2af47ec12d623085f9bea5393faec74
+Size (eb-4.1.1/kojien4-2.2.tar.gz) = 2272 bytes
+SHA1 (eb-4.1.1/oxford-2.0.tar.gz) = 27765bdc6fe71e1033b69a9add09bc6c7d435ad0
+Size (eb-4.1.1/oxford-2.0.tar.gz) = 3849 bytes
+SHA1 (eb-4.1.1/plus-2.0.tar.gz) = 28dc0dd9d58a1d8b864858b82388e0f2fb406a0a
+Size (eb-4.1.1/plus-2.0.tar.gz) = 3632 bytes
+SHA1 (eb-4.1.1/readers-2.2.tar.gz) = b8948b2f466cd017cc71d418ab2a96edce59ad00
+Size (eb-4.1.1/readers-2.2.tar.gz) = 2194 bytes
+SHA1 (eb-4.1.1/readers2-2.0.tar.gz) = 08f6dc279a09ef1094d1b36152c857f6e3890d84
+Size (eb-4.1.1/readers2-2.0.tar.gz) = 2698 bytes
+SHA1 (eb-4.1.1/ruigigo-1.0.tar.gz) = a50a361e2d022919672ffe08fc1875c1913f7d77
+Size (eb-4.1.1/ruigigo-1.0.tar.gz) = 1326 bytes
+SHA1 (eb-4.1.1/superdic98-1.0.tar.gz) = 4e74ecf887e0c1cf257b718d0e0922d03dfe8138
+Size (eb-4.1.1/superdic98-1.0.tar.gz) = 5252 bytes
diff --git a/textproc/eb/patches/patch-aa b/textproc/eb/patches/patch-aa
deleted file mode 100644
index ee24da38552..00000000000
--- a/textproc/eb/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/08/25 18:40:00 jlam Exp $
-
---- configure.orig	Sun Jun  9 12:06:40 2002
-+++ configure
-@@ -9509,7 +9509,7 @@
- fi;
- 
- if test "X$z_libdir" != X ; then
--   ZLIBLIBS="-L$z_libdir -lz"
-+   ZLIBLIBS="-Wl,-R$z_libdir -L$z_libdir -lz"
-    ZLIBDEPS=''
- else
-    ZLIBLIBS='-lz'
-@@ -11250,7 +11250,7 @@
- 
- if test $included_zlib = yes ; then
-    EBCONF_ZLIBINCS='-I$(includedir)'
--   EBCONF_ZLIBLIBS='-L$(libdir) -lz'
-+   EBCONF_ZLIBLIBS='-Wl,-R$(libdir) -L$(libdir) -lz'
- else
-    EBCONF_ZLIBINCS=$ZLIBINCS
-    EBCONF_ZLIBLIBS=$ZLIBLIBS
-@@ -11269,7 +11269,7 @@
- 
- 
- EBCONF_EBINCS='-I$(includedir)'
--EBCONF_EBLIBS='-L$(libdir) -leb'
-+EBCONF_EBLIBS='-Wl,-R$(libdir) -L$(libdir) -leb'
- 
- 
- 
diff --git a/textproc/eb/patches/patch-ab b/textproc/eb/patches/patch-ab
deleted file mode 100644
index fe2297155ea..00000000000
--- a/textproc/eb/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/08/25 18:40:00 jlam Exp $
-
---- configure.ac.orig	Sat Mar 30 15:45:45 2002
-+++ configure.ac
-@@ -160,7 +160,7 @@
- [z_libdir="${withval}"], [z_libdir=''])
- 
- if test "X$z_libdir" != X ; then
--   ZLIBLIBS="-L$z_libdir -lz"
-+   ZLIBLIBS="-Wl,-R$z_libdir -L$z_libdir -lz"
-    ZLIBDEPS=''
- else
-    ZLIBLIBS='-lz'
-@@ -265,7 +265,7 @@
- dnl *
- if test $included_zlib = yes ; then
-    EBCONF_ZLIBINCS='-I$(includedir)'
--   EBCONF_ZLIBLIBS='-L$(libdir) -lz'
-+   EBCONF_ZLIBLIBS='-Wl,-R$(libdir) -L$(libdir) -lz'
- else
-    EBCONF_ZLIBINCS=$ZLIBINCS
-    EBCONF_ZLIBLIBS=$ZLIBLIBS
-@@ -284,7 +284,7 @@
- AC_SUBST(EBCONF_INTLLIBS)
- 
- EBCONF_EBINCS='-I$(includedir)'
--EBCONF_EBLIBS='-L$(libdir) -leb'
-+EBCONF_EBLIBS='-Wl,-R$(libdir) -L$(libdir) -leb'
- AC_SUBST(EBCONF_EBINCS)
- AC_SUBST(EBCONF_EBLIBS)
- 
diff --git a/textproc/eb/patches/patch-ac b/textproc/eb/patches/patch-ac
deleted file mode 100644
index b3a8170a254..00000000000
--- a/textproc/eb/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/04/13 01:29:15 salo Exp $
-
---- Makefile.in.orig	2003-03-08 04:57:44.000000000 +0100
-+++ Makefile.in	2003-04-13 02:38:03.000000000 +0200
-@@ -168,7 +168,7 @@
- 
- appendixdir = $(pkgdatadir)/appendix
- appendix_DATA = 
--sysconf_DATA = eb.conf
-+sysconf_DATA = 
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -189,7 +189,7 @@
- 	mkinstalldirs
- DIST_SUBDIRS = zlib eb libebutils ebappendix ebfont ebinfo ebrefile \
- 	ebzip doc doc-ja po-eb po-ebutils m4 samples
--all: config.h
-+all: config.h eb.conf
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
- .SUFFIXES: