diff options
Diffstat (limited to 'editors/abiword')
-rw-r--r-- | editors/abiword/Makefile | 31 | ||||
-rw-r--r-- | editors/abiword/files/GNUMakefile.install | 12 | ||||
-rw-r--r-- | editors/abiword/files/md5 | 14 | ||||
-rw-r--r-- | editors/abiword/files/patch-sum | 14 | ||||
-rw-r--r-- | editors/abiword/patches/patch-ac | 31 | ||||
-rw-r--r-- | editors/abiword/patches/patch-ad | 59 | ||||
-rw-r--r-- | editors/abiword/patches/patch-ae | 28 | ||||
-rw-r--r-- | editors/abiword/patches/patch-af | 13 | ||||
-rw-r--r-- | editors/abiword/patches/patch-ag | 88 | ||||
-rw-r--r-- | editors/abiword/patches/patch-ah | 86 | ||||
-rw-r--r-- | editors/abiword/patches/patch-ai | 13 | ||||
-rw-r--r-- | editors/abiword/patches/patch-aj | 13 | ||||
-rw-r--r-- | editors/abiword/patches/patch-ak | 13 | ||||
-rw-r--r-- | editors/abiword/pkg/DESCR | 2 | ||||
-rw-r--r-- | editors/abiword/pkg/PLIST | 36 |
15 files changed, 69 insertions, 384 deletions
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 </usr/include/machine/endian.h | grep BYTE_ORDER.*LITTLE_ENDIAN)) - OS_ENDIAN = LittleEndian32 -+else -+OS_ENDIAN = BigEndian32 -+endif - - # Define tools - CC = gcc -@@ -65,17 +70,20 @@ - endif - - # Includes --OS_INCLUDES = -+OS_INCLUDES += - G++INCLUDES = -I/usr/include/g++ - - # Compiler flags - PLATFORM_FLAGS = -pipe -DNETBSD -DNetBSD - PORT_FLAGS = -DHAVE_STRERROR --OS_CFLAGS = $(DSO_CFLAGS) $(PLATFORM_FLAGS) $(PORT_FLAGS) -+OS_CFLAGS += $(DSO_CFLAGS) $(PLATFORM_FLAGS) $(PORT_FLAGS) - - PLATFORM_FLAGS += - PORT_FLAGS += - -+# Linker flags -+OS_DLLFLAGS += -+ - GLIB_CONFIG = glib-config - GTK_CONFIG = gtk-config - GNOME_CONFIG = gnome-config -@@ -86,7 +94,7 @@ +--- src/config/platforms/netbsd.mk.orig Tue Feb 29 16:37:56 2000 ++++ src/config/platforms/netbsd.mk Tue May 2 18:14:13 2000 +@@ -85,7 +85,7 @@ # Which links can this platform create. Define one or # both of these options. UNIX_CAN_BUILD_DYNAMIC=1 @@ -49,16 +11,3 @@ $NetBSD: patch-ad,v 1.4 2000/02/29 18:31:30 jlam Exp $ ################################################################## ## Here you can choice if you want to use the gnome stuff. -@@ -101,5 +109,12 @@ - - ABI_NATIVE = unix - ABI_FE = Unix -+ -+################################################################## -+## ABIPKGDIR defines the directory containing the Makefile to use to -+## build a set of distribution archives (.deb, .rpm, .tgz, .exe, etc) -+## This is relative to $(ABI_ROOT)/src/pkg -+ -+ABIPKGDIR = netbsd - - # End of NetBSD defs diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae index fab27468e0c..655a5c0e001 100644 --- a/editors/abiword/patches/patch-ae +++ b/editors/abiword/patches/patch-ae @@ -1,28 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2000/02/29 18:31:30 jlam Exp $ +$NetBSD: patch-ae,v 1.3 2000/05/02 23:35:56 jlam Exp $ ---- src/config/require/unix/Makefile.orig Tue Feb 1 18:55:24 2000 -+++ src/config/require/unix/Makefile Tue Feb 29 12:05:03 2000 -@@ -74,7 +74,9 @@ - - _ZLIB_: - @if [ -r /usr/lib/libz.a \ -+ -o -r ${LOCALBASE}/lib/libz.a \ - -o -r /usr/local/lib/libz.a \ -+ -o -r ${X11BASE}/lib/libz.a \ - -o -r /usr/X11R6/lib/libz.a \ - ]; then \ - echo Found zlib in system directories; \ -@@ -90,7 +92,9 @@ - - _LIBPNG_: - @if [ -r /usr/lib/libpng.a \ -+ -o -r ${LOCALBASE}/lib/libpng.a \ - -o -r /usr/local/lib/libpng.a \ -+ -o -r ${X11BASE}/lib/libpng.a \ - -o -r /usr/X11R6/lib/libpng.a \ - ]; then \ - echo Found libpng in system directories; \ -@@ -155,7 +159,7 @@ +--- src/config/require/unix/Makefile.orig Tue Feb 29 16:37:57 2000 ++++ src/config/require/unix/Makefile Tue May 2 18:16:28 2000 +@@ -159,7 +159,7 @@ # was something you installed yourself. _LIBICONV_: diff --git a/editors/abiword/patches/patch-af b/editors/abiword/patches/patch-af deleted file mode 100644 index 2843f0b5477..00000000000 --- a/editors/abiword/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.2 2000/02/29 18:31:30 jlam Exp $ - ---- src/hello/main/unix/Makefile.orig Mon Dec 13 16:10:25 1999 -+++ src/hello/main/unix/Makefile Tue Feb 29 12:05:03 2000 -@@ -24,7 +24,7 @@ - - CPPSRCS= UnixMain.cpp - --INCLUDES= `gtk-config --cflags` -+INCLUDES= $(GTK_CFLAGS) - - PROGRAM= AbiHello - diff --git a/editors/abiword/patches/patch-ag b/editors/abiword/patches/patch-ag deleted file mode 100644 index a226f3837d0..00000000000 --- a/editors/abiword/patches/patch-ag +++ /dev/null @@ -1,88 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2000/02/29 18:31:30 jlam Exp $ - ---- src/pkg/common/unix/scripts/install.sh.orig Wed Jun 2 16:19:32 1999 -+++ src/pkg/common/unix/scripts/install.sh Tue Feb 29 12:17:41 2000 -@@ -2,14 +2,14 @@ - # - # This script is invoked by the Makefiles when the "install" target - # is specified. It just puts things where most users will probably --# be happy, in $TARGET, with symbolic links (in $BINDIR) to the binaries --# in $TARGET/bin -+# be happy, in $TARGET, with the binaries in $LIBEXECDIR, with -+# symbolic links (in $BINDIR) to the binaries in $LIBEXECDIR. - # - # $SRCDIR should be the place where the compile process (the "canonical" - # target especially) put all the stuff. $SCRIPTDIR should be set by the - # caller so we can know where we are. $BINDIR is where the symbolic --# links are eventually installed, to point to the "bin/*" files within --# $TARGET/bin -+# links are eventually installed, to point to the executable files within -+# $LIBEXECDIR - - # if no target, bail - if [ -z "$TARGET" ] -@@ -52,6 +52,21 @@ - exit 1 - fi - -+# Make sure the libexec dir exists -+if [ -z "$LIBEXECDIR" ] -+then -+ LIBEXECDIR=${TARGET}/bin -+fi -+mkdir -p $LIBEXECDIR -+ -+if [ ! -d $LIBEXECDIR ] -+then -+ echo "" -+ echo "Error creating directory [$LIBEXECDIR]." -+ echo "" -+ exit 1 -+fi -+ - # start with breathing room - echo "" - -@@ -63,9 +78,9 @@ - # Copy the files from $SRCDIR to $TARGET - (cd $SRCDIR/AbiSuite; tar cf - *) | (cd $TARGET; tar xf -) - --echo "Installing program binaries to [$TARGET/bin]..." -+echo "Installing program binaries to [$LIBEXECDIR]..." - # Setup bins --(cd $SRCDIR; tar cf - bin/Abi*) | (cd $TARGET; tar xf -) -+(cd $SRCDIR/bin; tar cf - Abi*) | (cd $LIBEXECDIR; tar xf -) - - ######################################################################## - # If we're on Solaris, run makepsres on the font path -@@ -91,10 +106,10 @@ - cd $SCRIPTDIR - - echo "Making wrapper script at [$TARGET/bin/AbiWord]..." --./makewrapper.sh AbiWord $TARGET -+./makewrapper.sh AbiWord $TARGET $LIBEXECDIR - # TODO : make use of these --# ./makewrapper.sh AbiCalc $TARGET --# ./makewrapper.sh AbiFile $TARGET -+# ./makewrapper.sh AbiCalc $TARGET $LIBEXECDIR -+# ./makewrapper.sh AbiFile $TARGET $LIBEXECDIR - - - ######################################################################## -@@ -107,12 +122,12 @@ - - # NOTE : Solaris ln doesn't seem to honor the -f (force flag), so - # NOTE : we have to remove them first. --rm -f $BINDIR/AbiWord ; ln -s $TARGET/bin/AbiWord $BINDIR/AbiWord --rm -f $BINDIR/abiword ; ln -s $TARGET/bin/AbiWord $BINDIR/abiword -+rm -f $BINDIR/AbiWord ; ln -s $LIBEXECDIR/AbiWord $BINDIR/AbiWord -+rm -f $BINDIR/abiword ; ln -s $LIBEXECDIR/AbiWord $BINDIR/abiword - - # TODO : make use of these, etc. --# rm -f $BINDIR/AbiCalc ; ln -s $TARGET/bin/AbiCalc $LINK_DIR/AbiCalc --# rm -f $BINDIR/abicalc ; ln -s $TARGET/bin/AbiCalc $LINK_DIR/abicalc -+# rm -f $BINDIR/AbiCalc ; ln -s $LIBEXECDIR/AbiCalc $LINK_DIR/AbiCalc -+# rm -f $BINDIR/abicalc ; ln -s $LIBEXECDIR/AbiCalc $LINK_DIR/abicalc - - ######################################################################## - # Done diff --git a/editors/abiword/patches/patch-ah b/editors/abiword/patches/patch-ah deleted file mode 100644 index ae372a31396..00000000000 --- a/editors/abiword/patches/patch-ah +++ /dev/null @@ -1,86 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2000/02/29 18:31:30 jlam Exp $ - ---- src/pkg/common/unix/scripts/makewrapper.sh.orig Thu Jun 24 16:54:37 1999 -+++ src/pkg/common/unix/scripts/makewrapper.sh Tue Feb 29 12:19:00 2000 -@@ -3,15 +3,16 @@ - # This script is invoked to create wrapper scripts for AbiSuite - # binaries. One should pass it the _base_ name of the program - # to wrap (one would pass "AbiWord" to wrap "AbiWord_s" and --# "AbiWord_d"), and the install base of the tree, to which "bin" --# will be appended for binary and script locations. -+# "AbiWord_d"), and the install base of the tree and the location of the -+# machine-dependent binaries and scripts. - - # Examples: --# makewrapper.sh AbiWord /usr/local/AbiSuite --# makewrapper.sh AbiCalc /usr/local/AbiSuite -+# makewrapper.sh AbiWord /usr/local/AbiSuite /usr/local/libexec/AbiSuite -+# makewrapper.sh AbiCalc /usr/local/AbiSuite /usr/local/libexec/AbiSuite - - PROGRAM_NAME=$1 - INSTALL_BASE=$2 -+LIBEXECDIR=$3 - - # Did they supply any arguments? - if [ -z "$PROGRAM_NAME" ] -@@ -28,11 +29,15 @@ - echo "" - exit 1 - fi -+if [ -z "$LIBEXECDIR" ] -+then -+ LIBEXECDIR=${INSTALL_BASE}/bin -+fi - - # Make directory path up to program we're creating --mkdir -p $INSTALL_BASE/bin -+mkdir -p $LIBEXECDIR - --cat >$INSTALL_BASE/bin/$PROGRAM_NAME<<EOF -+cat >$LIBEXECDIR/$PROGRAM_NAME<<EOF - #!/bin/sh - # - # AbiSuite program wrapper script, dynamically generated -@@ -42,6 +47,9 @@ - ABISUITE_HOME=$INSTALL_BASE - export ABISUITE_HOME - -+# Change this if you move the AbiSuite binaries. -+ABISUITE_LIBEXEC=$LIBEXECDIR -+ - # Change this if you move your fonts. - ABISUITE_FONT_HOME=\$ABISUITE_HOME/fonts - -@@ -52,18 +60,18 @@ - fi - - # Figure out which binary to run --if [ -f \$ABISUITE_HOME/bin/${PROGRAM_NAME}_d ] -+if [ -f \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_d ] - then -- \$ABISUITE_HOME/bin/${PROGRAM_NAME}_d "\$@" --elif [ -f \$ABISUITE_HOME/bin/${PROGRAM_NAME}_s ] -+ \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_d "\$@" -+elif [ -f \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_s ] - then -- \$ABISUITE_HOME/bin/${PROGRAM_NAME}_s "\$@" -+ \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_s "\$@" - else - echo "" - echo "Error: can't find ${PROGRAM_NAME} executables:" -- echo " \$ABISUITE_HOME/bin/${PROGRAM_NAME}_d" -+ echo " \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_d" - echo " -or-" -- echo " \$ABISUITE_HOME/bin/${PROGRAM_NAME}_s" -+ echo " \$ABISUITE_LIBEXEC/${PROGRAM_NAME}_s" - echo "" - exit - fi -@@ -75,6 +83,6 @@ - fi - EOF - --chmod 755 ${INSTALL_BASE}/bin/$PROGRAM_NAME -+chmod 755 ${LIBEXECDIR}/$PROGRAM_NAME - - diff --git a/editors/abiword/patches/patch-ai b/editors/abiword/patches/patch-ai deleted file mode 100644 index 6501578551d..00000000000 --- a/editors/abiword/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2000/02/29 18:31:30 jlam Exp $ - ---- src/wp/main/unix/Makefile.orig Mon Dec 13 16:10:26 1999 -+++ src/wp/main/unix/Makefile Tue Feb 29 12:05:03 2000 -@@ -24,7 +24,7 @@ - - CPPSRCS= UnixMain.cpp - --INCLUDES= `$(GTK_CONFIG) --cflags` -+INCLUDES= $(GTK_CFLAGS) - - PROGRAM= $(BINDIR)/AbiWord_d - PROGRAM_S= $(BINDIR)/AbiWord_s diff --git a/editors/abiword/patches/patch-aj b/editors/abiword/patches/patch-aj deleted file mode 100644 index 836b31102a0..00000000000 --- a/editors/abiword/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2000/02/29 18:31:30 jlam Exp $ - ---- src/wp/main/unix/gnome/Makefile.orig Mon Dec 13 16:10:26 1999 -+++ src/wp/main/unix/gnome/Makefile Tue Feb 29 12:05:03 2000 -@@ -24,7 +24,7 @@ - - CPPSRCS= UnixGnomeMain.cpp - --INCLUDES= `$(GNOME_CONFIG) gnomeui --cflags` -+INCLUDES= $(GNOME_CFLAGS) - - PROGRAM= $(BINDIR)/AbiWord_d - PROGRAM_S= $(BINDIR)/AbiWord_s diff --git a/editors/abiword/patches/patch-ak b/editors/abiword/patches/patch-ak new file mode 100644 index 00000000000..50e6671d5a7 --- /dev/null +++ b/editors/abiword/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2000/05/02 23:35:58 jlam Exp $ + +--- src/pkg/netbsd/Makefile.orig Tue Feb 29 16:37:58 2000 ++++ src/pkg/netbsd/Makefile Tue May 2 18:36:23 2000 +@@ -4,6 +4,7 @@ + + # The plain "install" common to all Unix targets + install: +- @TARGET=$(prefix)/AbiSuite BINDIR=$(prefix)/bin SRCDIR=$(OUTDIR) \ ++ @TARGET=$(prefix)/share/AbiSuite BINDIR=$(prefix)/bin SRCDIR=$(OUTDIR) \ ++ LIBEXECDIR=$(prefix)/libexec/AbiSuite \ + SCRIPTDIR=$(ABI_ROOT)/src/pkg/common/unix/scripts \ + $(ABI_ROOT)/src/pkg/common/unix/scripts/install.sh diff --git a/editors/abiword/pkg/DESCR b/editors/abiword/pkg/DESCR index 715ee662138..c6539cf0728 100644 --- a/editors/abiword/pkg/DESCR +++ b/editors/abiword/pkg/DESCR @@ -2,7 +2,7 @@ AbiWord(R) is the first application of a suite of Open Source desktop productivity applications. AbiWord(R) is available for all to use, free of charge. -AbiWord(R) is a lean and fast full-featured word processor. It works on +AbiWord(R) is a lean and fast, full-featured word processor. It works on Windows and most Unix Systems. Features include: Basic character formatting (bold, underline, italics, etc.) diff --git a/editors/abiword/pkg/PLIST b/editors/abiword/pkg/PLIST index 65656126297..c43021e8d41 100644 --- a/editors/abiword/pkg/PLIST +++ b/editors/abiword/pkg/PLIST @@ -1,23 +1,25 @@ -@comment $NetBSD: PLIST,v 1.3 2000/02/29 18:31:31 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2000/05/02 23:35:58 jlam Exp $ bin/AbiWord bin/abiword libexec/AbiSuite/AbiWord libexec/AbiSuite/AbiWord_d -share/AbiSuite/AbiWord/help/EnUS/help.html +share/AbiSuite/AbiWord/help/en-US/help.html share/AbiSuite/AbiWord/readme.txt -share/AbiSuite/AbiWord/sample/EnUS/Latin1.abw -share/AbiSuite/AbiWord/strings/CaES.strings -share/AbiSuite/AbiWord/strings/DaDK.strings -share/AbiSuite/AbiWord/strings/DeDE.strings -share/AbiSuite/AbiWord/strings/DuNL.strings -share/AbiSuite/AbiWord/strings/EsES.strings -share/AbiSuite/AbiWord/strings/FiFI.strings -share/AbiSuite/AbiWord/strings/FrFR.strings -share/AbiSuite/AbiWord/strings/IdID.strings -share/AbiSuite/AbiWord/strings/ItIT.strings -share/AbiSuite/AbiWord/strings/NoNO.strings -share/AbiSuite/AbiWord/strings/PtPT.strings -share/AbiSuite/AbiWord/strings/SvSE.strings +share/AbiSuite/AbiWord/sample/en-US/Latin1.abw +share/AbiSuite/AbiWord/strings/ca-ES.strings +share/AbiSuite/AbiWord/strings/da-DK.strings +share/AbiSuite/AbiWord/strings/de-DE.strings +share/AbiSuite/AbiWord/strings/du-NL.strings +share/AbiSuite/AbiWord/strings/es-ES.strings +share/AbiSuite/AbiWord/strings/fi-FI.strings +share/AbiSuite/AbiWord/strings/fr-FR.strings +share/AbiSuite/AbiWord/strings/hu-HU.strings +share/AbiSuite/AbiWord/strings/id-ID.strings +share/AbiSuite/AbiWord/strings/it-IT.strings +share/AbiSuite/AbiWord/strings/no-BOK.strings +share/AbiSuite/AbiWord/strings/pt-BR.strings +share/AbiSuite/AbiWord/strings/pt-PT.strings +share/AbiSuite/AbiWord/strings/sv-SE.strings share/AbiSuite/AbiWord/system.profile share/AbiSuite/COPYING share/AbiSuite/dictionary/american.hash @@ -108,9 +110,9 @@ share/AbiSuite/readme.txt @dirrm share/AbiSuite/fonts @dirrm share/AbiSuite/dictionary @dirrm share/AbiSuite/AbiWord/strings -@dirrm share/AbiSuite/AbiWord/sample/EnUS +@dirrm share/AbiSuite/AbiWord/sample/en-US @dirrm share/AbiSuite/AbiWord/sample -@dirrm share/AbiSuite/AbiWord/help/EnUS +@dirrm share/AbiSuite/AbiWord/help/en-US @dirrm share/AbiSuite/AbiWord/help @dirrm share/AbiSuite/AbiWord @dirrm share/AbiSuite |