From a0168a52441475f92bb3f2ac25ab1a09027b2b15 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 2 May 2000 23:35:55 +0000 Subject: Update abiword-personal to 0.7.9. Remove several patches which were incorporated into the AbiWord main source tree. Changes from 0.7.8: User Interface + Insert Symbol dialog (msevior@mccubbin.ph.unimelb.edu.au) + Word Count dialog (Sam Tobin-Hochstadt) + Overwrite Mode added (Alexey Sinutin) + Set Page Margins from ruler (Bruce Pearson) + Insert Field dialog (Henrik Berg)-- not fully enabled due to pending changes in the underlying fields implementation. Bug Fixes + The infamous libpng bug (Justin Bradford and Sam Tobin-Hochstadt) + Underline/superscript fix (Martin Sevior) + View Ruler consistency (Kevin Vajk) + RTF CR/LF handing (Harald Fernengel) + Various Other Bugs: #522 (sterwill@sourcegear.com), #10 and #811 (Sam Tobin-Hochstadt), #302 (Aaron Lehmann), #352 (Henrik Berg), #432 and #776 (Martin Sevior), #637 (Andy Richardson), #651 (Matt Kraai), #770 (Matthew Allen), #782 (Danny Faught), #788 and #789 (Joaquin Cuenca Abela) Other + Various localizations + Updated XML parser to version 1.1 (Sam Tobin-Hochstadt) + Mac port beginning (Bryan Prusha) + Lots of Gnome dialogs (John Tunison) -- no Gnome binaries for 0.7.9 but will be available in the next release + Command line conversions (Joaquin Cuenca Abela) -- for a complete list, type AbiWord -help from a command prompt --- editors/abiword/Makefile | 31 +++++------ editors/abiword/files/GNUMakefile.install | 12 ----- editors/abiword/files/md5 | 14 ++--- editors/abiword/files/patch-sum | 14 ++--- editors/abiword/patches/patch-ac | 31 ++--------- editors/abiword/patches/patch-ad | 59 ++------------------- editors/abiword/patches/patch-ae | 28 ++-------- editors/abiword/patches/patch-af | 13 ----- editors/abiword/patches/patch-ag | 88 ------------------------------- editors/abiword/patches/patch-ah | 86 ------------------------------ editors/abiword/patches/patch-ai | 13 ----- editors/abiword/patches/patch-aj | 13 ----- editors/abiword/patches/patch-ak | 13 +++++ editors/abiword/pkg/DESCR | 2 +- editors/abiword/pkg/PLIST | 36 +++++++------ 15 files changed, 69 insertions(+), 384 deletions(-) delete mode 100644 editors/abiword/files/GNUMakefile.install delete mode 100644 editors/abiword/patches/patch-af delete mode 100644 editors/abiword/patches/patch-ag delete mode 100644 editors/abiword/patches/patch-ah delete mode 100644 editors/abiword/patches/patch-ai delete mode 100644 editors/abiword/patches/patch-aj create mode 100644 editors/abiword/patches/patch-ak (limited to 'editors') diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 2ebebbdb86f..f7ee889f98c 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,15 +1,17 @@ -# $NetBSD: Makefile,v 1.8 2000/03/21 22:40:51 tron Exp $ +# $NetBSD: Makefile,v 1.9 2000/05/02 23:35:55 jlam Exp $ # -# According to the AbiSource license, compilations/distributions of AbiWord -# not provided by AbiSource must be named "AbiWord Personal". +# According to AbiSource's explanation of their trademark rights, +# compilations/distributions of AbiWord not provided by AbiSource must +# be named "AbiWord Personal" or some name completely unlike AbiSource's +# registered trademarks. # DISTNAME= abi-${ABIWORD_VERS} PKGNAME= abiword-personal-${ABIWORD_VERS} -ABIWORD_VERS= 0.7.8 +ABIWORD_VERS= 0.7.9 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/Version-${ABIWORD_VERS}/lf/ -DISTFILES= ${ABISRC} ${ABIDISTFILES} ${ICONVSRC} ${EXPATSRC} \ +DISTFILES= ${ABISRC} ${ABIDISTFILES} ${EXPATSRC} ${ICONVSRC} \ ${UNIXFONTS} ${WVSRC} MAINTAINER= jlam@netbsd.org @@ -20,9 +22,9 @@ DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= png>=1.0.6:../../graphics/png DEPENDS+= xpm-3.4k:../../graphics/xpm -USE_X11= yes -USE_GMAKE= yes -NO_CONFIGURE= yes +USE_X11= # defined +USE_GMAKE= # defined +NO_CONFIGURE= # defined ALL_TARGET= compile canonical DIST_SUBDIR= abisuite @@ -33,20 +35,11 @@ ICONVSRC= libiconv-${ABIWORD_VERS}${EXTRACT_SUFX} UNIXFONTS= unixfonts-${ABIWORD_VERS}${EXTRACT_SUFX} WVSRC= wv-${ABIWORD_VERS}${EXTRACT_SUFX} -ABISUITE_HOME= ${PREFIX}/share/AbiSuite -ABISUITE_LIBEXEC= ${PREFIX}/libexec/AbiSuite - -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include # png.h +LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib # -lpng MAKE_ENV+= ABI_BUILD_VERSION="${ABIWORD_VERS}" \ - ABISUITE_HOME="${ABISUITE_HOME}" \ - ABISUITE_LIBEXEC="${ABISUITE_LIBEXEC}" \ OS_CFLAGS="${CPPFLAGS}" \ OS_DLLFLAGS="${LDFLAGS}" -post-patch: - ${MKDIR} ${WRKSRC}/src/pkg/netbsd - ${CP} ${FILESDIR}/GNUMakefile.install ${WRKSRC}/src/pkg/netbsd/Makefile - .include "../../mk/bsd.pkg.mk" diff --git a/editors/abiword/files/GNUMakefile.install b/editors/abiword/files/GNUMakefile.install deleted file mode 100644 index 3835079cda2..00000000000 --- a/editors/abiword/files/GNUMakefile.install +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: GNUMakefile.install,v 1.2 2000/02/29 18:31:30 jlam Exp $ - -ABI_ROOT:=$(shell pwd)/../../.. -include $(ABI_ROOT)/src/config/abi_defs_wp.mk -include $(ABI_ROOT)/src/config/abi_rules.mk - -# The plain "install" common to all Unix targets -install: - @TARGET=${ABISUITE_HOME} BINDIR=$(prefix)/bin \ - LIBEXECDIR=${ABISUITE_LIBEXEC} SRCDIR=$(OUTDIR) \ - SCRIPTDIR=$(ABI_ROOT)/src/pkg/common/unix/scripts \ - $(ABI_ROOT)/src/pkg/common/unix/scripts/install.sh diff --git a/editors/abiword/files/md5 b/editors/abiword/files/md5 index 3261da5dee0..fd4c8b557ca 100644 --- a/editors/abiword/files/md5 +++ b/editors/abiword/files/md5 @@ -1,8 +1,8 @@ -$NetBSD: md5,v 1.3 2000/02/29 18:31:30 jlam Exp $ +$NetBSD: md5,v 1.4 2000/05/02 23:35:56 jlam Exp $ -MD5 (abisuite/abi-0.7.8.tar.gz) = fbbf39257b4d4af94013825a4fad5f59 -MD5 (abisuite/abidistfiles-0.7.8.tar.gz) = 3d704137bbb0741cac7eeb0642f58f41 -MD5 (abisuite/libiconv-0.7.8.tar.gz) = 9ea7b4657beb387a52ae12a4f337a01d -MD5 (abisuite/expat-0.7.8.tar.gz) = e5ccdcbb82325fec3e82c813461b1d51 -MD5 (abisuite/unixfonts-0.7.8.tar.gz) = b0e01a14ff369966c6d3e8a9b8fb053e -MD5 (abisuite/wv-0.7.8.tar.gz) = 835450d4a8cdc5962aa475ad159d2432 +MD5 (abisuite/abi-0.7.9.tar.gz) = 65bab409639c5d80a94738f06754ece9 +MD5 (abisuite/abidistfiles-0.7.9.tar.gz) = 5d12bbe54ac7d0775076ea4f10f4a29c +MD5 (abisuite/libiconv-0.7.9.tar.gz) = 69ab6ebfaf9043795311621328a1c527 +MD5 (abisuite/expat-0.7.9.tar.gz) = 80396b61675674b2772ec93abae6a18e +MD5 (abisuite/unixfonts-0.7.9.tar.gz) = d91711abd8686112b4df1f0d28a3d83f +MD5 (abisuite/wv-0.7.9.tar.gz) = a28bf03833ecb0da1fc5355788efdbba diff --git a/editors/abiword/files/patch-sum b/editors/abiword/files/patch-sum index 2036d2e0836..7fbec20a7ac 100644 --- a/editors/abiword/files/patch-sum +++ b/editors/abiword/files/patch-sum @@ -1,12 +1,8 @@ -$NetBSD: patch-sum,v 1.4 2000/02/29 18:31:30 jlam Exp $ +$NetBSD: patch-sum,v 1.5 2000/05/02 23:35:56 jlam Exp $ MD5 (patch-aa) = c8e3e793314cd29b1e8b5d6339f04413 MD5 (patch-ab) = 1bf8c8702d9d64b976dc25fbf6d04455 -MD5 (patch-ac) = 8cc6ca174dac92c770e348001368e80f -MD5 (patch-ad) = 946a0e803a6cfd8e1c363fa366e5aa3d -MD5 (patch-ae) = f701d11a2944822864837c1fe3eebe2b -MD5 (patch-af) = 1f8e5c87ade8ddbede8b83110dfb6943 -MD5 (patch-ag) = 918513b15e8512586f2a0d30f8bcd1c4 -MD5 (patch-ah) = 568467cc84c84b28f89b968af0aae6df -MD5 (patch-ai) = 29c5243319c4c546ee216d698032fc19 -MD5 (patch-aj) = f23e47fc617274f7b64f192577cbfbb1 +MD5 (patch-ac) = 85c82b954f07c0dd2022109ffebc62dc +MD5 (patch-ad) = e5e5bafe33bfb44b2280a5231c4fdb3d +MD5 (patch-ae) = 5dbf06b663d90611d142a1045c60711e +MD5 (patch-ak) = 1b2a1494c4089991e6514c436dd5f98b diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac index 33fefc50090..c16e27b5a2a 100644 --- a/editors/abiword/patches/patch-ac +++ b/editors/abiword/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2000/02/29 18:31:30 jlam Exp $ +$NetBSD: patch-ac,v 1.4 2000/05/02 23:35:56 jlam Exp $ ---- src/config/abi_defs.mk.orig Tue Jan 11 06:46:50 2000 -+++ src/config/abi_defs.mk Tue Feb 29 12:05:03 2000 -@@ -296,7 +296,7 @@ +--- src/config/abi_defs.mk.orig Mon Mar 13 17:48:16 2000 ++++ src/config/abi_defs.mk Tue May 2 18:12:28 2000 +@@ -325,7 +325,7 @@ ## a date stamp in a nightly build system). ## @@ -11,26 +11,3 @@ $NetBSD: patch-ac,v 1.3 2000/02/29 18:31:30 jlam Exp $ ABI_BUILD_ID = ################################################################## -@@ -353,14 +353,18 @@ - - ifeq ($(ABI_NATIVE),unix) - ifdef ABI_OPT_GNOME --CFLAGS += `$(GNOME_CONFIG) --cflags gnorba gnomeui` -DHAVE_GNOME --EXTRA_LIBS += `$(GNOME_CONFIG) --libs gnorba gnomeui` -+GNOME_CFLAGS := $(shell $(GNOME_CONFIG) --cflags gnorba gnomeui) -+GNOME_LIBS := $(shell $(GNOME_CONFIG) --libs gnorba gnomeui) -+CFLAGS += $(GNOME_CFLAGS) -DHAVE_GNOME -+EXTRA_LIBS += $(GNOME_LIBS) - ABI_GNOME_DIR = gnome - ABI_GNOME_PREFIX = Gnome - ABI_OPTIONS+=Gnome:On - else --CFLAGS += `$(GTK_CONFIG) --cflags` --EXTRA_LIBS += `$(GTK_CONFIG) --libs` -+GTK_CFLAGS := $(shell $(GTK_CONFIG) --cflags) -+GTK_LIBS := $(shell $(GTK_CONFIG) --libs) -+CFLAGS += $(GTK_CFLAGS) -+EXTRA_LIBS += $(GTK_LIBS) - ABI_OPTIONS+=Gnome:Off - endif - endif diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad index 570ce4525c6..ff07847e9cf 100644 --- a/editors/abiword/patches/patch-ad +++ b/editors/abiword/patches/patch-ad @@ -1,46 +1,8 @@ -$NetBSD: patch-ad,v 1.4 2000/02/29 18:31:30 jlam Exp $ +$NetBSD: patch-ad,v 1.5 2000/05/02 23:35:56 jlam Exp $ ---- src/config/platforms/netbsd.mk.orig Sun Dec 12 10:07:09 1999 -+++ src/config/platforms/netbsd.mk Tue Feb 29 12:05:03 2000 -@@ -30,8 +30,13 @@ - ## compiler/loader options are used. It will probably also be used - ## in constructing the name object file destination directory. - --OS_ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ | sed "s/\//-/") -+OS_ARCH := $(shell uname -m) -+ -+ifneq (,$(shell $(CC) -E - -dM $INSTALL_BASE/bin/$PROGRAM_NAME<$LIBEXECDIR/$PROGRAM_NAME<