pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors update to 2.6.8
details: https://anonhg.NetBSD.org/pkgsrc/rev/a47dd3fd1d08
branches: trunk
changeset: 556980:a47dd3fd1d08
user: drochner <drochner%pkgsrc.org@localhost>
date: Tue Apr 07 16:27:08 2009 +0000
description:
update to 2.6.8
This is a major update, I couldn't find the relevant changecogs but
the last one. A couple of bugfixes.
pkgsrc note: Since base and plugins are seperate distfiles now, we
could abandon the Makefile.common or at least part of its complexity.
I'll leave this to the MAINTAINER.
Also, I'd suggest to rip -plugins into parts - many are too exotic.
(There are also some new which are not built, I've just kept status quo.)
diffstat:
editors/abiword-plugins/Makefile | 14 +-
editors/abiword-plugins/PLIST | 80 +-
editors/abiword-plugins/distinfo | 13 +-
editors/abiword-plugins/patches/patch-aa | 12 -
editors/abiword-plugins/patches/patch-ab | 22 +
editors/abiword/Makefile | 22 +-
editors/abiword/Makefile.common | 8 +-
editors/abiword/PLIST | 791 +++++++++---------------------
editors/abiword/distinfo | 23 +-
editors/abiword/patches/patch-aa | 10 +-
editors/abiword/patches/patch-ab | 16 +-
editors/abiword/patches/patch-af | 257 ----------
editors/abiword/patches/patch-ag | 13 -
editors/abiword/patches/patch-ah | 18 +
editors/abiword/patches/patch-sa | 14 +-
editors/abiword/patches/patch-sb | 13 -
editors/abiword/patches/patch-sc | 13 -
editors/abiword/patches/patch-sd | 13 -
editors/abiword/patches/patch-se | 13 -
editors/abiword/patches/patch-sf | 13 -
editors/abiword/patches/patch-sg | 40 -
21 files changed, 379 insertions(+), 1039 deletions(-)
diffs (truncated from 1589 to 300 lines):
diff -r 1b96c97ce077 -r a47dd3fd1d08 editors/abiword-plugins/Makefile
--- a/editors/abiword-plugins/Makefile Tue Apr 07 15:08:38 2009 +0000
+++ b/editors/abiword-plugins/Makefile Tue Apr 07 16:27:08 2009 +0000
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.27 2008/06/12 02:14:29 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2009/04/07 16:27:09 drochner Exp $
PKG_DESTDIR_SUPPORT= user-destdir
-.include "../../editors/abiword/Makefile.common"
+.include "../../editors/abiword.neu/Makefile.common"
-PKGNAME= abiword-plugins-${ABIWORD_VERSION}
-PKGREVISION= 5
+DISTNAME= abiword-plugins-${ABIWORD_VERSION}
COMMENT= Plugins enhancing Abiword's capabilities
-WRKSRC= ${WRKDIR}/${DISTNAME}/abiword-plugins
+DISTFILES= ${DEFAULT_DISTFILES}
+DISTFILES+= abiword-2.6.8.tar.gz
+
+#WRKSRC= ${WRKDIR}/${DISTNAME}/abiword-plugins
BUILD_DEPENDS+= abiword-${ABIWORD_VERSION}{,nb*}:../../editors/abiword
@@ -50,5 +52,7 @@
CONFIGURE_ARGS+= --enable-xhtml
CONFIGURE_ARGS+= --enable-xsl-fo
+CONFIGURE_ARGS+= --with-abiword=${WRKDIR}/abiword-2.6.8
+
.include "../../converters/libwpd/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 1b96c97ce077 -r a47dd3fd1d08 editors/abiword-plugins/PLIST
--- a/editors/abiword-plugins/PLIST Tue Apr 07 15:08:38 2009 +0000
+++ b/editors/abiword-plugins/PLIST Tue Apr 07 16:27:08 2009 +0000
@@ -1,37 +1,43 @@
-@comment $NetBSD: PLIST,v 1.10 2006/04/15 10:47:25 adam Exp $
-lib/AbiWord-2.4/plugins/libAbiApplix.la
-lib/AbiWord-2.4/plugins/libAbiBMP.la
-lib/AbiWord-2.4/plugins/libAbiBZ2.la
-lib/AbiWord-2.4/plugins/libAbiBabelfish.la
-lib/AbiWord-2.4/plugins/libAbiCAPI.la
-lib/AbiWord-2.4/plugins/libAbiClarisWorks.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/libAbiHRText.la
-lib/AbiWord-2.4/plugins/libAbiHancom.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/libAbiWordPerfect.la
-lib/AbiWord-2.4/plugins/libAbiXHTML.la
-lib/AbiWord-2.4/plugins/libAbiXSLFO.la
-@dirrm lib/AbiWord-2.4/plugins
-@dirrm lib/AbiWord-2.4
+@comment $NetBSD: PLIST,v 1.11 2009/04/07 16:27:09 drochner Exp $
+lib/abiword-2.6/plugins/libAbiApplix.la
+lib/abiword-2.6/plugins/libAbiBMP.la
+lib/abiword-2.6/plugins/libAbiBabelfish.la
+lib/abiword-2.6/plugins/libAbiClarisWorks.la
+lib/abiword-2.6/plugins/libAbiCommand.la
+lib/abiword-2.6/plugins/libAbiDocBook.la
+lib/abiword-2.6/plugins/libAbiEML.la
+lib/abiword-2.6/plugins/libAbiFreeTranslation.la
+lib/abiword-2.6/plugins/libAbiGdict.la
+lib/abiword-2.6/plugins/libAbiGoogle.la
+lib/abiword-2.6/plugins/libAbiHRText.la
+lib/abiword-2.6/plugins/libAbiHancom.la
+lib/abiword-2.6/plugins/libAbiISCII.la
+lib/abiword-2.6/plugins/libAbiJPEG.la
+lib/abiword-2.6/plugins/libAbiKWord.la
+lib/abiword-2.6/plugins/libAbiLaTeX.la
+lib/abiword-2.6/plugins/libAbiMIF.la
+lib/abiword-2.6/plugins/libAbiMSWrite.la
+lib/abiword-2.6/plugins/libAbiNroff.la
+lib/abiword-2.6/plugins/libAbiOpenDocument.la
+lib/abiword-2.6/plugins/libAbiOpenWriter.la
+lib/abiword-2.6/plugins/libAbiPassepartout.la
+lib/abiword-2.6/plugins/libAbiSDW.la
+lib/abiword-2.6/plugins/libAbiT602.la
+lib/abiword-2.6/plugins/libAbiURLDict.la
+lib/abiword-2.6/plugins/libAbiWMF.la
+lib/abiword-2.6/plugins/libAbiWML.la
+lib/abiword-2.6/plugins/libAbiWikipedia.la
+lib/abiword-2.6/plugins/libAbiWordPerfect.la
+lib/abiword-2.6/plugins/libAbiXHTML.la
+lib/abiword-2.6/plugins/libAbiXSLFO.la
+share/abiword-2.6/xsltml/README
+share/abiword-2.6/xsltml/cmarkup.xsl
+share/abiword-2.6/xsltml/entities.xsl
+share/abiword-2.6/xsltml/glayout.xsl
+share/abiword-2.6/xsltml/mmltex.xsl
+share/abiword-2.6/xsltml/scripts.xsl
+share/abiword-2.6/xsltml/tables.xsl
+share/abiword-2.6/xsltml/tokens.xsl
+@dirrm share/abiword-2.6/xsltml
+@dirrm lib/abiword-2.6/plugins
+@dirrm lib/abiword-2.6
diff -r 1b96c97ce077 -r a47dd3fd1d08 editors/abiword-plugins/distinfo
--- a/editors/abiword-plugins/distinfo Tue Apr 07 15:08:38 2009 +0000
+++ b/editors/abiword-plugins/distinfo Tue Apr 07 16:27:08 2009 +0000
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.20 2006/11/09 15:40:37 adam Exp $
+$NetBSD: distinfo,v 1.21 2009/04/07 16:27:09 drochner Exp $
-SHA1 (abiword-2.4.6.tar.bz2) = 3011d221d09336f09f4bb0732add3405961a8623
-RMD160 (abiword-2.4.6.tar.bz2) = ca56800d811b3aca0af6b2fb6cd70cbea29ab792
-Size (abiword-2.4.6.tar.bz2) = 24994889 bytes
-SHA1 (patch-aa) = 20250039a86753574046a3d94712c7e8a56d8f11
+SHA1 (abiword-2.6.8.tar.gz) = fc979982edc3445385705afdb1e2ebb1fa53a4f6
+RMD160 (abiword-2.6.8.tar.gz) = 8fcf455a5226a5525b9a89f88c9916b20e973607
+Size (abiword-2.6.8.tar.gz) = 9516443 bytes
+SHA1 (abiword-plugins-2.6.8.tar.gz) = fa8ad1985de5523f9993cef93af0dad174e8e5a5
+RMD160 (abiword-plugins-2.6.8.tar.gz) = be4e7b0fd87dfffc5f32f0a8a9d81f0ce403cc54
+Size (abiword-plugins-2.6.8.tar.gz) = 1991215 bytes
+SHA1 (patch-ab) = e79caa795c97a897dfe78061fcd6e0f790d082a8
diff -r 1b96c97ce077 -r a47dd3fd1d08 editors/abiword-plugins/patches/patch-aa
--- a/editors/abiword-plugins/patches/patch-aa Tue Apr 07 15:08:38 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/05/09 10:09:06 joerg Exp $
-
---- tools/abidash/xp/dashboard-frontend.c.orig 2006-05-08 21:02:01.000000000 +0000
-+++ tools/abidash/xp/dashboard-frontend.c
-@@ -5,6 +5,7 @@
- #include <unistd.h>
- #include <sys/socket.h>
- #include <sys/types.h>
-+#include <sys/time.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <fcntl.h>
diff -r 1b96c97ce077 -r a47dd3fd1d08 editors/abiword-plugins/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/abiword-plugins/patches/patch-ab Tue Apr 07 16:27:08 2009 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2009/04/07 16:27:09 drochner Exp $
+
+--- configure.orig 2009-03-19 13:47:26.000000000 +0100
++++ configure
+@@ -25370,7 +25370,7 @@ else
+
+ fi
+
+-if test "$abi_cv_libxslt" == "yes"; then
++if test "$abi_cv_libxslt" = "yes"; then
+
+ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for LIBXSLT" >&5
+@@ -25498,7 +25498,7 @@ fi
+ LATEX_CFLAGS="$LATEX_CFLAGS "'${PLUGIN_CFLAGS}'
+ LATEX_LIBS="$LATEX_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_latex_builtin" == "yes"; then
++if test "$enable_latex_builtin" = "yes"; then
+ LATEX_CFLAGS="$LATEX_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
diff -r 1b96c97ce077 -r a47dd3fd1d08 editors/abiword/Makefile
--- a/editors/abiword/Makefile Tue Apr 07 15:08:38 2009 +0000
+++ b/editors/abiword/Makefile Tue Apr 07 16:27:08 2009 +0000
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.117 2008/11/20 21:47:16 drochner Exp $
+# $NetBSD: Makefile,v 1.118 2009/04/07 16:27:08 drochner Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
-PKGREVISION= 7
COMMENT= Open Source cross-platform word processor
# GTK1 version and previous name of the GTK2 version
CONFLICTS= abiword-personal-[0-9]* abiword2-[0-9]*
-WRKSRC= ${WRKDIR}/${DISTNAME}/abi
USE_TOOLS+= perl
REPLACE_SH+= ${WRKDIR}/${DISTNAME}/abiword-docs/make-html.sh
@@ -37,27 +35,11 @@
CONFIGURE_ARGS+= --with-libxml2
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
-INSTALLATION_DIRS+= ${PKGMANDIR}/man1
-INSTALLATION_DIRS+= share/AbiSuite-2.4/AbiWord
-
-post-build:
- cd ${WRKDIR}/${DISTNAME}/abiword-docs/ && env \
- ABI_DOC_DEST=${WRKDIR} \
- ABI_DOC_PROG=${WRKSRC}/src/wp/main/unix/AbiWord-2.4 \
- ./make-html.sh
- find ${WRKDIR}/help -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
- find ${WRKDIR}/help \( -name "*.abw.orig" -o -name "*.abw" \
- -o -name "*.info" -o -name "*.xhtml" \) -print | ${XARGS} ${RM} -f
-
-post-install:
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/abiword-docs/man/abiword.1 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/abiword.1
- cp -R ${WRKDIR}/help ${DESTDIR}${PREFIX}/share/AbiSuite-2.4/AbiWord/
-
.if !empty(PKG_OPTIONS:Mgucharmap)
.include "../../fonts/gucharmap/buildlink3.mk"
.endif
.include "../../textproc/enchant/buildlink3.mk"
+.include "../../databases/shared-mime-info/mimedb.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 1b96c97ce077 -r a47dd3fd1d08 editors/abiword/Makefile.common
--- a/editors/abiword/Makefile.common Tue Apr 07 15:08:38 2009 +0000
+++ b/editors/abiword/Makefile.common Tue Apr 07 16:27:08 2009 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile.common,v 1.37 2006/11/16 02:31:48 markd Exp $
+# $NetBSD: Makefile.common,v 1.38 2009/04/07 16:27:08 drochner Exp $
# Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
-ABIWORD_VERSION= 2.4.6
-DISTNAME= abiword-${ABIWORD_VERSION}
+ABIWORD_VERSION= 2.6.8
+DISTNAME?= abiword-${ABIWORD_VERSION}
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/abiword/${ABIWORD_VERSION}/source/
-EXTRACT_SUFX= .tar.bz2
MAINTAINER= adam%NetBSD.org@localhost
HOMEPAGE= http://www.abisource.com/
@@ -24,6 +23,7 @@
.include "../../converters/wv/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff -r 1b96c97ce077 -r a47dd3fd1d08 editors/abiword/PLIST
--- a/editors/abiword/PLIST Tue Apr 07 15:08:38 2009 +0000
+++ b/editors/abiword/PLIST Tue Apr 07 16:27:08 2009 +0000
@@ -1,546 +1,255 @@
-@comment $NetBSD: PLIST,v 1.23 2006/07/10 21:40:49 adam Exp $
-bin/AbiWord-2.4
+@comment $NetBSD: PLIST,v 1.24 2009/04/07 16:27:08 drochner Exp $
bin/abiword
-bin/ttfadmin.sh
-bin/ttftool
-man/man1/abiword.1
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_Break.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_Field.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_FormatFootnotes.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_FormatFrame.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_FormatTOC.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_FormatTable.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_Goto.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_HdrFtr.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_InsertTable.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_Insert_DateTime.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_Latex.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_MailMerge.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_MetaData.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_New.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_Options.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_Options_ColorSel.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_PageNumbers.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_PageSetup.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_Replace.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_Spell.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_Styles.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_Stylist.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_Stylist_modal.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_Tab.glade
-share/AbiSuite-2.4/AbiWord/glade/ap_UnixDialog_WordCount.glade
-share/AbiSuite-2.4/AbiWord/glade/xap_UnixDlg_About.glade
-share/AbiSuite-2.4/AbiWord/glade/xap_UnixDlg_DocComparison.glade
-share/AbiSuite-2.4/AbiWord/glade/xap_UnixDlg_Encoding.glade
-share/AbiSuite-2.4/AbiWord/glade/xap_UnixDlg_History.glade
-share/AbiSuite-2.4/AbiWord/glade/xap_UnixDlg_Image.glade
-share/AbiSuite-2.4/AbiWord/glade/xap_UnixDlg_Language.glade
-share/AbiSuite-2.4/AbiWord/glade/xap_UnixDlg_ListDocuments.glade
-share/AbiSuite-2.4/AbiWord/glade/xap_UnixDlg_Password.glade
-share/AbiSuite-2.4/AbiWord/glade/xap_UnixDlg_PluginManager.glade
-share/AbiSuite-2.4/AbiWord/glade/xap_UnixDlg_WindowMore.glade
Home |
Main Index |
Thread Index |
Old Index