summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/abiword-plugins/Makefile18
-rw-r--r--editors/abiword-plugins/PLIST3
-rw-r--r--editors/abiword-plugins/distinfo6
-rw-r--r--editors/abiword/Makefile9
-rw-r--r--editors/abiword/Makefile.common18
-rw-r--r--editors/abiword/PLIST6
-rw-r--r--editors/abiword/distinfo10
-rw-r--r--editors/abiword/patches/patch-aa8
-rw-r--r--editors/abiword/patches/patch-ac8
9 files changed, 42 insertions, 44 deletions
diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 53c5976b908..40eb9cb1422 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/21 06:32:05 xtraeme Exp $
-#
+# $NetBSD: Makefile,v 1.2 2004/11/22 13:32:01 adam Exp $
+
.include "../../editors/abiword/Makefile.common"
PKGNAME= abiword-plugins-${ABIWORD_DIST_VERSION}
-
COMMENT= Plugins enhancing Abiword's capabilities
WRKSRC= ${WRKDIR}/${DISTNAME}/abiword-plugins
@@ -12,12 +11,11 @@ BUILD_DEPENDS+= abiword-${ABIWORD_DIST_VERSION}:../../editors/abiword
.include "../../mk/bsd.prefs.mk"
-CONFIGURE_ARGS+= --disable-all
-CONFIGURE_ARGS+= --enable-xsl-fo --enable-xhtml --enable-wml
-CONFIGURE_ARGS+= --enable-nrof --enable-mswrite --enable-latex
-CONFIGURE_ARGS+= --enable-kword --enable-jpeg --enable-AbiGdkPixbuf
-CONFIGURE_ARGS+= --enable-eml --enable-docbook --enable-abicommand
-CONFIGURE_ARGS+= --enable-clarisworks --enable-bz2abw --enable-bmp
-CONFIGURE_ARGS+= --enable-applix
+CONFIGURE_ARGS+= --disable-all --enable-AbiGdkPixbuf --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
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/abiword-plugins/PLIST b/editors/abiword-plugins/PLIST
index 4aa42608f40..49037a081a0 100644
--- a/editors/abiword-plugins/PLIST
+++ b/editors/abiword-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/21 06:32:05 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/11/22 13:32:01 adam Exp $
lib/AbiWord-2.0/plugins/libAbiApplix.la
lib/AbiWord-2.0/plugins/libAbiBMP.la
lib/AbiWord-2.0/plugins/libAbiBZ2.la
@@ -9,6 +9,7 @@ lib/AbiWord-2.0/plugins/libAbiEML.la
lib/AbiWord-2.0/plugins/libAbiGdkPixbuf.la
lib/AbiWord-2.0/plugins/libAbiJPEG.la
lib/AbiWord-2.0/plugins/libAbiKWord.la
+lib/AbiWord-2.0/plugins/libAbiNroff.la
lib/AbiWord-2.0/plugins/libAbiLaTeX.la
lib/AbiWord-2.0/plugins/libAbiMSWrite.la
lib/AbiWord-2.0/plugins/libAbiWML.la
diff --git a/editors/abiword-plugins/distinfo b/editors/abiword-plugins/distinfo
index 23cdb98668e..6fe8607e36c 100644
--- a/editors/abiword-plugins/distinfo
+++ b/editors/abiword-plugins/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2004/10/27 01:05:53 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/11/22 13:32:01 adam Exp $
-SHA1 (abiword-2.0.11.tar.bz2) = 356828fbcec5ffade735f5bf68b8d9a7f6e9ef09
-Size (abiword-2.0.11.tar.bz2) = 22200079 bytes
+SHA1 (abiword-2.0.14.tar.bz2) = 1ecbf566da6fda5af401e8025ffe2a6c3092f9d9
+Size (abiword-2.0.14.tar.bz2) = 22587062 bytes
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 4cadcf241c2..3a2d808b6dc 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2004/10/29 07:42:38 xtraeme Exp $
-#
+# $NetBSD: Makefile,v 1.82 2004/11/22 13:31:46 adam Exp $
+
.include "Makefile.common"
PKGNAME= abiword-${ABIWORD_DIST_VERSION}
-PKGREVISION= 1
COMMENT= Open Source cross-platform word processor
# GTK1 version and previous name of the GTK2 version
@@ -26,8 +25,8 @@ CONFIGURE_ARGS+= --with-sys-wv
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
post-install:
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/abiword-docs/man/abiword.8 \
- ${PREFIX}/man/man8/abiword.8
+ ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/abiword-docs/man/abiword.1 \
+ ${PREFIX}/man/man1/abiword.1
cd ${WRKDIR}/${DISTNAME}/abiword-docs/ && ${MAKE}
SUBST_CLASSES+= docs
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index 55deaad61c6..61c27a750c3 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile.common,v 1.4 2004/10/29 07:42:38 xtraeme Exp $
-#
+# $NetBSD: Makefile.common,v 1.5 2004/11/22 13:31:46 adam Exp $
-ABIWORD_DIST_VERSION= 2.0.11
-DISTNAME= abiword-${ABIWORD_DIST_VERSION}
+ABIWORD_DIST_VERSION= 2.0.14
+DISTNAME= abiword-${ABIWORD_DIST_VERSION}
-CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=abiword/}
-EXTRACT_SUFX= .tar.bz2
+CATEGORIES= editors
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=abiword/}
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER= tech-pkg@NetBSD.org
-
-HOMEPAGE= http://www.abisource.com/
+MAINTAINER= tech-pkg@NetBSD.org
+HOMEPAGE= http://www.abisource.com/
BUILD_USES_MSGFMT= yes
diff --git a/editors/abiword/PLIST b/editors/abiword/PLIST
index a756489bb36..f0e74a384c1 100644
--- a/editors/abiword/PLIST
+++ b/editors/abiword/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2004/10/21 06:30:39 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/11/22 13:31:46 adam Exp $
bin/AbiWord-2.0
bin/abiword
bin/ttfadmin.sh
bin/ttftool
lib/bonobo/servers/GNOME_AbiWord_Control_2_0.server
-man/man8/abiword.8
+man/man1/abiword.1
share/AbiSuite-2.0/AbiWord.exe.MANIFEST
share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_Break.glade
share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_Field.glade
@@ -328,9 +328,11 @@ share/AbiSuite-2.0/icons/abiword_48.png
share/AbiSuite-2.0/icons/abiword_48.tif
share/AbiSuite-2.0/icons/abiword_48.xpm
share/AbiSuite-2.0/templates/A4.awt
+share/AbiSuite-2.0/templates/Business-Letter.awt
share/AbiSuite-2.0/templates/Business-Report.awt
share/AbiSuite-2.0/templates/Employee-Directory.awt
share/AbiSuite-2.0/templates/Fax-Coversheet.awt
+share/AbiSuite-2.0/templates/Friendly-Letter.awt
share/AbiSuite-2.0/templates/Memo.awt
share/AbiSuite-2.0/templates/Two-Columns.awt
share/AbiSuite-2.0/templates/US-Letter.awt
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index f3562492961..cbef9ca51ba 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.29 2004/10/29 07:42:38 xtraeme Exp $
+$NetBSD: distinfo,v 1.30 2004/11/22 13:31:46 adam Exp $
-SHA1 (abiword-2.0.11.tar.bz2) = 356828fbcec5ffade735f5bf68b8d9a7f6e9ef09
-Size (abiword-2.0.11.tar.bz2) = 22200079 bytes
-SHA1 (patch-aa) = 730e205f54516535394659c74e052bbe706e1bc2
+SHA1 (abiword-2.0.14.tar.bz2) = 1ecbf566da6fda5af401e8025ffe2a6c3092f9d9
+Size (abiword-2.0.14.tar.bz2) = 22587062 bytes
+SHA1 (patch-aa) = a35ff56401929065244d2018003537d7fb1f6ea8
SHA1 (patch-ab) = 27c48de3374288c7f6d6749ff18ebeedf91cb3ab
-SHA1 (patch-ac) = 883e0cae06ca96b92d81a0183f15a5af8fc77be2
+SHA1 (patch-ac) = a8ba221c53832a3cab97f23b0cb07f94cd351f56
SHA1 (patch-ad) = 15b34ebdfde5bf94360ad11ad3693843bd509030
diff --git a/editors/abiword/patches/patch-aa b/editors/abiword/patches/patch-aa
index 6ad8d35789e..745b3fb1ed2 100644
--- a/editors/abiword/patches/patch-aa
+++ b/editors/abiword/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2003/12/26 18:26:59 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2004/11/22 13:31:46 adam Exp $
---- configure.orig 2003-11-28 17:04:17.000000000 +0100
-+++ configure 2003-11-28 17:04:36.000000000 +0100
-@@ -3571,7 +3571,7 @@
+--- configure.orig 2004-10-24 04:15:56.000000000 +0000
++++ configure
+@@ -3852,7 +3852,7 @@ case "$OS_NAME" in
WARNING_CFLAGS=""
;;
*BSD)
diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac
index c23b82d162a..bf3e1eff4bb 100644
--- a/editors/abiword/patches/patch-ac
+++ b/editors/abiword/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.12 2004/10/21 06:30:39 xtraeme Exp $
+$NetBSD: patch-ac,v 1.13 2004/11/22 13:31:46 adam Exp $
---- src/af/xap/unix/xap_UnixFrameImpl.cpp.orig 2004-02-15 22:48:32.000000000 +0100
-+++ src/af/xap/unix/xap_UnixFrameImpl.cpp 2004-09-09 00:09:08.000000000 +0200
-@@ -1656,6 +1656,11 @@
+--- src/af/xap/unix/xap_UnixFrameImpl.cpp.orig 2004-09-08 23:43:26.000000000 +0000
++++ src/af/xap/unix/xap_UnixFrameImpl.cpp
+@@ -1666,6 +1666,11 @@ bool XAP_UnixFrameImpl::_openURL(const c
fmtstring = "phoenix '%s' &";
execstring = g_strdup_printf(fmtstring, szURL);
}