Update to 0.7.9; fake; add CONFIGURE_STYLE and NEED_VERSION as well

as comment to PLIST.
This commit is contained in:
fgsch 2000-06-12 10:05:19 +00:00
parent 5af300f242
commit 0915ae12a4
9 changed files with 135 additions and 58 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.9 2000/05/21 12:38:59 fgsch Exp $
# $OpenBSD: Makefile,v 1.10 2000/06/12 10:05:19 fgsch Exp $
VERS= 0.7.7
VERS= 0.7.9
PKGNAME= abiword-${VERS}
CATEGORIES= editors
NEED_VERSION= 1.230
FAKE=No
NEED_VERSION= 1.302
MASTER_SITES= http://www.abisource.com/downloads/Version-${VERS}/lf/
DIST_SUBDIR= ${PKGNAME}
@ -17,6 +16,7 @@ PERMIT_DISTFILES_FTP= Yes
DISTFILES= abi-${VERS}${EXTRACT_SUFX} \
abidistfiles-${VERS}${EXTRACT_SUFX} \
libiconv-${VERS}${EXTRACT_SUFX} \
unixfonts-${VERS}${EXTRACT_SUFX} \
wv-${VERS}${EXTRACT_SUFX}
@ -25,24 +25,20 @@ LIB_DEPENDS= gtk.1.2::x11/gtk+ \
png.1.6::graphics/png
RUN_DEPENDS= ispell::textproc/ispell
WRKDIST= ${WRKDIR}/abi-${VERS}
WRKDIST= ${WRKDIR}/abi-${VERS}
GNU_CONFIGURE= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
ALL_TARGET= compile
do-configure:
cd ${WRKDIR}/wv ; ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
post-install:
cd ${PREFIX}/bin && \
(ln -sf ${TRUEPREFIX}/AbiSuite/bin/AbiWord AbiWord; \
ln -sf ${TRUEPREFIX}/AbiSuite/bin/AbiWord abiword)
strip ${PREFIX}/AbiSuite/bin/AbiWord_d
rm -f ${PREFIX}/AbiSuite/bin/AbiWord_s
# Developer packing list generation target
makeplist:
cd ${PREFIX} ; \
find bin -name "[Aa]bi[Ww]ord*" | sort > ${PKGDIR}/PLIST ; \
find AbiSuite -type f | sort >> ${PKGDIR}/PLIST ; \
find AbiSuite -type d -exec echo @dirrm {} \; | \
sort -r >> ${PKGDIR}/PLIST
.include <bsd.port.mk>

View File

@ -1,12 +1,15 @@
MD5 (abiword-0.7.7/abi-0.7.7.tar.gz) = 873ca117691d6424db7174f3f9141426
RMD160 (abiword-0.7.7/abi-0.7.7.tar.gz) = 26b6c8373890831e05688cf0bbfc35af9c9cf44a
SHA1 (abiword-0.7.7/abi-0.7.7.tar.gz) = ac5c7836064bf0b2ef673995c8d7718f4369da08
MD5 (abiword-0.7.7/abidistfiles-0.7.7.tar.gz) = e10bc24616bacb8755988693901c2195
RMD160 (abiword-0.7.7/abidistfiles-0.7.7.tar.gz) = 53addb41f8d28a67140252141d0e6f3328b43dbd
SHA1 (abiword-0.7.7/abidistfiles-0.7.7.tar.gz) = 4e06d3582fe645379fb9cb3ac264677d8c54f07f
MD5 (abiword-0.7.7/unixfonts-0.7.7.tar.gz) = 0641bb032f7c3f76f1b0c16e26508551
RMD160 (abiword-0.7.7/unixfonts-0.7.7.tar.gz) = 1d64b45f537a5514d6448273ef01745ae5097717
SHA1 (abiword-0.7.7/unixfonts-0.7.7.tar.gz) = 78c77e1ce1a42b7911ba9af6c034782629fc46a2
MD5 (abiword-0.7.7/wv-0.7.7.tar.gz) = 02985452db8b1819d05eebd1355a7573
RMD160 (abiword-0.7.7/wv-0.7.7.tar.gz) = f6dc07bdf640e4ee17c4d28b71f499020f7e8bf4
SHA1 (abiword-0.7.7/wv-0.7.7.tar.gz) = 3d19ce3263caac282c9cf5b235b6f2ab195ddcb2
MD5 (abiword-0.7.9/abi-0.7.9.tar.gz) = 65bab409639c5d80a94738f06754ece9
MD5 (abiword-0.7.9/abidistfiles-0.7.9.tar.gz) = 5d12bbe54ac7d0775076ea4f10f4a29c
MD5 (abiword-0.7.9/libiconv-0.7.9.tar.gz) = 69ab6ebfaf9043795311621328a1c527
MD5 (abiword-0.7.9/unixfonts-0.7.9.tar.gz) = d91711abd8686112b4df1f0d28a3d83f
MD5 (abiword-0.7.9/wv-0.7.9.tar.gz) = a28bf03833ecb0da1fc5355788efdbba
RMD160 (abiword-0.7.9/abi-0.7.9.tar.gz) = f0d55eabf9bac902121817db8e021142ed174c0d
RMD160 (abiword-0.7.9/abidistfiles-0.7.9.tar.gz) = 5e430926b8dfb363fcf4f01c8652d6fa8bca4f21
RMD160 (abiword-0.7.9/libiconv-0.7.9.tar.gz) = 70f2b9d29fed3d478207c4fbd5551f700058b29b
RMD160 (abiword-0.7.9/unixfonts-0.7.9.tar.gz) = e315a1126e27db189f3b3ff2fb581b492eacc799
RMD160 (abiword-0.7.9/wv-0.7.9.tar.gz) = 26b01e7300426c21e76fcf35dd1192aee0b4d291
SHA1 (abiword-0.7.9/abi-0.7.9.tar.gz) = 56ab2826a491fa4d00e12472ff975a92f6635966
SHA1 (abiword-0.7.9/abidistfiles-0.7.9.tar.gz) = 21093cb65f9e2d86674a12b97e7ac139454e6c0d
SHA1 (abiword-0.7.9/libiconv-0.7.9.tar.gz) = fa11fcbf9d96222fe0a05d11bbc299214e183cba
SHA1 (abiword-0.7.9/unixfonts-0.7.9.tar.gz) = a1caa535e44c0c7deae93dacd81d63661eb19bf1
SHA1 (abiword-0.7.9/wv-0.7.9.tar.gz) = da90a03b1e16fc984f8ff3b40fe249eb75dfd8a2

