[pkgsrc/trunk]: pkgsrc/editors/abiword Enable gucharmap support unconditional...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0d05d952e89c
branches:  trunk
changeset: 470221:0d05d952e89c
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Mar 07 10:41:03 2004 +0000

description:
Enable gucharmap support unconditionally, to get a full featured abiword
package.  Bump PKGREVISION to 1.

diffstat:

 editors/abiword/Makefile |  17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diffs (48 lines):

diff -r 6cd8d252350f -r 0d05d952e89c editors/abiword/Makefile
--- a/editors/abiword/Makefile  Sun Mar 07 10:20:06 2004 +0000
+++ b/editors/abiword/Makefile  Sun Mar 07 10:41:03 2004 +0000
@@ -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 @@
 
 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-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 @@
 .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"