pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/abiword Update to 2.0.2 (move abiword2 package...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d39b390a48c6
branches:  trunk
changeset: 465285:d39b390a48c6
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 26 18:26:59 2003 +0000

description:
Update to 2.0.2 (move abiword2 package here and change PKGNAME, really).

diffstat:

 editors/abiword/DESCR            |   26 +-
 editors/abiword/Makefile         |  103 +++--
 editors/abiword/PLIST            |  706 ++++++++++++++------------------------
 editors/abiword/distinfo         |   19 +-
 editors/abiword/patches/patch-aa |   13 +
 editors/abiword/patches/patch-ab |   24 +-
 editors/abiword/patches/patch-ac |   16 -
 editors/abiword/patches/patch-ad |   13 -
 editors/abiword/patches/patch-ae |   24 -
 editors/abiword/patches/patch-af |   18 -
 editors/abiword/patches/patch-ag |   31 -
 editors/abiword/patches/patch-ah |   13 -
 editors/abiword/patches/patch-ai |   13 -
 editors/abiword/patches/patch-aj |   20 -
 editors/abiword/patches/patch-ak |   20 -
 editors/abiword/patches/patch-al |   23 -
 16 files changed, 365 insertions(+), 717 deletions(-)

diffs (truncated from 1166 to 300 lines):

diff -r 15a75a87573a -r d39b390a48c6 editors/abiword/DESCR
--- a/editors/abiword/DESCR     Fri Dec 26 18:25:30 2003 +0000
+++ b/editors/abiword/DESCR     Fri Dec 26 18:26:59 2003 +0000
@@ -1,8 +1,18 @@
-AbiWord is a small and simple word processor, that is fast and complete.
-Abiword's features include its "look & feel", the ability to format pages
-and paragraphs, a spell checker, an interactive ruler, the integration of
-styles, the unlimited capacity to undo/redo , a find and replace function
-and the image insertion.  It is also able to import documents from Microsoft
-Word 97 and rtf (Rich Text Format) and to save documents using Internet HTML
-format.  Several other features are planned for future releases, these
-include tables, lists and a Microsoft Word exporter.
+AbiWord is an open-source, cross-platform WYSIWYG word processor.
+This version uses GTK+2.
+
+Features include: 
+
+ - Basic character formatting (bold, underline, italics, etc.) 
+ - Paragraph alignment 
+ - Spell-check 
+ - Import of Word97 and RTF documents 
+ - Export to RTF, Text, HTML, and LaTeX formats 
+ - Interactive rulers and tabs 
+ - Styles 
+ - Unlimited undo/redo 
+ - Multiple column control 
+ - Widow/orphan control 
+ - Find/Replace 
+ - Anti-aliased fonts
+ - Images
diff -r 15a75a87573a -r d39b390a48c6 editors/abiword/Makefile
--- a/editors/abiword/Makefile  Fri Dec 26 18:25:30 2003 +0000
+++ b/editors/abiword/Makefile  Fri Dec 26 18:26:59 2003 +0000
@@ -1,60 +1,71 @@
-# $NetBSD: Makefile,v 1.59 2003/11/04 23:00:00 reed Exp $
+# $NetBSD: Makefile,v 1.60 2003/12/26 18:26:59 wiz Exp $
 #
-# According to AbiSource's explanation of their trademark rights,
-# compilations/distributions of AbiWord not provided by AbiSource must
-# be named either "AbiWord Personal" or some name completely unlike
-# AbiSource's registered trademarks.
+
+DISTNAME=              abiword-${DIST_VER}
+WRKSRC=                        ${WRKDIR}/${DISTNAME}/abi
+CATEGORIES=            editors
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=abiword/}
+
+MAINTAINER=            xtraeme%NetBSD.org@localhost
+HOMEPAGE=              http://www.abisource.com/
+COMMENT=               Open Source cross-platform word processor
 
