From b5f69ddd763e85e49efb37f400e1299ac49aa084 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Wed, 14 Apr 2004 18:26:38 +0000
Subject: [PATCH] downgrade t1lib back to 5.0.0

5.0.2 seems to cause problems with xpdf
---
 devel/t1lib/Makefile                        |  6 ++---
 devel/t1lib/patches/patch-lib_Makefile.in   |  6 ++---
 devel/t1lib/patches/patch-lib_type1_type1_c | 25 +++++++++++++++++++++
 devel/t1lib/pkg/PFRAG.shared                |  6 ++---
 devel/t1lib/pkg/PLIST                       |  4 +---
 5 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 devel/t1lib/patches/patch-lib_type1_type1_c

diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile
index 474b46f4e11..3f6ca7cb530 100644
--- a/devel/t1lib/Makefile
+++ b/devel/t1lib/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2004/04/08 06:21:19 brad Exp $
+# $OpenBSD: Makefile,v 1.17 2004/04/14 18:26:38 brad Exp $
 
 COMMENT=	"Type 1 rasterizer library for UNIX/X11"
 
-DISTNAME=	t1lib-5.0.2
+DISTNAME=	t1lib-5.0.0
 CATEGORIES=	devel textproc
-MASTER_SITES=	${MASTER_SITE_SUNSITE:=libs/graphics/}
+MASTER_SITES=	${MASTER_SITE_BACKUP}
 
 MAINTAINER=	Brad Smith <brad@openbsd.org>
 
diff --git a/devel/t1lib/patches/patch-lib_Makefile.in b/devel/t1lib/patches/patch-lib_Makefile.in
index f9785ebec9d..e282041af19 100644
--- a/devel/t1lib/patches/patch-lib_Makefile.in
+++ b/devel/t1lib/patches/patch-lib_Makefile.in
@@ -1,5 +1,5 @@
---- lib/Makefile.in.orig	2002-06-24 22:15:30.000000000 -0400
-+++ lib/Makefile.in	2004-04-05 20:23:00.000000000 -0400
+--- lib/Makefile.in.orig	Mon Jan 15 17:34:40 2001
++++ lib/Makefile.in	Mon Aug 27 16:43:46 2001
 @@ -36,6 +36,8 @@ LEX       = @LEX@
  LEXLIB    = @LEXLIB@
  ALLCFLAGS = $(CFLAGS)
@@ -9,7 +9,7 @@
  INSTALL         = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA    = @INSTALL_DATA@
-@@ -160,27 +162,27 @@ clean: dummy
+@@ -159,27 +161,27 @@ clean: dummy
  
  
  install: dummy
diff --git a/devel/t1lib/patches/patch-lib_type1_type1_c b/devel/t1lib/patches/patch-lib_type1_type1_c
new file mode 100644
index 00000000000..8b3ab9cb26e
--- /dev/null
+++ b/devel/t1lib/patches/patch-lib_type1_type1_c
@@ -0,0 +1,25 @@
+$OpenBSD: patch-lib_type1_type1_c,v 1.3 2004/04/14 18:26:38 brad Exp $
+--- lib/type1/type1.c.orig	2003-03-02 23:17:22.000000000 +0000
++++ lib/type1/type1.c	2003-09-25 17:22:47.000000000 +0100
+@@ -1868,10 +1868,18 @@ static int EndChar()
+ static int RMoveTo(dx,dy)
+   DOUBLE dx,dy;
+ {
+-  long pindex = 0;
+-  
++  long pindex = 0, xpoint, ypoint;
++
++  if (numppoints > 1) {
++	xpoint = currx - ppoints[numppoints-2].x;
++	ypoint = curry - ppoints[numppoints-2].y;
++  } else {
++	xpoint = 0;
++	ypoint = 0;
++  }
++
+   /* compute hinting for previous segment! */
+-  FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx, dy);
++  FindStems( currx, curry, xpoint, ypoint, dx, dy);
+ 
+   /* Allocate a new path point and pre-setup data */
+   pindex = nextPPoint();
diff --git a/devel/t1lib/pkg/PFRAG.shared b/devel/t1lib/pkg/PFRAG.shared
index 2d1c30a3274..70cfb32d656 100644
--- a/devel/t1lib/pkg/PFRAG.shared
+++ b/devel/t1lib/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.7 2004/04/08 06:21:20 brad Exp $
-lib/libt1.so.5.2
-lib/libt1x.so.5.2
+@comment $OpenBSD: PFRAG.shared,v 1.8 2004/04/14 18:26:38 brad Exp $
+lib/libt1.so.5.0
+lib/libt1x.so.5.0
 DYNLIBDIR(%D/lib)
diff --git a/devel/t1lib/pkg/PLIST b/devel/t1lib/pkg/PLIST
index 4344d638631..c6cf5c0370e 100644
--- a/devel/t1lib/pkg/PLIST
+++ b/devel/t1lib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2004/04/08 06:21:20 brad Exp $
+@comment $OpenBSD: PLIST,v 1.7 2004/04/14 18:26:38 brad Exp $
 bin/type1afm
 @comment bin/xglyph
 include/t1lib.h
@@ -8,7 +8,5 @@ lib/libt1.la
 lib/libt1x.a
 lib/libt1x.la
 %%SHARED%%
-share/t1lib/doc/t1lib_doc.pdf
 share/t1lib/t1lib.config
-@dirrm share/t1lib/doc
 @dirrm share/t1lib