summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2001-12-19 20:08:51 +0000
committerwiz <wiz@pkgsrc.org>2001-12-19 20:08:51 +0000
commitb0a493911dd8122bb2a041284f5448a260bf7319 (patch)
tree80f6b6da29a66ec1e554c94eab7197a557c1c2cc
parentbff58a2591b9d17bbe5a4bb2411334c84d2b2b0c (diff)
downloadpkgsrc-b0a493911dd8122bb2a041284f5448a260bf7319.tar.gz
Update to 0.8.2. Fixes bulk build failure.
Changes since 0.6.1: 0.8.2 200002?? Basic sheet support in library Added autogen.sh autoconf-2.50, automake-1.4-p4 0.8.1 20000110 New enum screenfont_t New program rewrite in extra Added psiconv_empty_* functions Fixed a few minor generation bugs 0.8.0 20001228 Fixed style inheritance from Normal Fixed warnings in layouts Added generation routines to libpsiconv Upgraded documentation to version 2.6 Fixed several minor parse-related issues 0.7.1 20001218 Maintenance release to be used with Abiword. Set proper interline defaults. 0.7.0 20001215 Made libpsiconv C++ compatible. general.h is now installed properly (oops...) Revamped package directory structure and files. Include files contain now the correct paths. Fixed a nasty typo; larger files should now work. It seems psiconv_verbosity was never defined. Added message printing hook for applications to capture. All result codes are now tested, library is much more robust. Some internal data fields have been renamed. 0.6.2 20001021 ImageMagick 5 now works. I hope.
-rw-r--r--converters/psiconv/Makefile4
-rw-r--r--converters/psiconv/PLIST12
-rw-r--r--converters/psiconv/distinfo14
-rw-r--r--converters/psiconv/patches/patch-aa20
-rw-r--r--converters/psiconv/patches/patch-ab11
-rw-r--r--converters/psiconv/patches/patch-ac20
-rw-r--r--converters/psiconv/patches/patch-ad42
7 files changed, 58 insertions, 65 deletions
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index 288067798f1..19f8cdbe4cf 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2001/10/24 22:10:49 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/12/19 20:08:51 wiz Exp $
#
-DISTNAME= psiconv-0.6.1
+DISTNAME= psiconv-0.8.2
CATEGORIES= converters
MASTER_SITES= http://huizen.dds.nl/~frodol/psiconv/
diff --git a/converters/psiconv/PLIST b/converters/psiconv/PLIST
index 1d5c32bd339..d88a17f5f68 100644
--- a/converters/psiconv/PLIST
+++ b/converters/psiconv/PLIST
@@ -1,14 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:51:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/19 20:08:51 wiz Exp $
bin/psiconv
+include/psiconv/buffer.h
+include/psiconv/common.h
include/psiconv/data.h
+include/psiconv/error.h
+include/psiconv/general.h
+include/psiconv/generate.h
+include/psiconv/generate_routines.h
include/psiconv/list.h
include/psiconv/parse.h
include/psiconv/parse_routines.h
lib/libpsiconv.a
lib/libpsiconv.la
lib/libpsiconv.so
-lib/libpsiconv.so.3
-lib/libpsiconv.so.3.0
+lib/libpsiconv.so.7
+lib/libpsiconv.so.7.0
share/doc/psiconv/ascii
share/doc/psiconv/html
share/doc/psiconv/html4
diff --git a/converters/psiconv/distinfo b/converters/psiconv/distinfo
index 96c2c479da5..f0dd0927157 100644
--- a/converters/psiconv/distinfo
+++ b/converters/psiconv/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:28:02 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/12/19 20:08:51 wiz Exp $
-SHA1 (psiconv-0.6.1.tar.gz) = 13e7031a397f93be89912255116990fd19fe67e2
-Size (psiconv-0.6.1.tar.gz) = 200916 bytes
-SHA1 (patch-aa) = 277a392eb43f3d2d3e3150c26de6516248bdc078
-SHA1 (patch-ab) = 72e40d43f709351c4717811a03c0aef3b0589127
-SHA1 (patch-ac) = 8f0b3a5a9f697500f32f9d25e216dddd1542a049
-SHA1 (patch-ad) = 253d3ec19f108fd50896c742c36c7340cc0ce958
+SHA1 (psiconv-0.8.2.tar.gz) = 4512aac15db4e1a129a3131a2b0b3fa149e88811
+Size (psiconv-0.8.2.tar.gz) = 304322 bytes
+SHA1 (patch-aa) = b7ef8a4916df1c13324b00a2fefff620dc99fa32
+SHA1 (patch-ab) = cff4e1d6bbfadb5c47b69b07cde8896f5b423c9a
+SHA1 (patch-ac) = 05769fdcb271937396fd9cd9929e46ab77e7a852
+SHA1 (patch-ad) = af772d87f3764081d717f07e4b0ac9f8a20cf47e
diff --git a/converters/psiconv/patches/patch-aa b/converters/psiconv/patches/patch-aa
index 9bdf0a4f3f0..54f519a266b 100644
--- a/converters/psiconv/patches/patch-aa
+++ b/converters/psiconv/patches/patch-aa
@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/06 01:58:07 sakamoto Exp $
+$NetBSD: patch-aa,v 1.2 2001/12/19 20:08:51 wiz Exp $
---- ./compat/Makefile.in.orig Sun Dec 5 06:42:06 1999
-+++ ./compat/Makefile.in Mon Dec 6 10:00:29 1999
-@@ -101,5 +101,5 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -rpath $(PREFIX)/lib
- DIST_COMMON = Makefile.am Makefile.in getopt.c getopt1.c strdup.c
+--- Makefile.in.orig Mon Jul 16 19:53:54 2001
++++ Makefile.in
+@@ -80,7 +80,7 @@
+ VERSION = @VERSION@
+ cflags_set = @cflags_set@
+-SUBDIRS = compat lib program formats extra docs
++SUBDIRS = compat lib program extra docs
+ EXTRA_DIST = autogen.sh
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/converters/psiconv/patches/patch-ab b/converters/psiconv/patches/patch-ab
index 613c03ca844..4fcec8debc5 100644
--- a/converters/psiconv/patches/patch-ab
+++ b/converters/psiconv/patches/patch-ab
@@ -1,7 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/12/06 01:58:07 sakamoto Exp $
+$NetBSD: patch-ab,v 1.2 2001/12/19 20:08:51 wiz Exp $
---- ./Makefile.am.orig Wed Oct 27 23:03:37 1999
-+++ ./Makefile.am Mon Dec 6 10:02:34 1999
-@@ -1 +1 @@
--SUBDIRS = compat lib psiconv formats docs
+--- Makefile.am.orig Sun Jun 17 20:52:33 2001
++++ Makefile.am
+@@ -1,2 +1,2 @@
+-SUBDIRS = compat lib program formats extra docs
+SUBDIRS = compat lib psiconv docs
+ EXTRA_DIST=autogen.sh
diff --git a/converters/psiconv/patches/patch-ac b/converters/psiconv/patches/patch-ac
index 0fa5691def0..c8e3ed7a532 100644
--- a/converters/psiconv/patches/patch-ac
+++ b/converters/psiconv/patches/patch-ac
@@ -1,11 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/12/06 01:58:07 sakamoto Exp $
+$NetBSD: patch-ac,v 1.2 2001/12/19 20:08:51 wiz Exp $
---- ./Makefile.in.orig Sun Dec 5 06:42:04 1999
-+++ ./Makefile.in Mon Dec 6 10:02:40 1999
-@@ -78,5 +78,5 @@
- cflags_set = @cflags_set@
+--- compat/Makefile.in.orig Mon Jul 16 19:53:56 2001
++++ compat/Makefile.in
+@@ -103,7 +103,7 @@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -rpath $(PREFIX)/lib
+ DIST_COMMON = Makefile.am Makefile.in strdup.c
+
--SUBDIRS = compat lib psiconv formats docs
-+SUBDIRS = compat lib psiconv docs
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/converters/psiconv/patches/patch-ad b/converters/psiconv/patches/patch-ad
index f459eab0be1..219a884ea93 100644
--- a/converters/psiconv/patches/patch-ad
+++ b/converters/psiconv/patches/patch-ad
@@ -1,31 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2000/08/30 16:13:13 sakamoto Exp $
+$NetBSD: patch-ad,v 1.3 2001/12/19 20:08:51 wiz Exp $
---- psiconv/gen_image.c.orig Sat Dec 4 09:46:15 1999
-+++ psiconv/gen_image.c Sat Jul 8 18:49:11 2000
-@@ -33,8 +33,24 @@
- static Image *get_paint_data_section(psiconv_paint_data_section sec)
- {
- Image *image;
-- image = CreateImage(sec->xsize,sec->ysize,sec->red,sec->green,
-- sec->blue,NULL);
-+ float *pixel, *p, *red, *green, *blue;
-+ int x,y;
-+ ExceptionInfo exception;
-+
-+ red = sec->red;
-+ green = sec->green;
-+ blue = sec->blue;
-+ p = pixel = malloc(sec->xsize * sec->ysize * 3 * sizeof(float));
-+ for (y = 0; y < sec->ysize; y++) {
-+ for (x = 0; x < sec->xsize; x++) {
-+ *p++ = *red++;
-+ *p++ = *green++;
-+ *p++ = *blue++;
-+ }
-+ }
-+ image = ConstituteImage(sec->xsize,sec->ysize,"RGB",FloatPixel,pixel,&exception);
-+ free(pixel);
-+
- return image;
- }
-
+--- program/psiconv/gen_image.c.orig Sat Jun 30 15:35:24 2001
++++ program/psiconv/gen_image.c
+@@ -221,7 +221,7 @@
+ ff.output = psiconv_gen_image;
+ for (mi = GetMagickFileList(); mi ; mi = mi->next) {
+ if (mi->encoder) {
+- ff.name = strdup(mi->tag);
++ ff.name = strdup(mi->name);
+ ff.description = strdup(mi->description);
+ psiconv_list_add(fileformat_list,&ff);
+ }