View File

@ -1,6 +1,6 @@
--- ./Makefile.orig Sun Nov 7 10:26:16 1999
+++ ./Makefile Thu Jun 3 16:20:55 1999
@@ -19,7 +19,7 @@
--- Makefile.orig Sat Dec 11 03:23:53 1999
+++ Makefile Mon Jun 12 05:53:16 2000
@@ -20,7 +20,7 @@
## 02111-1307, USA.
ABI_ROOT :=$(shell pwd)

View File

@ -1,9 +1,9 @@
--- ./src/config/abi_defs.mk.orig Sun Nov 7 03:55:53 1999
+++ ./src/config/abi_defs.mk Sun Nov 7 09:39:28 1999
@@ -328,6 +328,9 @@
ifeq ($(ABI_NATIVE),unix)
CFLAGS += `$(GTK_CONFIG) --cflags`
EXTRA_LIBS += `$(GTK_CONFIG) --libs`
--- src/config/abi_defs.mk.orig Mon Mar 13 19:48:16 2000
+++ src/config/abi_defs.mk Mon Jun 12 04:15:47 2000
@@ -396,6 +396,9 @@
EXTRA_LIBS += $(GTK_LIBS)
ABI_OPTIONS+=Gnome:Off
endif
+
+# Refer to installed packages
+CFLAGS += -I/usr/local/include -I/usr/local/include/xml

View File

@ -1,5 +1,5 @@
--- ./src/wp/main/unix/Makefile.orig Sun Nov 7 09:36:37 1999
+++ ./src/wp/main/unix/Makefile Sun Nov 7 09:37:58 1999
--- src/wp/main/unix/Makefile.orig Tue Feb 29 18:37:58 2000
+++ src/wp/main/unix/Makefile Mon Jun 12 04:31:09 2000
@@ -34,13 +34,13 @@
# TODO several times. see if there is a better way of doing this.
@ -11,8 +11,8 @@
ABI_APPLIBDEP= $(LoadOrder)
# libdl flags go into the process later
-ABI_LIBS= png z stdc++
+ABI_LIBS= expat png z stdc++
-ABI_LIBS= png z
+ABI_LIBS= expat png z
# include both dynamic and static binaries
TARGETS= $(PROGRAM) $(PROGRAM_S)

View File

@ -1,6 +1,6 @@
--- src/config/platforms/openbsd.mk.orig Mon Nov 8 08:48:01 1999
+++ src/config/platforms/openbsd.mk Mon Nov 8 08:48:56 1999
@@ -94,4 +94,6 @@
--- src/config/platforms/openbsd.mk.orig Tue Feb 15 01:00:22 2000
+++ src/config/platforms/openbsd.mk Mon Jun 12 05:36:43 2000
@@ -93,4 +93,6 @@
ABI_NATIVE = unix
ABI_FE = Unix

View File

@ -0,0 +1,21 @@
--- src/pkg/common/unix/scripts/install.sh.orig Tue Feb 29 18:37:57 2000
+++ src/pkg/common/unix/scripts/install.sh Mon Jun 12 06:40:35 2000
@@ -116,14 +116,14 @@
# Create symbolic links to the script we installed
########################################################################
-echo "Creating symbolic links at [$BINDIR/AbiWord] and [$BINDIR/abiword]..."
+#echo "Creating symbolic links at [$BINDIR/AbiWord] and [$BINDIR/abiword]..."
-mkdir -p $BINDIR
+#mkdir -p $BINDIR
# 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 $LIBEXECDIR/AbiWord $BINDIR/AbiWord
-rm -f $BINDIR/abiword ; ln -s $LIBEXECDIR/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 $LIBEXECDIR/AbiCalc $LINK_DIR/AbiCalc

