summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreed <reed>2004-06-04 15:30:35 +0000
committerreed <reed>2004-06-04 15:30:35 +0000
commit03ca982191ee184c2c4176acdeb3efc2133c5aee (patch)
tree61abfddcae345773dd19c1bd83e5a5f21791b53d
parent7c8276f3e979c138fbe43bbd6125422a622f851d (diff)
downloadpkgsrc-03ca982191ee184c2c4176acdeb3efc2133c5aee.tar.gz
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.
-rw-r--r--editors/lyx-qt/Makefile4
-rw-r--r--editors/lyx-qt/Makefile.common3
-rw-r--r--editors/lyx-xforms/Makefile4
3 files changed, 6 insertions, 5 deletions
diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile
index be9b9ad48e1..e728c7a47e8 100644
--- a/editors/lyx-qt/Makefile
+++ b/editors/lyx-qt/Makefile
@@ -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 --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index 4b6a6c10976..8d5ed40da64 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -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 @@ PYTHON_PATCH_SCRIPTS= lib/lyx2lyx/lyx2lyx \
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 --git a/editors/lyx-xforms/Makefile b/editors/lyx-xforms/Makefile
index 82db223abbb..97e16a720c7 100644
--- a/editors/lyx-xforms/Makefile
+++ b/editors/lyx-xforms/Makefile
@@ -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)