pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update editors/abiword to 2.0.11, and split Makefile i...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2b8c56472379
branches: trunk
changeset: 482167:2b8c56472379
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Thu Oct 21 06:30:39 2004 +0000
description:
Update editors/abiword to 2.0.11, and split Makefile into Makefile.common,
which will be used for the upcoming abiword-plugins package, based on patch
sent by Ove Soerensen in PR pkg/26893, this closes PR pkg/26695 by Joel
Carnat too, thanks.
Use bsd.options.mk for the gucharmap dependency/option, which now is
disabled by default, because it adds a lot of GNOME dependencies
(this is bad if you don't use GNOME).
There are too many changes to list here, but notably bugfixes and some
new features were added, as usual, please take a look at the ChangeLog
file.
diffstat:
doc/CHANGES | 3 +-
doc/TODO | 3 +-
editors/abiword/Makefile | 62 ++++++--------
editors/abiword/Makefile.common | 48 +++++++++++
editors/abiword/PLIST | 164 ++++++++++++++++++++++++++++++++++++++-
editors/abiword/distinfo | 12 +-
editors/abiword/patches/patch-ac | 50 +++--------
editors/abiword/patches/patch-ad | 17 ----
editors/abiword/patches/patch-ae | 40 ---------
editors/abiword/patches/patch-af | 61 --------------
editors/abiword/patches/patch-ag | 31 -------
11 files changed, 259 insertions(+), 232 deletions(-)
diffs (truncated from 623 to 300 lines):
diff -r a92a33aa08df -r 2b8c56472379 doc/CHANGES
--- a/doc/CHANGES Thu Oct 21 05:28:17 2004 +0000
+++ b/doc/CHANGES Thu Oct 21 06:30:39 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7508 2004/10/21 05:28:17 xtraeme Exp $
+$NetBSD: CHANGES,v 1.7509 2004/10/21 06:30:39 xtraeme Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -4799,3 +4799,4 @@
Added bash-3.0 [xtraeme 2004-10-21]
Updated nano to 1.2.4 [xtraeme 2004-10-21]
Updated libxml2 to 2.6.14 [xtraeme 2004-10-21]
+ Updated abiword to 2.0.11 [xtraeme 2004-10-21]
diff -r a92a33aa08df -r 2b8c56472379 doc/TODO
--- a/doc/TODO Thu Oct 21 05:28:17 2004 +0000
+++ b/doc/TODO Thu Oct 21 06:30:39 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.2244 2004/10/21 05:28:17 xtraeme Exp $
+$NetBSD: TODO,v 1.2245 2004/10/21 06:30:39 xtraeme Exp $
Suggested new packages
======================
@@ -175,7 +175,6 @@
o TeXmacs-1.0.4.3
o Xaw3d-1.5E
o Xbae-4.50.0
- o abiword-2.0.10 [pkg/26695]
o afterstep-2.00.00
o ald-0.1.6 [pkg/26431]
o allegro-4.1.16
diff -r a92a33aa08df -r 2b8c56472379 editors/abiword/Makefile
--- a/editors/abiword/Makefile Thu Oct 21 05:28:17 2004 +0000
+++ b/editors/abiword/Makefile Thu Oct 21 06:30:39 2004 +0000
@@ -1,57 +1,49 @@
-# $NetBSD: Makefile,v 1.79 2004/10/03 00:14:37 tv Exp $
+# $NetBSD: Makefile,v 1.80 2004/10/21 06:30:39 xtraeme Exp $
#
+.include "Makefile.common"
-DISTNAME= abiword-2.0.5
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=abiword/}
-EXTRACT_SUFX= .tar.bz2
+PKGNAME= abiword-${ABIWORD_DIST_VERSION}
-MAINTAINER= tech-pkg%NetBSD.org@localhost
-HOMEPAGE= http://www.abisource.com/
COMMENT= Open Source cross-platform word processor
-BUILD_USES_MSGFMT= yes
-
# GTK1 version and previous name of the GTK2 version
CONFLICTS= abiword-personal-[0-9]* abiword2-[0-9]*
-MAKEFILE= GNUmakefile
-GNU_CONFIGURE= yes
-USE_BUILDLINK3= yes
-USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
-USE_PERL5= run
-USE_X11= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/abi
-USE_BUILTIN.iconv= no # Make sure we get libiconv dependency.
-
REPLACE_PERL= user/wp/scripts/abw2html.pl
+PKG_OPTIONS_VAR= PKG_OPTIONS.abiword
+PKG_SUPPORTED_OPTIONS= gucharmap
+
+.include "../../mk/bsd.options.mk"
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(PKG_OPTIONS:Mgucharmap)
CONFIGURE_ARGS+= --enable-gucharmap
-CONFIGURE_ARGS+= --enable-threads
+.endif
CONFIGURE_ARGS+= --with-sys-wv
-CONFIGURE_ARGS+= --with-libxml2
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
-CONFIGURE_ARGS+= --with-popt=${BUILDLINK_PREFIX.popt}
-CONFIGURE_ARGS+= --with-libjpeg-prefix=${BUILDLINK_PREFIX.jpeg}
-CONFIGURE_ARGS+= --with-libpng=${BUILDLINK_PREFIX.png}
+
+post-install:
+ ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/abiword-docs/man/abiword.8 \
+ ${PREFIX}/man/man8/abiword.8
+ cd ${WRKDIR}/${DISTNAME}/abiword-docs/ && ${MAKE}
-.include "../../converters/fribidi/buildlink3.mk"
+SUBST_CLASSES+= docs
+SUBST_STAGE.docs= post-patch
+SUBST_FILES.docs= ${WRKDIR}/${DISTNAME}/abiword-docs/Makefile
+SUBST_SED.docs= -e "s,prefix = /usr/local,prefix = ${PREFIX}," \
+ -e "s,SHELL = /bin/sh,SHELL = ${SH},"
+SUBST_MESSAGE.docs= "Fixing docs Makefile."
+
.include "../../converters/libiconv/buildlink3.mk"
.include "../../converters/wv/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
+
+.if !empty(PKG_OPTIONS:Mgucharmap)
.include "../../fonts/gucharmap/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+.endif
+
.include "../../textproc/enchant/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r a92a33aa08df -r 2b8c56472379 editors/abiword/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/abiword/Makefile.common Thu Oct 21 06:30:39 2004 +0000
@@ -0,0 +1,48 @@
+# $NetBSD: Makefile.common,v 1.1 2004/10/21 06:30:39 xtraeme Exp $
+#
+
+ABIWORD_DIST_VERSION= 2.0.11
+DISTNAME= abiword-${ABIWORD_DIST_VERSION}
+
+CATEGORIES= editors
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=abiword/}
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= tech-pkg%NetBSD.org@localhost
+
+HOMEPAGE= http://www.abisource.com/
+
+BUILD_USES_MSGFMT= yes
+
+MAKEFILE= GNUmakefile
+GNU_CONFIGURE= yes
+USE_BUILDLINK3= yes
+USE_LIBTOOL= yes
+USE_DIRS+= xdg-1.1
+USE_GNU_TOOLS+= make
+USE_PERL5= run
+USE_X11= yes
+
+USE_BUILTIN.iconv= no # Make sure we get libiconv dependency.
+
+CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+= --with-libxml2
+CONFIGURE_ARGS+= --with-libjpeg-prefix=${BUILDLINK_PREFIX.jpeg}
+CONFIGURE_ARGS+= --with-libpng=${BUILDLINK_PREFIX.png}
+
+PATCHDIR= ${.CURDIR}/../../editors/abiword/patches
+DISTINFO_FILE= ${.CURDIR}/../../editors/abiword/distinfo
+
+.include "../../converters/fribidi/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/pkgconfig/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 "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
diff -r a92a33aa08df -r 2b8c56472379 editors/abiword/PLIST
--- a/editors/abiword/PLIST Thu Oct 21 05:28:17 2004 +0000
+++ b/editors/abiword/PLIST Thu Oct 21 06:30:39 2004 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.11 2004/01/24 13:10:56 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/10/21 06:30:39 xtraeme 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
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
@@ -26,6 +27,147 @@
share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_PluginManager.glade
share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_WindowMore.glade
share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_Zoom.glade
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtodocs.html
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtodocument.html
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtolists.html
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtomailmerge.html
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtonormaltemplate.html
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoprefs.html
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtotables.html
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtotranslation.html
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.html
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.html
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/index.html
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtodocument.html_files/exit_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtodocument.html_files/savewarning_1.png
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtomailmerge.html_files/mergefielddlg1_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtomailmerge.html_files/mergesample2_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.html_files/ruler_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.html_files/gettingstarted_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/aboutos.html
+share/AbiSuite-2.0/AbiWord/help/en-US/azindex.html
+share/AbiSuite-2.0/AbiWord/help/en-US/credits.html
+share/AbiSuite-2.0/AbiWord/help/en-US/fdl.html
+share/AbiSuite-2.0/AbiWord/help/en-US/histyle.css
+share/AbiSuite-2.0/AbiWord/help/en-US/index.html
+share/AbiSuite-2.0/AbiWord/help/en-US/introduction.html
+share/AbiSuite-2.0/AbiWord/help/en-US/search.html
+share/AbiSuite-2.0/AbiWord/help/en-US/style.css
+share/AbiSuite-2.0/AbiWord/help/en-US/info/index.html
+share/AbiSuite-2.0/AbiWord/help/en-US/info/infoformats.html
+share/AbiSuite-2.0/AbiWord/help/en-US/info/infomsdi.html
+share/AbiSuite-2.0/AbiWord/help/en-US/info/inforequirements.html
+share/AbiSuite-2.0/AbiWord/help/en-US/info/infosections.html
+share/AbiSuite-2.0/AbiWord/help/en-US/info/infospelling.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogbackgroundcolor.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogbookmark.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogbreak.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogchangecase.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogcolumns.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogdateandtime.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogfield.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogfind.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogfont.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogformatfootnotes.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogformatheaderfooters.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogformattable.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoggoto.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoghtmlexport.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoghyperlink.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogimageproperties.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoginserttable.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoglanguage.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoglists.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogmailmerge.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogmailmergetool.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogmarkrevisions.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogmergecells.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogmodifystyle.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialognew.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialognewstyle.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogopenlinux.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogpagenumbers.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogpagesetup.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogparagraph.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogplugins.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogpreferences.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogprint.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogproperties.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogreplace.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogsavelinux.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogscreencolor.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogselectrevision.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogspelling.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogstyles.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogsymbol.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogtabs.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogviewdocument.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogwordcount.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogzoom.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/index.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/menucontextual.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuedit.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/menufile.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuformat.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuhelp.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuinsert.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/menutable.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/menutools.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuview.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuwindow.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/toolbarextra.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/toolbarformatting.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/toolbarstandard.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/toolbartable.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.html
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html_files/rulers_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html_files/rulerscentertab_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html_files/rulersdecimaltab_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html_files/rulersfirstindent_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html_files/rulersindent_1.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html_files/rulersleftindent_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html_files/rulerslefttab_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html_files/rulerslinetab_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html_files/rulersmargins_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html_files/rulersrighttab_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html_files/rulerstab_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.html_files/ruler_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.html_files/full_window_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.html_files/functionbars_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.html_files/functionbars_hiding_0.png
+share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.html_files/grabbar_shaded_0.png
Home |
Main Index |
Thread Index |
Old Index