summaryrefslogtreecommitdiff
path: root/editors/abiword
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2004-03-07 10:41:03 +0000
committerjmmv <jmmv@pkgsrc.org>2004-03-07 10:41:03 +0000
commit61a4aa8efb321a93a0d3c5e483e4e61bcdc5820b (patch)
treeffb79feda41554247d6c5046f648876bda59f57d /editors/abiword
parent5647b0ed4d66bcc24b9674e968876d2af490ea49 (diff)
downloadpkgsrc-61a4aa8efb321a93a0d3c5e483e4e61bcdc5820b.tar.gz
Enable gucharmap support unconditionally, to get a full featured abiword
package. Bump PKGREVISION to 1.
Diffstat (limited to 'editors/abiword')
-rw-r--r--editors/abiword/Makefile17
1 files changed, 4 insertions, 13 deletions
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 8f70b777609..665b65c4dda 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2004/03/06 07:12:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.71 2004/03/07 10:41:03 jmmv Exp $
#
DISTNAME= abiword-${DIST_VER}
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=abiword/}
EXTRACT_SUFX= .tar.bz2
@@ -30,6 +31,7 @@ MAKEFILE= GNUmakefile
DIST_VER= 2.0.4
+CONFIGURE_ARGS+= --enable-gucharmap
CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --with-sys-wv
CONFIGURE_ARGS+= --with-libxml2
@@ -38,18 +40,6 @@ CONFIGURE_ARGS+= --with-popt=${BUILDLINK_PREFIX.popt}
CONFIGURE_ARGS+= --with-libjpeg-prefix=${BUILDLINK_PREFIX.jpeg}
CONFIGURE_ARGS+= --with-libpng=${BUILDLINK_PREFIX.png}
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+= ABIWORD_USES_GUCHARMAP
-
-.if defined(ABIWORD_USES_GUCHARMAP) && \
- !empty(ABIWORD_USES_GUCHARMAP:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+= --enable-gucharmap
-.include "../../fonts/gucharmap/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-gucharmap
-.endif
-
.include "../../converters/fribidi/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../converters/wv/buildlink3.mk"
@@ -57,6 +47,7 @@ CONFIGURE_ARGS+= --disable-gucharmap
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
+.include "../../fonts/gucharmap/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"