[pkgsrc/trunk]: pkgsrc/editors Include converters/libiconv/buildlink3.mk in M...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/41ee9d42f9e4
branches:  trunk
changeset: 476162:41ee9d42f9e4
user:      reed <reed%pkgsrc.org@localhost>
date:      Fri Jun 04 15:30:35 2004 +0000

description:
Include converters/libiconv/buildlink3.mk in Makefile.common
and bump PKGREVISIONS for lyx-qt and lyx-xforms packages.

lyx uses iconv. The build suggests using libiconv.
Under NetBSD 1.6.2, the lyx-qt build broke when not including
this buildlink. Under Linux and NetBSD 2.x, it built fine before
because it found native iconv() and used it.

Thank you to John R. Shannon for research.

Okayed by maintainer, Martti Kuparinen.

diffstat:

 editors/lyx-qt/Makefile        |  4 ++--
 editors/lyx-qt/Makefile.common |  3 ++-
 editors/lyx-xforms/Makefile    |  4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r 3e0c9138e1e2 -r 41ee9d42f9e4 editors/lyx-qt/Makefile
--- a/editors/lyx-qt/Makefile   Fri Jun 04 15:28:39 2004 +0000
+++ b/editors/lyx-qt/Makefile   Fri Jun 04 15:30:35 2004 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2004/05/29 11:27:09 shannonjr Exp $
+# $NetBSD: Makefile,v 1.13 2004/06/04 15:30:35 reed Exp $
 #
 
 .include "./Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/lyx-/lyx-qt-/}
-PKGREVISION=   2
+PKGREVISION=   3
 
 COMMENT+=      (QT version)
 
diff -r 3e0c9138e1e2 -r 41ee9d42f9e4 editors/lyx-qt/Makefile.common
--- a/editors/lyx-qt/Makefile.common    Fri Jun 04 15:28:39 2004 +0000
+++ b/editors/lyx-qt/Makefile.common    Fri Jun 04 15:30:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2004/04/17 23:59:21 snj Exp $
+# $NetBSD: Makefile.common,v 1.18 2004/06/04 15:30:35 reed Exp $
 #
 
 DISTNAME=              lyx-1.3.4
@@ -76,6 +76,7 @@
                        lib/scripts/pic2ascii.py \
                        lib/scripts/pic2png_eps.py
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../textproc/aiksaurus/buildlink3.mk"
diff -r 3e0c9138e1e2 -r 41ee9d42f9e4 editors/lyx-xforms/Makefile
--- a/editors/lyx-xforms/Makefile       Fri Jun 04 15:28:39 2004 +0000
+++ b/editors/lyx-xforms/Makefile       Fri Jun 04 15:30:35 2004 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2004/04/17 23:59:21 snj Exp $
+# $NetBSD: Makefile,v 1.8 2004/06/04 15:30:35 reed Exp $
 #
 
 .include "../lyx-qt/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/lyx-/lyx-xforms-/}
-PKGREVISION=   1
+PKGREVISION=   2
 
 COMMENT+=      (xforms version)