diff options
| author | jlam <jlam@pkgsrc.org> | 2006-04-07 18:40:46 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-04-07 18:40:46 +0000 |
| commit | 9efb905554fc82fe9ac1de1204ab476ad8bd99d8 (patch) | |
| tree | aa8ba6c7c240f75cac65b3bef8f7aa4001e8b55b /textproc | |
| parent | afd2b41b5fb2e7e8fab35815c09327df01c4bbd5 (diff) | |
| download | pkgsrc-9efb905554fc82fe9ac1de1204ab476ad8bd99d8.tar.gz | |
Properly locate -liconv when linking ebinfo in the case where we use
the pkgsrc libiconv implementation.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/eb/Makefile | 9 | ||||
| -rw-r--r-- | textproc/eb/distinfo | 3 | ||||
| -rw-r--r-- | textproc/eb/patches/patch-ab | 20 |
3 files changed, 27 insertions, 5 deletions
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile index c5332da2cc1..746444c7f40 100644 --- a/textproc/eb/Makefile +++ b/textproc/eb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2006/02/20 23:12:21 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2006/04/07 18:40:46 jlam Exp $ DISTNAME= eb-4.1.3 PKGREVISION= 2 @@ -74,6 +74,10 @@ SUBST_SED.runpath= -e 's|^\(.*LIBS=['\''"]\)-L\(\$$[^[:blank:]][^[:blank:]]*\)\( INSTALLATION_DIRS= share/eb/appendix +.include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" + post-extract: ${RM} -rf ${WRKSRC}/zlib @@ -87,7 +91,4 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/eb.conf ${EGDIR}/eb.conf.default -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/textproc/eb/distinfo b/textproc/eb/distinfo index 4bb63773c69..7230da85a3c 100644 --- a/textproc/eb/distinfo +++ b/textproc/eb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2006/02/20 23:12:21 wiz Exp $ +$NetBSD: distinfo,v 1.15 2006/04/07 18:40:46 jlam Exp $ SHA1 (eb-4.1.3/eb-4.1.3.tar.gz) = e0d997c14fc729e7e104b99dc8292a1bc09ecbe2 RMD160 (eb-4.1.3/eb-4.1.3.tar.gz) = 9249fd014142c32d4b56b8127e8cae4a6aa2edc4 @@ -100,3 +100,4 @@ SHA1 (eb-4.1.3/superdic98-1.0.tar.gz) = 4e74ecf887e0c1cf257b718d0e0922d03dfe8138 RMD160 (eb-4.1.3/superdic98-1.0.tar.gz) = 7b597ee6a67974f7eb74dfe551dd8888ca696403 Size (eb-4.1.3/superdic98-1.0.tar.gz) = 5252 bytes SHA1 (patch-aa) = 265c1e80bad1e94c11d4771909d7b643660a90de +SHA1 (patch-ab) = c1ea5427597f95e12d96cf22518169b3e9f3b9de diff --git a/textproc/eb/patches/patch-ab b/textproc/eb/patches/patch-ab new file mode 100644 index 00000000000..d60623e66f1 --- /dev/null +++ b/textproc/eb/patches/patch-ab @@ -0,0 +1,20 @@ +$NetBSD: patch-ab,v 1.4 2006/04/07 18:40:46 jlam Exp $ + +--- configure.orig 2006-04-07 13:48:25.000000000 -0400 ++++ configure +@@ -19840,6 +19840,7 @@ if test $ac_cv_lib_iconv_iconv_open = ye + _ACEOF + + LIBS="-liconv $LIBS" ++ iconv_libraries="-liconv" + + fi + +@@ -19914,6 +19915,7 @@ if test $ac_cv_lib_iconv_libiconv_open = + _ACEOF + + LIBS="-liconv $LIBS" ++ iconv_libraries="-liconv" + + fi + |