From 431c3c4ce1fecc24ced949f8fa32d3c4f433f9d1 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Fri, 1 Jul 2016 14:25:17 +0000
Subject: [PATCH] gc LD_PRELOAD parts no longer needed, ok edd@

---
 math/graphviz/Makefile                 |  6 +++---
 math/graphviz/files/tests/run_tests.sh |  5 +----
 math/graphviz/pkg/PLIST-main           |  3 +--
 math/graphviz/pkg/README-main          | 18 ------------------
 4 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100644 math/graphviz/pkg/README-main

diff --git a/math/graphviz/Makefile b/math/graphviz/Makefile
index 8b7c0433b07..2bb6ecb8a93 100644
--- a/math/graphviz/Makefile
+++ b/math/graphviz/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.64 2016/04/04 22:57:45 naddy Exp $
+# $OpenBSD: Makefile,v 1.65 2016/07/01 14:25:17 sthen Exp $
 
 COMMENT-main=	graph drawing software
 
 DISTNAME=	graphviz-2.36.0
-REVISION=	5
+REVISION=	6
 PKGNAME-main=	${DISTNAME}
 CATEGORIES=	math devel graphics
 
@@ -151,7 +151,7 @@ TEST_TMP=${WRKDIR}/test_tmp
 do-test:
 	mkdir -p ${TEST_TMP}
 	cd ${FILESDIR}/tests && for i in *-test.* run_tests.sh; do \
-		${SUBST_CMD} -c $${i} ${TEST_TMP}/$${i}; \
+		${SUBST_CMD} -m 0644 -c $${i} ${TEST_TMP}/$${i}; \
 	done
 	cd ${TEST_TMP} && /bin/sh ./run_tests.sh
 
diff --git a/math/graphviz/files/tests/run_tests.sh b/math/graphviz/files/tests/run_tests.sh
index 293c522187f..e6b17d588f3 100644
--- a/math/graphviz/files/tests/run_tests.sh
+++ b/math/graphviz/files/tests/run_tests.sh
@@ -1,11 +1,8 @@
 #!/bin/sh
 #
-# $OpenBSD: run_tests.sh,v 1.1 2012/08/31 19:50:01 edd Exp $
+# $OpenBSD: run_tests.sh,v 1.2 2016/07/01 14:25:17 sthen Exp $
 # Simple regression tests for the OpenBSD graphviz port
 
-# Required due to single threaded interpreters (see README)
-export LD_PRELOAD=/usr/lib/libpthread.so
-
 # Silence deprecated guile constructs
 export GUILE_WARN_DEPRECATED=no
 
diff --git a/math/graphviz/pkg/PLIST-main b/math/graphviz/pkg/PLIST-main
index c215ad78447..89b0ce6550e 100644
--- a/math/graphviz/pkg/PLIST-main
+++ b/math/graphviz/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.6 2016/04/04 22:57:45 naddy Exp $
+@comment $OpenBSD: PLIST-main,v 1.7 2016/07/01 14:25:17 sthen Exp $
 @bin bin/acyclic
 @bin bin/bcomps
 @bin bin/ccomps
@@ -453,7 +453,6 @@ share/doc/graphviz/pdf/twopi.1.pdf
 share/doc/graphviz/pdf/unflatten.1.pdf
 share/doc/graphviz/pdf/vimdot.1.pdf
 share/doc/graphviz/pdf/xdot.3.pdf
-share/doc/pkg-readmes/${FULLPKGNAME}
 share/examples/graphviz/
 share/examples/graphviz/demo/
 share/examples/graphviz/demo/doted.tcl
diff --git a/math/graphviz/pkg/README-main b/math/graphviz/pkg/README-main
deleted file mode 100644
index a31144bef9a..00000000000
--- a/math/graphviz/pkg/README-main
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: README-main,v 1.1 2012/08/22 09:55:01 edd Exp $
-
-+-----------------------------------------------------------------------
-| Running ${FULLPKGNAME} on OpenBSD
-+-----------------------------------------------------------------------
-
-Threading Linkage for Language Bindings
-=======================================
-
-If you require a language binding for a language which does not support
-multi-threading (at the moment, that is in-base perl and the default
-flavoured tcl package), then you must use the LD_PRELOAD environment
-variable to preload libpthread.
-
-Eg. LD_PRELOAD=/usr/lib/libpthread.so perl some_graphviz_script.pl
-
-This is because a host binary which does not link libpthread may not
-dlopen() a shared object which does link libpthread.