From f5bb0d0f280750a89df87ffa6d2d6cc3c263142d Mon Sep 17 00:00:00 2001
From: stu <stu@openbsd.org>
Date: Fri, 10 Oct 2014 19:58:21 +0000
Subject: [PATCH] Update to 0.75pl2. Use GitHub. Fix build-jim-ext.

---
 lang/jimtcl/Makefile                            | 10 ++++++----
 lang/jimtcl/distinfo                            |  4 ++--
 lang/jimtcl/patches/patch-build-jim-ext_in      | 14 ++++++++++++++
 lang/jimtcl/patches/patch-examples_ext_Makefile | 11 +++++------
 4 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 lang/jimtcl/patches/patch-build-jim-ext_in

diff --git a/lang/jimtcl/Makefile b/lang/jimtcl/Makefile
index 62f1aa002b1..40fd4f6a53a 100644
--- a/lang/jimtcl/Makefile
+++ b/lang/jimtcl/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2014/09/16 15:41:15 stu Exp $
+# $OpenBSD: Makefile,v 1.10 2014/10/10 19:58:21 stu Exp $
 
 SHARED_ONLY =		Yes
 
 COMMENT =		small footprint implementation of Tcl
 
-DISTNAME =		jimtcl-0.75pl1
+DISTNAME =		jimtcl-0.75pl2
 SHARED_LIBS =		jim 2.0
 CATEGORIES =		lang devel
 HOMEPAGE =		http://jim.tcl.tk/
@@ -15,8 +15,10 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c m sqlite3
 
-# Git checkin		2014/09/01 c4d4bf8bc104733db1f5992a27d88fbfca9ba882
-MASTER_SITES =		http://mirror.arieslabs.com/openbsd/
+GH_ACCOUNT =		msteveb
+GH_PROJECT =		jimtcl
+#GH_TAGNAME =		0.75 # Tag lag
+GH_COMMIT =		20e9c4c1decdadcec69e43bd7c14f51996baf94c
 
 MODULES =		lang/tcl
 
diff --git a/lang/jimtcl/distinfo b/lang/jimtcl/distinfo
index 08720172b59..a453422066e 100644
--- a/lang/jimtcl/distinfo
+++ b/lang/jimtcl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jimtcl-0.75pl1.tar.gz) = P0IpuMohJOHD79LznqEpaVlbligXbJ04z9tcfY2C8TM=
-SIZE (jimtcl-0.75pl1.tar.gz) = 2227650
+SHA256 (jimtcl-0.75pl2.tar.gz) = eHk/9mNSZe+0tuq5EsWgLRirpvy5O/2Ee8TXB4OXrgI=
+SIZE (jimtcl-0.75pl2.tar.gz) = 2230389
diff --git a/lang/jimtcl/patches/patch-build-jim-ext_in b/lang/jimtcl/patches/patch-build-jim-ext_in
new file mode 100644
index 00000000000..f775d8d0088
--- /dev/null
+++ b/lang/jimtcl/patches/patch-build-jim-ext_in
@@ -0,0 +1,14 @@
+$OpenBSD: patch-build-jim-ext_in,v 1.1 2014/10/10 19:58:21 stu Exp $
+--- build-jim-ext.in.orig	Fri Oct 10 15:22:33 2014
++++ build-jim-ext.in	Fri Oct 10 15:23:01 2014
+@@ -106,8 +106,8 @@ if {$static} {
+ }
+ puts "Building $target from $sources\n"
+ 
+-# Now add the standard location after any user include paths
+-lappend includepaths -I@prefix@/include
++# Now add the Jim location after any user include paths
++lappend includepaths -I@prefix@/include/jim
+ 
+ set CPPFLAGS "-D_GNU_SOURCE"
+ 
diff --git a/lang/jimtcl/patches/patch-examples_ext_Makefile b/lang/jimtcl/patches/patch-examples_ext_Makefile
index e76d76575f4..ce8dfd53ce2 100644
--- a/lang/jimtcl/patches/patch-examples_ext_Makefile
+++ b/lang/jimtcl/patches/patch-examples_ext_Makefile
@@ -1,7 +1,7 @@
-$OpenBSD: patch-examples_ext_Makefile,v 1.1 2014/09/16 15:41:15 stu Exp $
---- examples.ext/Makefile.orig	Thu Sep 11 21:39:06 2014
-+++ examples.ext/Makefile	Fri Sep 12 17:41:23 2014
-@@ -9,21 +9,21 @@
+$OpenBSD: patch-examples_ext_Makefile,v 1.2 2014/10/10 19:58:21 stu Exp $
+--- examples.ext/Makefile.orig	Fri Oct 10 02:34:34 2014
++++ examples.ext/Makefile	Fri Oct 10 15:43:42 2014
+@@ -9,21 +9,20 @@
  # Prefer jimsh in the PATH because it is more likely to be built
  # for the build-host rather than the target.
  
@@ -17,8 +17,7 @@ $OpenBSD: patch-examples_ext_Makefile,v 1.1 2014/09/16 15:41:15 stu Exp $
  
  helloworld.so: helloworld.c
 -	../build-jim-ext -I.. -L.. $(BUILDOPTS) $^
-+	${LOCALBASE}/share/examples/jim/build-jim-ext \
-+	-I${LOCALBASE}/include/jim $(BUILDOPTS) $>
++	${LOCALBASE}/share/examples/jim/build-jim-ext $(BUILDOPTS) $>
  
  # Note: Currently we don't attempt to set LD_LIBRARY_PATH or equivalent