cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix dot, regen other patches.

Browse Source 
patch from edd@, committed by me since we're running out of time.
sorry edd for not checking this earlier.
This commit is contained in:
espie 2010-08-09 08:55:43 +00:00
parent 5fd9858d83
commit 18c17c4ff1
5 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
math/graphviz/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.34 2010/07/18 10:30:41 steven Exp $
# $OpenBSD: Makefile,v 1.35 2010/08/09 08:55:43 espie Exp $
COMMENT-main= graph drawing software
DISTNAME= graphviz-2.12
PKGNAME-main= ${DISTNAME}
REVISION-main= 8
REVISION-main= 9
CATEGORIES= math devel graphics
MULTI_PACKAGES= -main

16
math/graphviz/patches/patch-cmd_dot_Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-cmd_dot_Makefile_in,v 1.1 2010/08/09 08:55:43 espie Exp $
--- cmd/dot/Makefile.in.orig2 Mon Aug 9 10:42:30 2010
+++ cmd/dot/Makefile.in Mon Aug 9 10:42:46 2010
@@ -519,10 +519,10 @@ clean-binPROGRAMS:
done
dot$(EXEEXT): $(dot_OBJECTS) $(dot_DEPENDENCIES)
@rm -f dot$(EXEEXT)
- $(LINK) $(dot_LDFLAGS) $(dot_OBJECTS) $(dot_LDADD) $(LIBS)
+ $(LINK) $(dot_LDFLAGS) $(dot_OBJECTS) $(dot_LDADD) $(LIBS) -pthread
dot_static$(EXEEXT): $(dot_static_OBJECTS) $(dot_static_DEPENDENCIES)
@rm -f dot_static$(EXEEXT)
- $(LINK) $(dot_static_LDFLAGS) $(dot_static_OBJECTS) $(dot_static_LDADD) $(LIBS)
+ $(LINK) $(dot_static_LDFLAGS) $(dot_static_OBJECTS) $(dot_static_LDADD) $(LIBS) -pthread
mostlyclean-compile:
-rm -f *.$(OBJEXT)

12
math/graphviz/patches/patch-lib_gd_gd_gif_in_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_gd_gd_gif_in_c,v 1.1 2007/02/20 11:47:07 espie Exp $
$OpenBSD: patch-lib_gd_gd_gif_in_c,v 1.2 2010/08/09 08:55:43 espie Exp $
--- lib/gd/gd_gif_in.c.orig2 Mon Mar 14 19:41:54 2005
+++ lib/gd/gd_gif_in.c Tue Jan 30 13:54:59 2007
@@ -122,6 +122,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFro
+++ lib/gd/gd_gif_in.c Mon Aug 9 10:26:48 2010
@@ -122,6 +122,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCt
char version[4];
/* 2.0.28: threadsafe storage */
int ZeroDataBlock = FALSE;
@ -9,7 +9,7 @@ $OpenBSD: patch-lib_gd_gd_gif_in_c,v 1.1 2007/02/20 11:47:07 espie Exp $
gdImagePtr im = 0;
if (! ReadOK(fd,buf,6)) {
@@ -168,6 +169,8 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFro
@@ -168,6 +169,8 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCt
}
if (c != ',') { /* Not a valid start character */
@ -26,7 +26,7 @@ $OpenBSD: patch-lib_gd_gd_gif_in_c,v 1.1 2007/02/20 11:47:07 espie Exp $
switch (label) {
case 0xf9: /* Graphic Control Extension */
@@ -258,13 +262,13 @@ DoExtension(gdIOCtx *fd, int label, int
@@ -258,13 +262,13 @@ DoExtension(gdIOCtx *fd, int label, int *Transparent,
if ((buf[0] & 0x1) != 0)
*Transparent = buf[3];
@ -42,7 +42,7 @@ $OpenBSD: patch-lib_gd_gd_gif_in_c,v 1.1 2007/02/20 11:47:07 espie Exp $
;
return FALSE;
@@ -423,14 +427,15 @@ LWZReadByte_(gdIOCtx *fd, int flag, int
@@ -423,14 +427,15 @@ LWZReadByte_(gdIOCtx *fd, int flag, int input_code_siz
} else if (code == end_code) {
int count;
unsigned char buf[260];

8
math/graphviz/patches/patch-lib_gvc_gvconfig_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_gvc_gvconfig_c,v 1.1 2007/02/20 11:47:07 espie Exp $
--- lib/gvc/gvconfig.c.orig2 Mon Feb 19 22:35:11 2007
+++ lib/gvc/gvconfig.c Mon Feb 19 22:39:22 2007
@@ -312,10 +312,14 @@ static void config_rescan(GVC_t *gvc, ch
$OpenBSD: patch-lib_gvc_gvconfig_c,v 1.2 2010/08/09 08:55:43 espie Exp $
--- lib/gvc/gvconfig.c.orig2 Tue Sep 26 20:40:55 2006
+++ lib/gvc/gvconfig.c Mon Aug 9 10:26:48 2010
@@ -312,10 +312,14 @@ static void config_rescan(GVC_t *gvc, char *config_pat
libdir = gvconfig_libdir();
config_re = gmalloc(strlen(plugin_re_beg) + 20 + strlen(plugin_re_end) + 1);

8
math/graphviz/patches/patch-plugin_xlib_gvdevice_xlib_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-plugin_xlib_gvdevice_xlib_c,v 1.1 2007/02/20 11:47:07 espie Exp $
--- plugin/xlib/gvdevice_xlib.c.orig2 Tue Feb 20 12:08:22 2007
+++ plugin/xlib/gvdevice_xlib.c Tue Feb 20 12:09:06 2007
@@ -493,11 +493,13 @@ static void finalize_xlib(GVJ_t *firstjo
$OpenBSD: patch-plugin_xlib_gvdevice_xlib_c,v 1.2 2010/08/09 08:55:43 espie Exp $
--- plugin/xlib/gvdevice_xlib.c.orig2 Fri Aug 11 15:50:34 2006
+++ plugin/xlib/gvdevice_xlib.c Mon Aug 9 10:26:48 2010
@@ -493,11 +493,13 @@ static void finalize_xlib(GVJ_t *firstjob)
bool watching_p = FALSE;
static char *dir;
char *p, *cwd = NULL;