-DISTNAME=      abiword-${ABIWORD_VERS}
-PKGNAME=       abiword-personal-${ABIWORD_VERS}
-PKGREVISION=   3
-WRKSRC=                ${WRKDIR}/${DISTNAME}/abi
-CATEGORIES=    editors
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=abiword/}
+BUILD_USES_MSGFMT=     yes
+
+# GTK1 version and previous name of the GTK2 version
+CONFLICTS=             abiword-personal-[0-9]* abiword2-[0-9]*
 
-MAINTAINER=    dawszy%arhea.net@localhost
-HOMEPAGE=      http://www.abisource.com/
-COMMENT=       Open Source cross-platform word processor
+GNU_CONFIGURE=         yes
+USE_BUILDLINK2=                yes
+USE_GMAKE=             yes
+USE_PERL5=             run
+USE_X11=               yes
 
-DEPENDS+=      ispell-base-[0-9]*:../../textproc/ispell-base
+REPLACE_PERL=          user/wp/scripts/abw2html.pl
+
+USE_GNU_ICONV=         yes # XXX
 
-DIST_SUBDIR=   abisuite
-ABIWORD_VERS=  1.0.5
+MAKEFILE=              GNUmakefile
+
+DIST_VER=              2.0.2
 
-USE_BUILDLINK2=        # defined
-USE_X11=       # defined
-USE_GMAKE=     # defined
-USE_GNU_ICONV= # defined
-GNU_CONFIGURE= # defined
-MAKEFILE=      GNUmakefile
+CONFIGURE_ARGS+=       --enable-threads
+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}
 
-CONFIGURE_ARGS+=       --with-psiconv=${BUILDLINK_PREFIX.psiconv}
-CONFIGURE_ARGS+=       --with-expat=${BUILDLINK_PREFIX.expat}
-CONFIGURE_ARGS+=       --without-libwmf
-CONFIGURE_ARGS+=       --prefix=${PREFIX}
-CONFIGURE_ARGS+=       --datadir=${PREFIX}/share
+PATCHDIR=              ${.CURDIR}/../../editors/abiword2/patches
+PLIST_SRC=             ${.CURDIR}/../../editors/abiword2/PLIST
+DESCR_SRC=             ${.CURDIR}/../../editors/abiword2/DESCR
+DISTINFO_FILE=         ${.CURDIR}/../../editors/abiword2/distinfo
+
+.include "../../mk/bsd.prefs.mk"
 
-OS_CFLAGS=     ${CFLAGS}
+BUILD_DEFS+=                   ABIWORD_USES_GUCHARMAP
+
+ABIWORD_USES_GUCHARMAP?=       NO
 
