Buildlink clean-up + new plug-ins

4 files changed, 63 insertions, 26 deletions

diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 8717c1eb51e..3c8a4bce445 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/01/24 07:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/26 23:23:30 adam Exp $
 
 .include "../../editors/abiword/Makefile.common"
 
 PKGNAME=	abiword-plugins-${ABIWORD_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Plugins enhancing Abiword's capabilities
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/abiword-plugins
@@ -12,12 +12,40 @@ BUILD_DEPENDS+=	abiword-${ABIWORD_VERSION}*:../../editors/abiword
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	--disable-all --enable-abicommand
-CONFIGURE_ARGS+=	--enable-applix --enable-bmp --enable-bz2abw
-CONFIGURE_ARGS+=	--enable-clarisworks --enable-docbook --enable-eml
-CONFIGURE_ARGS+=	--enable-jpeg --enable-kword --enable-latex
-CONFIGURE_ARGS+=	--enable-mswrite --enable-nroff --enable-wml
-CONFIGURE_ARGS+=	--enable-xhtml --enable-xsl-fo
+CONFIGURE_ARGS+=	--disable-all
+CONFIGURE_ARGS+=	--enable-OpenDocument
+CONFIGURE_ARGS+=	--enable-OpenWriter
+CONFIGURE_ARGS+=	--enable-abicapi
+CONFIGURE_ARGS+=	--enable-abicollab
+CONFIGURE_ARGS+=	--enable-abicommand
+CONFIGURE_ARGS+=	--enable-abidash
+CONFIGURE_ARGS+=	--enable-applix
+CONFIGURE_ARGS+=	--enable-babelfish
+CONFIGURE_ARGS+=	--enable-bmp
+CONFIGURE_ARGS+=	--enable-bz2abw
+CONFIGURE_ARGS+=	--enable-clarisworks
+CONFIGURE_ARGS+=	--enable-docbook
+CONFIGURE_ARGS+=	--enable-eml
+CONFIGURE_ARGS+=	--enable-freetranslation
+CONFIGURE_ARGS+=	--enable-gdict
+CONFIGURE_ARGS+=	--enable-google
+CONFIGURE_ARGS+=	--enable-hancom
+CONFIGURE_ARGS+=	--enable-hrtext
+CONFIGURE_ARGS+=	--enable-iscii-text
+CONFIGURE_ARGS+=	--enable-jpeg
+CONFIGURE_ARGS+=	--enable-kword
+CONFIGURE_ARGS+=	--enable-latex
+CONFIGURE_ARGS+=	--enable-mif
+CONFIGURE_ARGS+=	--enable-mswrite
+CONFIGURE_ARGS+=	--enable-nroff
+CONFIGURE_ARGS+=	--enable-passepartout
+CONFIGURE_ARGS+=	--enable-sdw
+CONFIGURE_ARGS+=	--enable-t602
+CONFIGURE_ARGS+=	--enable-urldict
+CONFIGURE_ARGS+=	--enable-wikipedia
 CONFIGURE_ARGS+=	--enable-wmf
+CONFIGURE_ARGS+=	--enable-wml
+CONFIGURE_ARGS+=	--enable-xhtml
+CONFIGURE_ARGS+=	--enable-xsl-fo
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/abiword-plugins/PLIST b/editors/abiword-plugins/PLIST
index e8b1ab33e86..2db2bb4c150 100644
--- a/editors/abiword-plugins/PLIST
+++ b/editors/abiword-plugins/PLIST
@@ -1,18 +1,36 @@
-@comment $NetBSD: PLIST,v 1.7 2005/10/04 09:55:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/01/26 23:23:30 adam Exp $
 lib/AbiWord-2.4/plugins/libAbiApplix.la
+lib/AbiWord-2.4/plugins/libAbiBabelfish.la
 lib/AbiWord-2.4/plugins/libAbiBMP.la
 lib/AbiWord-2.4/plugins/libAbiBZ2.la
+lib/AbiWord-2.4/plugins/libAbiCAPI.la
 lib/AbiWord-2.4/plugins/libAbiClarisWorks.la
+lib/AbiWord-2.4/plugins/libAbiCollab.la
 lib/AbiWord-2.4/plugins/libAbiCommand.la
+lib/AbiWord-2.4/plugins/libAbiDash.la
 lib/AbiWord-2.4/plugins/libAbiDocBook.la
 lib/AbiWord-2.4/plugins/libAbiEML.la
+lib/AbiWord-2.4/plugins/libAbiFreeTranslation.la
+lib/AbiWord-2.4/plugins/libAbiGdict.la
+lib/AbiWord-2.4/plugins/libAbiGoogle.la
+lib/AbiWord-2.4/plugins/libAbiHancom.la
+lib/AbiWord-2.4/plugins/libAbiHRText.la
+lib/AbiWord-2.4/plugins/libAbiISCII.la
 lib/AbiWord-2.4/plugins/libAbiJPEG.la
 lib/AbiWord-2.4/plugins/libAbiKWord.la
 lib/AbiWord-2.4/plugins/libAbiLaTeX.la
+lib/AbiWord-2.4/plugins/libAbiMIF.la
 lib/AbiWord-2.4/plugins/libAbiMSWrite.la
 lib/AbiWord-2.4/plugins/libAbiNroff.la
+lib/AbiWord-2.4/plugins/libAbiOpenDocument.la
+lib/AbiWord-2.4/plugins/libAbiOpenWriter.la
+lib/AbiWord-2.4/plugins/libAbiPassepartout.la
+lib/AbiWord-2.4/plugins/libAbiSDW.la
+lib/AbiWord-2.4/plugins/libAbiT602.la
+lib/AbiWord-2.4/plugins/libAbiURLDict.la
 lib/AbiWord-2.4/plugins/libAbiWMF.la
 lib/AbiWord-2.4/plugins/libAbiWML.la
+lib/AbiWord-2.4/plugins/libAbiWikipedia.la
 lib/AbiWord-2.4/plugins/libAbiXHTML.la
 lib/AbiWord-2.4/plugins/libAbiXSLFO.la
 @dirrm lib/AbiWord-2.4/plugins
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"