diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | doc/TODO | 3 | ||||
| -rw-r--r-- | editors/abiword/Makefile | 62 | ||||
| -rw-r--r-- | editors/abiword/Makefile.common | 48 | ||||
| -rw-r--r-- | editors/abiword/PLIST | 164 | ||||
| -rw-r--r-- | editors/abiword/distinfo | 12 | ||||
| -rw-r--r-- | editors/abiword/patches/patch-ac | 48 | ||||
| -rw-r--r-- | editors/abiword/patches/patch-ad | 17 | ||||
| -rw-r--r-- | editors/abiword/patches/patch-ae | 40 | ||||
| -rw-r--r-- | editors/abiword/patches/patch-af | 61 | ||||
| -rw-r--r-- | editors/abiword/patches/patch-ag | 31 |
11 files changed, 258 insertions, 231 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index b57087155d4..35fdda8ff7b 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -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 @@ Changes to the packages collection and infrastructure in 2004: 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] @@ -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 @@ Suggested package updates 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 --git a/editors/abiword/Makefile b/editors/abiword/Makefile index bacf38ec00a..509682f8228 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -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 -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} -.include "../../converters/fribidi/buildlink3.mk" +post-install: + ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/abiword-docs/man/abiword.8 \ + ${PREFIX}/man/man8/abiword.8 + cd ${WRKDIR}/${DISTNAME}/abiword-docs/ && ${MAKE} + +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 --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common new file mode 100644 index 00000000000..61ce3659a01 --- /dev/null +++ b/editors/abiword/Makefile.common @@ -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 + +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 --git a/editors/abiword/PLIST b/editors/abiword/PLIST index b191947acf9..a756489bb36 100644 --- a/editors/abiword/PLIST +++ b/editors/abiword/PLIST @@ -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_Password.glade 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 +share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.html_files/statusbar_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.html_files/statusbar_quickhelp_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.html_files/titlebar_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/plugins/index.html +share/AbiSuite-2.0/AbiWord/help/en-US/problems/index.html +share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemsbugs.html +share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemsfaq.html +share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemshelp.html +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/intro.html +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/index.html +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_10_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_11_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_12_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_13_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_14_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_15_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_16_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_17_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_18_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_19_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_1_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_20_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_2_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_3_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_4_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_5_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_6_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_7_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_8_0.png +share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files/image_9_0.png share/AbiSuite-2.0/AbiWord/readme.txt share/AbiSuite-2.0/AbiWord/scripts/abw2html.pl share/AbiSuite-2.0/AbiWord/strings/am-ET.strings @@ -59,6 +201,7 @@ share/AbiSuite-2.0/AbiWord/strings/jbo.strings share/AbiSuite-2.0/AbiWord/strings/lt-LT.strings share/AbiSuite-2.0/AbiWord/strings/lv-LV.strings share/AbiSuite-2.0/AbiWord/strings/mh-MH.strings +share/AbiSuite-2.0/AbiWord/strings/mk-MK.strings share/AbiSuite-2.0/AbiWord/strings/ms-MY.strings share/AbiSuite-2.0/AbiWord/strings/nb-NO.strings share/AbiSuite-2.0/AbiWord/strings/nl-NL.strings @@ -66,6 +209,7 @@ share/AbiSuite-2.0/AbiWord/strings/nn-NO.strings share/AbiSuite-2.0/AbiWord/strings/pl-PL.strings share/AbiSuite-2.0/AbiWord/strings/pt-BR.strings share/AbiSuite-2.0/AbiWord/strings/pt-PT.strings +share/AbiSuite-2.0/AbiWord/strings/qu-BO.strings share/AbiSuite-2.0/AbiWord/strings/ro-RO.strings share/AbiSuite-2.0/AbiWord/strings/ru-RU.strings share/AbiSuite-2.0/AbiWord/strings/sc-IT.strings @@ -187,8 +331,11 @@ share/AbiSuite-2.0/templates/A4.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/Memo.awt share/AbiSuite-2.0/templates/Two-Columns.awt share/AbiSuite-2.0/templates/US-Letter.awt +share/AbiSuite-2.0/templates/Press-Release.awt +share/AbiSuite-2.0/templates/Resume.awt share/AbiSuite-2.0/templates/normal.awt share/AbiSuite-2.0/templates/normal.awt-am_ET share/AbiSuite-2.0/templates/normal.awt-ar @@ -259,5 +406,20 @@ share/icons/abiword_48.png @dirrm share/AbiSuite-2.0/AbiWord/strings @dirrm share/AbiSuite-2.0/AbiWord/scripts @dirrm share/AbiSuite-2.0/AbiWord/glade +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/window.html_files +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/tutorial +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/problems +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/plugins +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.html_files +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html_files +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/info +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.html_files +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.html_files +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtomailmerge.html_files +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtodocument.html_files +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto +@dirrm share/AbiSuite-2.0/AbiWord/help/en-US +@dirrm share/AbiSuite-2.0/AbiWord/help @dirrm share/AbiSuite-2.0/AbiWord @dirrm share/AbiSuite-2.0 diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index 3212ab9ecdf..01fd24f38aa 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1,11 +1,7 @@ -$NetBSD: distinfo,v 1.27 2004/06/27 20:06:24 dmcmahill Exp $ +$NetBSD: distinfo,v 1.28 2004/10/21 06:30:39 xtraeme Exp $ -SHA1 (abiword-2.0.5.tar.bz2) = 27a8c51b2060cbc8eeeef03b96ec4ee105ccb172 -Size (abiword-2.0.5.tar.bz2) = 21955989 bytes +SHA1 (abiword-2.0.11.tar.bz2) = 356828fbcec5ffade735f5bf68b8d9a7f6e9ef09 +Size (abiword-2.0.11.tar.bz2) = 22200079 bytes SHA1 (patch-aa) = 730e205f54516535394659c74e052bbe706e1bc2 SHA1 (patch-ab) = 27c48de3374288c7f6d6749ff18ebeedf91cb3ab -SHA1 (patch-ac) = c490908a2b6b60a728bfacd43865641ae6960f58 -SHA1 (patch-ad) = 349fdd5fcab9361cf956b8496f22098e1c96128d -SHA1 (patch-ae) = c19688feedb2e411978e8289a57371fa7075918f -SHA1 (patch-af) = b764eff8b107cb79b655d5bea7b408598e0935b6 -SHA1 (patch-ag) = 7836f5518120bd534fee29c88887da062e7a0425 +SHA1 (patch-ac) = 883e0cae06ca96b92d81a0183f15a5af8fc77be2 diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac index 0f883a1bf5f..c23b82d162a 100644 --- a/editors/abiword/patches/patch-ac +++ b/editors/abiword/patches/patch-ac @@ -1,38 +1,16 @@ -$NetBSD: patch-ac,v 1.11 2004/06/27 20:06:24 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.12 2004/10/21 06:30:39 xtraeme Exp $ ---- src/af/xap/xp/xap_Draw_Symbol.cpp.orig Wed May 7 17:40:40 2003 -+++ src/af/xap/xp/xap_Draw_Symbol.cpp -@@ -153,7 +153,7 @@ void XAP_Draw_Symbol::draw(void) - - for (i = 0; i < m_vCharSet.size(); i += 2) - { -- UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i])); -+ UT_UCSChar base = static_cast<UT_UCSChar>((UT_uint32)(m_vCharSet[i])); - size_t nb_chars = reinterpret_cast<size_t>(m_vCharSet[i + 1]); - - for (UT_UCSChar j = base; j < base + nb_chars; ++j) -@@ -194,11 +194,11 @@ UT_UCSChar XAP_Draw_Symbol::calcSymbolFr - UT_DEBUGMSG(("calcSymbolFromCoords(x = [%u], y = [%u]) =", ix, iy)); - for (size_t i = 0; i < m_vCharSet.size(); i += 2) - { -- count += reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]); -+ count += (UT_uint32)(m_vCharSet[i + 1]); - if (count > index) - { - UT_DEBUGMSG((" %u\n", static_cast<UT_uint32>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1])))); -- return static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1])); -+ return static_cast<UT_UCSChar>((UT_uint32)(m_vCharSet[i]) + index - count + (UT_uint32)(m_vCharSet[i + 1])); +--- 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 @@ + fmtstring = "phoenix '%s' &"; + execstring = g_strdup_printf(fmtstring, szURL); } - } - -@@ -227,8 +227,8 @@ void XAP_Draw_Symbol::calculatePosition( - - for (size_t i = 0; i < m_vCharSet.size(); i += 2) - { -- UT_uint32 base = reinterpret_cast<UT_uint32>(m_vCharSet[i]); -- UT_uint32 size = reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]); -+ UT_uint32 base = (UT_uint32)(m_vCharSet[i]); -+ UT_uint32 size = (UT_uint32)(m_vCharSet[i + 1]); - - if (base + size > c) ++ else if(progExists("firefox")) ++ { ++ fmtstring = "firefox -a firefox -remote openURL\\('%s'\\) || firefox '%s' &"; ++ execstring = g_strdup_printf(fmtstring, szURL, szURL); ++ } + else if(progExists("netscape")) { + // Try to connect to a running Netscape, if not, start new one diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad deleted file mode 100644 index 64ffdcb85a1..00000000000 --- a/editors/abiword/patches/patch-ad +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ad,v 1.11 2004/06/27 20:06:24 dmcmahill Exp $ - ---- src/af/xap/unix/xap_UnixFont.cpp.orig Fri Aug 22 20:52:07 2003 -+++ src/af/xap/unix/xap_UnixFont.cpp -@@ -400,10 +400,10 @@ const encoding_pair *XAP_UnixFont::loadE - size_t idx = 0; - for (size_t i = 0; i < coverage.size(); i += 2) - { -- UT_UCSChar c1 = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(coverage[i])); -+ UT_UCSChar c1 = static_cast<UT_UCSChar>((UT_uint32)(coverage[i])); - UT_UCSChar c2 = - static_cast<UT_UCSChar>(static_cast<UT_uint32>(c1)) + -- static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(coverage[i + 1])); -+ static_cast<UT_UCSChar>((UT_uint32)(coverage[i + 1])); - for (UT_UCSChar c = c1; c < c2; ++c) - { - FT_UInt glyph_idx = FT_Get_Char_Index(face, c); diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae deleted file mode 100644 index 72a995f073b..00000000000 --- a/editors/abiword/patches/patch-ae +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ae,v 1.12 2004/06/27 20:06:24 dmcmahill Exp $ - ---- src/wp/impexp/xp/ie_exp_HTML.cpp.orig Mon Jan 12 08:31:23 2004 -+++ src/wp/impexp/xp/ie_exp_HTML.cpp -@@ -777,7 +777,7 @@ void s_HTML_Listener::tagClose (UT_uint3 - void * vptr = 0; - m_tagStack.pop (&vptr); - -- if (reinterpret_cast<UT_uint32>(vptr) == tagID) return; -+ if ((UT_uint32)(vptr) == tagID) return; - - UT_DEBUGMSG(("WARNING: possible tag mis-match in XHTML output!\n")); - } -@@ -821,7 +821,7 @@ void s_HTML_Listener::tagCloseBroken (co - UT_uint32 s_HTML_Listener::tagTop () - { - void * vptr = 0; -- if (m_tagStack.viewTop (&vptr)) return reinterpret_cast<UT_uint32>(vptr); -+ if (m_tagStack.viewTop (&vptr)) return (UT_uint32)(vptr); - return 0; - } - -@@ -1899,7 +1899,7 @@ UT_uint16 s_HTML_Listener::listType () - { - void * vptr = 0; - m_utsListType.viewTop (&vptr); -- return static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr)); -+ return static_cast<UT_uint16>((UT_uint32)(vptr)); - } - - void s_HTML_Listener::listPush (UT_uint16 type, const char * ClassName) -@@ -1938,7 +1938,7 @@ void s_HTML_Listener::listPop () - - void * vptr = 0; - m_utsListType.pop (&vptr); -- UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr)); -+ UT_uint16 type = static_cast<UT_uint16>((UT_uint32)(vptr)); - - UT_uint32 tagID; - diff --git a/editors/abiword/patches/patch-af b/editors/abiword/patches/patch-af deleted file mode 100644 index f5af50c12d0..00000000000 --- a/editors/abiword/patches/patch-af +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-af,v 1.8 2004/06/27 20:06:24 dmcmahill Exp $ - ---- src/wp/impexp/xp/ie_imp_RTF.cpp.orig Thu Mar 4 08:21:10 2004 -+++ src/wp/impexp/xp/ie_imp_RTF.cpp -@@ -1211,9 +1211,9 @@ RTFProps_ParaProps& RTFProps_ParaProps:: - m_iOverrideLevel = other.m_iOverrideLevel; - if(m_tabTypes.getItemCount() > 0) - { -- UT_uint32 dum = reinterpret_cast<UT_uint32>(m_tabTypes.getNthItem(0)); -+ UT_uint32 dum = (UT_uint32)(m_tabTypes.getNthItem(0)); - m_curTabType = static_cast<eTabType>(dum); -- dum = reinterpret_cast<UT_uint32>(m_tabLeader.getNthItem(0)); -+ dum = (UT_uint32)(m_tabLeader.getNthItem(0)); - m_curTabLeader = static_cast<eTabLeader>(dum); - } - else -@@ -2458,7 +2458,7 @@ UT_uint32 IE_Imp_RTF::GetNthTableColour( - { - if (colNum < m_colourTable.getItemCount()) - { -- return reinterpret_cast<UT_uint32>(m_colourTable.getNthItem(colNum)); -+ return (UT_uint32)(m_colourTable.getNthItem(colNum)); - } - else - { -@@ -2470,7 +2470,7 @@ UT_sint32 IE_Imp_RTF::GetNthTableBgColou - { - if (colNum < m_colourTable.getItemCount()) - { -- return reinterpret_cast<UT_sint32>(m_colourTable.getNthItem(colNum)); -+ return (UT_sint32)(m_colourTable.getNthItem(colNum)); - } - else - { -@@ -6361,11 +6361,11 @@ bool IE_Imp_RTF::ApplyParagraphAttribute - if (i > 0) - propBuffer += ","; - -- UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i)); -+ UT_sint32 tabTwips = (UT_sint32)(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i)); - double tabIn = tabTwips/(20.0*72.); -- UT_uint32 idum = reinterpret_cast<UT_uint32>(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i)); -+ UT_uint32 idum = (UT_uint32)(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i)); - eTabType tabType = static_cast<eTabType>(idum); -- idum = reinterpret_cast<UT_uint32>((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i))); -+ idum = (UT_uint32)((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i))); - eTabLeader tabLeader = static_cast<eTabLeader>(idum); - char cType = ' '; - switch(tabType) -@@ -9874,9 +9874,9 @@ bool IE_Imp_RTF::buildAllProps(char * pr - if (i > 0) - strcat(propBuffer, ","); - -- UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(pParas->m_tabStops.getNthItem(i)); -+ UT_sint32 tabTwips = (UT_sint32)(pParas->m_tabStops.getNthItem(i)); - double tabIn = tabTwips/(20.0*72.); -- UT_uint32 idum = reinterpret_cast<UT_uint32>(pParas->m_tabTypes.getNthItem(i)); -+ UT_uint32 idum = (UT_uint32)(pParas->m_tabTypes.getNthItem(i)); - eTabType tabType = static_cast<eTabType>(idum); - idum = (UT_uint32) (pParas->m_tabLeader.getNthItem(i)); - eTabLeader tabLeader = static_cast<eTabLeader>(idum); diff --git a/editors/abiword/patches/patch-ag b/editors/abiword/patches/patch-ag deleted file mode 100644 index 0db9c8c4a34..00000000000 --- a/editors/abiword/patches/patch-ag +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ag,v 1.9 2004/06/27 20:06:24 dmcmahill Exp $ - ---- src/wp/impexp/xp/ie_Table.cpp.orig Mon Aug 25 01:45:11 2003 -+++ src/wp/impexp/xp/ie_Table.cpp -@@ -1028,7 +1028,7 @@ UT_sint32 ie_imp_table::NewRow(void) - UT_sint32 j = 0; - for(j=0; !bMatch && (j < static_cast<UT_sint32>(m_vecCellX.getItemCount())); j++) - { -- UT_sint32 prevX = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(j)); -+ UT_sint32 prevX = (UT_sint32)(m_vecCellX.getNthItem(j)); - UT_DEBUGMSG(("Prev cell %d cellx %d \n",j,prevX)); - bool bLast = ((j-1) == szCurRow); - bMatch = doCellXMatch(prevX,curX,bLast); -@@ -1179,7 +1179,7 @@ void ie_imp_table::writeTablePropsInDoc( - sColWidth.clear(); - for(i=0; i< static_cast<UT_sint32>(m_vecCellX.getItemCount()); i++) - { -- UT_sint32 iCellx = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(i)); -+ UT_sint32 iCellx = (UT_sint32)(m_vecCellX.getNthItem(i)); - xxx_UT_DEBUGMSG(("final cellx import cellx %d iPrev %x \n",iCellx,iPrev)); - UT_sint32 iDiffCellx = iCellx - iPrev; - double dCellx = static_cast<double>(iDiffCellx)/1440.0 -dColSpace; -@@ -1377,7 +1377,7 @@ UT_sint32 ie_imp_table::getColNumber(ie_ - UT_sint32 iSub = 0; - for(i=0; !bFound && (i< static_cast<UT_sint32>(m_vecCellX.getItemCount())); i++) - { -- UT_sint32 icellx = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(i)); -+ UT_sint32 icellx = (UT_sint32)(m_vecCellX.getNthItem(i)); - if(icellx == -1) - { - iSub++; |