-.if exists(/usr/include/inttypes.h)
-OS_CFLAGS+=    -DHAVE_INTTYPE_H=1
+.if !empty(ABIWORD_USES_GUCHARMAP:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=               --enable-gucharmap
+.include "../../fonts/gucharmap/buildlink2.mk"
+.else
+CONFIGURE_ARGS+=               --disable-gucharmap
 .endif
 
-MAKE_ENV+=     OS_CFLAGS="${OS_CFLAGS}"
-
-MAKE_FLAGS+=   ABI_BUILD_VERSION="${ABIWORD_VERS}"
-MAKE_FLAGS+=   UNIX_CAN_BUILD_STATIC=0
-
+.include "../../converters/fribidi/buildlink2.mk"
 .include "../../converters/libiconv/buildlink2.mk"
+.include "../../converters/wv/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../textproc/enchant/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../devel/libglade2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 
-.if defined(ICONV_IS_GNU)
-CONFIGURE_ARGS+=       --with-libiconv=${BUILDLINK_PREFIX.iconv}
-.endif
-
-.include "../../converters/psiconv/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../textproc/expat/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-
+.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 15a75a87573a -r d39b390a48c6 editors/abiword/PLIST
--- a/editors/abiword/PLIST     Fri Dec 26 18:25:30 2003 +0000
+++ b/editors/abiword/PLIST     Fri Dec 26 18:26:59 2003 +0000
@@ -1,450 +1,262 @@
-@comment $NetBSD: PLIST,v 1.9 2003/01/28 13:57:52 martti Exp $
-bin/AbiWord
-bin/AbiWord_d
+@comment $NetBSD: PLIST,v 1.10 2003/12/26 18:26:59 wiz Exp $
+bin/AbiWord-2.0
 bin/abiword
 bin/ttfadmin.sh
 bin/ttftool
-share/AbiSuite/AbiWord/help/en-US/aboutos.html
-share/AbiSuite/AbiWord/help/en-US/credits.html
-share/AbiSuite/AbiWord/help/en-US/credits.txt
-share/AbiSuite/AbiWord/help/en-US/fdl.html
-share/AbiSuite/AbiWord/help/en-US/histyle.css
-share/AbiSuite/AbiWord/help/en-US/howto/howtonormaltemplate.html
-share/AbiSuite/AbiWord/help/en-US/howto/howtotables.html
-share/AbiSuite/AbiWord/help/en-US/howto/howtoweb.html
-share/AbiSuite/AbiWord/help/en-US/howto/howtoweb.xhtml_data/ruler.png
-share/AbiSuite/AbiWord/help/en-US/howto/howtoword.html
-share/AbiSuite/AbiWord/help/en-US/howto/howtoword.xhtml_data/gettingstarted.abw-0.png
-share/AbiSuite/AbiWord/help/en-US/howto/index.html
-share/AbiSuite/AbiWord/help/en-US/index.html
-share/AbiSuite/AbiWord/help/en-US/info/index.html
-share/AbiSuite/AbiWord/help/en-US/info/inforequirements.html
-share/AbiSuite/AbiWord/help/en-US/info/infospelling.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogactivatewindow.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogbackgroundcolor.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogbookmark.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogbreak.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogchangecase.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogcolumns.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogdateandtime.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogfield.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogfind.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogfont.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogformatheaderfooters.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialoggoto.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialoghyperlink.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogimageproperties.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialoglanguage.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialoglists.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogmodifystyle.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialognew.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialognewstyle.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogopenlinux.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogpagenumbers.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogpagesetup.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogparagraph.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogplugins.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogpreferences.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogreplace.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogreplace.xhtml_data/replace.png
-share/AbiSuite/AbiWord/help/en-US/interface/dialogsavelinux.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogscreencolor.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogspelling.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogstyles.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogsymbol.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogtabs.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogwordcount.html
-share/AbiSuite/AbiWord/help/en-US/interface/dialogzoom.html
-share/AbiSuite/AbiWord/help/en-US/interface/index.html
-share/AbiSuite/AbiWord/help/en-US/interface/menucontextual.html
-share/AbiSuite/AbiWord/help/en-US/interface/menuedit.html
-share/AbiSuite/AbiWord/help/en-US/interface/menufile.html
-share/AbiSuite/AbiWord/help/en-US/interface/menufile.xhtml_data/menufile.png
-share/AbiSuite/AbiWord/help/en-US/interface/menuformat.html
-share/AbiSuite/AbiWord/help/en-US/interface/menuhelp.html
-share/AbiSuite/AbiWord/help/en-US/interface/menuinsert.html
-share/AbiSuite/AbiWord/help/en-US/interface/menutools.html
-share/AbiSuite/AbiWord/help/en-US/interface/menuview.html
-share/AbiSuite/AbiWord/help/en-US/interface/menuweb.html
-share/AbiSuite/AbiWord/help/en-US/interface/menuwindow.html
-share/AbiSuite/AbiWord/help/en-US/interface/rulers.html
-share/AbiSuite/AbiWord/help/en-US/interface/rulers.xhtml_data/rulers.png
-share/AbiSuite/AbiWord/help/en-US/interface/rulers.xhtml_data/rulerscentertab.png
-share/AbiSuite/AbiWord/help/en-US/interface/rulers.xhtml_data/rulersdecimaltab.png
-share/AbiSuite/AbiWord/help/en-US/interface/rulers.xhtml_data/rulersfirstindent.png
-share/AbiSuite/AbiWord/help/en-US/interface/rulers.xhtml_data/rulersindent.png
-share/AbiSuite/AbiWord/help/en-US/interface/rulers.xhtml_data/rulersleftindent.png
-share/AbiSuite/AbiWord/help/en-US/interface/rulers.xhtml_data/rulerslefttab.png
-share/AbiSuite/AbiWord/help/en-US/interface/rulers.xhtml_data/rulerslinetab.png
-share/AbiSuite/AbiWord/help/en-US/interface/rulers.xhtml_data/rulersmargins.png
-share/AbiSuite/AbiWord/help/en-US/interface/rulers.xhtml_data/rulersrighttab.png
-share/AbiSuite/AbiWord/help/en-US/interface/rulers.xhtml_data/rulerstab.png
-share/AbiSuite/AbiWord/help/en-US/interface/toolbarextra.html
-share/AbiSuite/AbiWord/help/en-US/interface/toolbarformatting.html
-share/AbiSuite/AbiWord/help/en-US/interface/toolbarstandard.html
-share/AbiSuite/AbiWord/help/en-US/interface/workspace.html
-share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/full_window.png
-share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/functionbars.png
-share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/functionbars_hiding.png
-share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/grabbar_shaded.png
-share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/ruler.png
-share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/statusbar.png
-share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/statusbar_quickhelp.png
-share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/titlebar.png
-share/AbiSuite/AbiWord/help/en-US/introduction.html
-share/AbiSuite/AbiWord/help/en-US/problems/index.html
-share/AbiSuite/AbiWord/help/en-US/problems/problemsbugs.html
-share/AbiSuite/AbiWord/help/en-US/problems/problemsfaq.html
-share/AbiSuite/AbiWord/help/en-US/problems/problemsfonts.html
-share/AbiSuite/AbiWord/help/en-US/problems/problemshelp.html
-share/AbiSuite/AbiWord/help/en-US/search.html
-share/AbiSuite/AbiWord/help/en-US/style.css
-share/AbiSuite/AbiWord/help/en-US/tutorial/index.html
-share/AbiSuite/AbiWord/help/fr-FR/aboutos.html
-share/AbiSuite/AbiWord/help/fr-FR/credits.html
-share/AbiSuite/AbiWord/help/fr-FR/fdl.html
-share/AbiSuite/AbiWord/help/fr-FR/histyle.css
-share/AbiSuite/AbiWord/help/fr-FR/howto/howtonormaltemplate.html
-share/AbiSuite/AbiWord/help/fr-FR/howto/howtotables.html
-share/AbiSuite/AbiWord/help/fr-FR/howto/howtoweb.html
-share/AbiSuite/AbiWord/help/fr-FR/howto/howtoweb.xhtml_data/ruler.png
-share/AbiSuite/AbiWord/help/fr-FR/howto/howtoword.html
-share/AbiSuite/AbiWord/help/fr-FR/howto/howtoword.xhtml_data/gettingstarted.abw.png
-share/AbiSuite/AbiWord/help/fr-FR/howto/index.html
-share/AbiSuite/AbiWord/help/fr-FR/index.html
-share/AbiSuite/AbiWord/help/fr-FR/info/index.html
-share/AbiSuite/AbiWord/help/fr-FR/info/infoformats.html
-share/AbiSuite/AbiWord/help/fr-FR/info/infomsdi.html
-share/AbiSuite/AbiWord/help/fr-FR/info/inforequirements.html
-share/AbiSuite/AbiWord/help/fr-FR/info/infosections.html
-share/AbiSuite/AbiWord/help/fr-FR/info/infospelling.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogactivatewindow.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogbackgroundcolor.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogbookmark.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogbreak.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogchangecase.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogcolumns.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogdateandtime.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogfield.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogfind.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogfont.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogformatheaderfooters.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialoggoto.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialoghyperlink.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogimageproperties.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialoglanguage.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialoglists.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogmodifystyle.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialognew.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialognewstyle.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogopenlinux.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogpagenumbers.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogpagesetup.html
-share/AbiSuite/AbiWord/help/fr-FR/interface/dialogparagraph.html



Home | Main Index | Thread Index | Old Index