summaryrefslogtreecommitdiff
path: root/editors/abiword
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2006-01-26 23:23:08 +0000
committeradam <adam@pkgsrc.org>2006-01-26 23:23:08 +0000
commit7306c014e837cabecf5b99830d23356ca0733603 (patch)
tree9438cdf44d6b896bc2ae53de3e5e9637e62be988 /editors/abiword
parent31208b95d628e51639880cab13af1535bc681c28 (diff)
downloadpkgsrc-7306c014e837cabecf5b99830d23356ca0733603.tar.gz
Buildlink clean-up + new plug-ins
Diffstat (limited to 'editors/abiword')
-rw-r--r--editors/abiword/Makefile12
-rw-r--r--editors/abiword/Makefile.common13
2 files changed, 8 insertions, 17 deletions
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index c9856c91113..e044d1ffbcd 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.95 2006/01/24 07:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2006/01/26 23:23:08 adam Exp $
.include "Makefile.common"
COMMENT= Open Source cross-platform word processor
-PKGREVISION= 1
+PKGREVISION= 2
# GTK1 version and previous name of the GTK2 version
CONFLICTS= abiword-personal-[0-9]* abiword2-[0-9]*
@@ -10,7 +10,7 @@ CONFLICTS= abiword-personal-[0-9]* abiword2-[0-9]*
WRKSRC= ${WRKDIR}/${DISTNAME}/abi
USE_TOOLS+= perl
-REPLACE_PERL= user/wp/scripts/abw2html.pl
+REPLACE_PERL+= user/wp/scripts/abw2html.pl
PKG_OPTIONS_VAR= PKG_OPTIONS.abiword
PKG_SUPPORTED_OPTIONS= gucharmap
@@ -28,8 +28,9 @@ CONFIGURE_ARGS+= --without-epath
# Use X11 instead of Cocoa API
CONFIGURE_ARGS+= --disable-Cocoa
.endif
-CONFIGURE_ARGS+= --enable-threads --with-libxml2
+CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --with-libjpeg-prefix=${BUILDLINK_PREFIX.jpeg}
+CONFIGURE_ARGS+= --with-libxml2
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
USE_GNU_ICONV= yes
@@ -51,9 +52,6 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/AbiSuite-2.4/AbiWord
${CP} -R ${WRKDIR}/help ${PREFIX}/share/AbiSuite-2.4/AbiWord/
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../converters/wv/buildlink3.mk"
-
.if !empty(PKG_OPTIONS:Mgucharmap)
.include "../../fonts/gucharmap/buildlink3.mk"
.endif
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index 986363f036a..d2455ec1892 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2006/01/17 08:07:38 adam Exp $
+# $NetBSD: Makefile.common,v 1.29 2006/01/26 23:23:08 adam Exp $
# Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
ABIWORD_VERSION= 2.4.2
@@ -19,19 +19,12 @@ USE_DIRS+= xdg-1.1
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-libpng=${BUILDLINK_PREFIX.png}
+CONFIGURE_ARGS+= --with-libpng=${BUILDLINK_PREFIX.png}
.include "../../converters/fribidi/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../converters/wv/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/libwmf/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"