View File

@ -0,0 +1,52 @@
--- ../wv/oledecod/oledecod.c.orig Thu Mar 30 06:01:43 2000
+++ ../wv/oledecod/oledecod.c Mon Jun 12 05:09:33 2000
@@ -49,6 +49,7 @@
#include <ctype.h>
#include <sys/types.h>
#include <assert.h>
+#include <unistd.h>
#include "wv.h"
@@ -340,6 +341,7 @@ OLEdecode (FILE *input, pps_entry ** str
U16 BlockSize, Offset;
size_t bytes_to_read;
U32 pps_size, pps_start;
+ int fd;
#define THEMIN(a,b) ((a)<(b) ? (a) : (b))
for (i = 0; i < num_of_pps; i++)
@@ -367,19 +369,27 @@ OLEdecode (FILE *input, pps_entry ** str
{
assert (i == *root);
assert (i == 0);
- tmpnam (sbfilename);
- test (sbfilename[0], 7, ends ());
- sbfile = OLEfile = fopen (sbfilename, "wb+");
+ strcpy(sbfilename, "/tmp/oledecodXXXXXXX");
+ fd = mkstemp(sbfilename);
+ test (fd != -1, 7, ends ());
+ if ((sbfile = OLEfile = fdopen (fd, "wb+")) == NULL) {
+ unlink(sbfilename);
+ close(fd);
+ }
test (OLEfile != NULL, 7, ends ());
verboseS (sbfilename);
}
else
/* other entry, save in a file */
{
- tmpnam (pps_list[i].filename);
- test (pps_list[i].filename[0], 7, ends ());
+ strcpy(pps_list[i].filename, "/tmp/oledecodXXXXXXX");
+ fd = mkstemp(sbfilename);
+ test (fd != -1, 7, ends ());
verbose (pps_list[i].name);
- OLEfile = fopen (pps_list[i].filename, "wb");
+ if ((OLEfile = fdopen (fd, "wb")) == NULL) {
+ unlink(pps_list[i].filename);
+ close(fd);
+ }
test (OLEfile != NULL, 7, ends ());
verbose (pps_list[i].filename);
}

View File

@ -1,18 +1,21 @@
bin/AbiWord
bin/abiword
AbiSuite/AbiWord/help/EnUS/help.html
@comment $OpenBSD: PLIST,v 1.3 2000/06/12 10:05:21 fgsch Exp $
AbiSuite/AbiWord/help/en-US/help.html
AbiSuite/AbiWord/readme.txt
AbiSuite/AbiWord/sample/EnUS/Latin1.abw
AbiSuite/AbiWord/strings/CaES.strings
AbiSuite/AbiWord/strings/DaDK.strings
AbiSuite/AbiWord/strings/DeDE.strings
AbiSuite/AbiWord/strings/DuNL.strings
AbiSuite/AbiWord/strings/EsES.strings
AbiSuite/AbiWord/strings/FiFI.strings
AbiSuite/AbiWord/strings/FrFR.strings
AbiSuite/AbiWord/strings/ItIT.strings
AbiSuite/AbiWord/strings/NoNO.strings
AbiSuite/AbiWord/strings/PtPT.strings
AbiSuite/AbiWord/sample/en-US/Latin1.abw
AbiSuite/AbiWord/strings/ca-ES.strings
AbiSuite/AbiWord/strings/da-DK.strings
AbiSuite/AbiWord/strings/de-DE.strings
AbiSuite/AbiWord/strings/du-NL.strings
AbiSuite/AbiWord/strings/es-ES.strings
AbiSuite/AbiWord/strings/fi-FI.strings
AbiSuite/AbiWord/strings/fr-FR.strings
AbiSuite/AbiWord/strings/hu-HU.strings
AbiSuite/AbiWord/strings/id-ID.strings
AbiSuite/AbiWord/strings/it-IT.strings
AbiSuite/AbiWord/strings/no-BOK.strings
AbiSuite/AbiWord/strings/pt-BR.strings
AbiSuite/AbiWord/strings/pt-PT.strings
AbiSuite/AbiWord/strings/sv-SE.strings
AbiSuite/AbiWord/system.profile
AbiSuite/COPYING
AbiSuite/bin/AbiWord
@ -101,14 +104,16 @@ AbiSuite/icons/abiword_48.png
AbiSuite/icons/abiword_48.tif
AbiSuite/icons/abiword_48.xpm
AbiSuite/readme.txt
bin/AbiWord
bin/abiword
@dirrm AbiSuite/icons
@dirrm AbiSuite/fonts
@dirrm AbiSuite/dictionary
@dirrm AbiSuite/bin
@dirrm AbiSuite/AbiWord/strings
@dirrm AbiSuite/AbiWord/sample/EnUS
@dirrm AbiSuite/AbiWord/sample/en-US
@dirrm AbiSuite/AbiWord/sample
@dirrm AbiSuite/AbiWord/help/EnUS
@dirrm AbiSuite/AbiWord/help/en-US
@dirrm AbiSuite/AbiWord/help
@dirrm AbiSuite/AbiWord
@dirrm AbiSuite