From 6c9ce8c1b3e7ff69a4b0312f32b774d592f710ba Mon Sep 17 00:00:00 2001
From: Crestwave <35413013+Crestwave@users.noreply.github.com>
Date: Thu, 3 Oct 2019 10:21:15 +0800
Subject: [PATCH] janet: bump to 1.3.1 (#4220)

---
 ...{janet-0.5.0.recipe => janet-1.3.1.recipe} | 39 ++++++++++---------
 dev-lang/janet/patches/janet-0.5.0.patch      | 22 -----------
 dev-lang/janet/patches/janet-1.3.1.patch      | 37 ++++++++++++++++++
 3 files changed, 58 insertions(+), 40 deletions(-)
 rename dev-lang/janet/{janet-0.5.0.recipe => janet-1.3.1.recipe} (65%)
 delete mode 100644 dev-lang/janet/patches/janet-0.5.0.patch
 create mode 100644 dev-lang/janet/patches/janet-1.3.1.patch

diff --git a/dev-lang/janet/janet-0.5.0.recipe b/dev-lang/janet/janet-1.3.1.recipe
similarity index 65%
rename from dev-lang/janet/janet-0.5.0.recipe
rename to dev-lang/janet/janet-1.3.1.recipe
index 13ac66919..793879b3e 100644
--- a/dev-lang/janet/janet-0.5.0.recipe
+++ b/dev-lang/janet/janet-1.3.1.recipe
@@ -9,19 +9,27 @@ COPYRIGHT="2019 Calvin Rose and contributors"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://github.com/janet-lang/janet/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="f5c90122715869657427cbba62809a1d53eaaced2268e7d55202301d65a75076"
+CHECKSUM_SHA256="f14de9e2e1db5707e48a15f4262f4ce8c9ff99b2b3abc59ea6a1493d54bd4ed4"
 SOURCE_FILENAME="janet-$portVersion.tar.gz"
-PATCHES="janet-0.5.0.patch"
+PATCHES="janet-1.3.1.patch"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${portVersion%%.*}"
 
 PROVIDES="
 	janet$secondaryArchSuffix = $portVersion
-	cmd:janet$secondaryArchSuffix
+	cmd:janet$commandSuffix
+	cmd:jpm$commandSuffix
 	lib:libjanet$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -32,6 +40,9 @@ PROVIDES_devel="
 	janet${secondaryArchSuffix}_devel = $portVersion
 	devel:libjanet$secondaryArchSuffix = $libVersionCompat
 	"
+REQUIRES_devel="
+	janet$secondaryArchSuffix == $portVersion base
+	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
@@ -43,35 +54,27 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage janet$secondaryArchSuffix \
-	"$binDir/janet" \
+	"$commandBinDir/janet$commandSuffix" \
 	"$libDir/libjanet.so.$libVersion"
 
 BUILD()
 {
-	make $jobArgs
+	make $jobArgs INCLUDEDIR="$includeDir" LIBDIR="$libDir"
 }
 
 INSTALL()
 {
-	install -m 755 -d "$binDir" "$developDir/headers" "$libDir/janet" \
-		"$docDir" "$manDir/man1/janet"
-	install -m 755 build/janet "$binDir"
-	install -m 644 src/include/janet{,conf}.h "$developDir/headers"
-
-	install -m 755 build/libjanet.so "$libDir/libjanet.so.$libVersion"
-	ln -sf "libjanet.so.${libVersionCompat##* }" "$libDir/libjanet.so"
-	ln -sf "libjanet.so.$libVersion" \
-		"$libDir/libjanet.so.${libVersionCompat##* }"
-	install -m 644 tools/{cook,highlight,bars}.janet "$libDir/janet"
+	make install BINDIR="$commandBinDir" \
+		INCLUDEDIR="$includeDir" \
+		LIBDIR="$libDir" \
+		MANPATH="$manDir/man1" \
+		PREFIX="$prefix"
 
 	prepareInstalledDevelLib libjanet
 	fixPkgconfig
 
 	packageEntries devel \
 		"$developDir"
-
-	install -m 644 README.md "$docDir"
-	install -m 644 janet.1 "$manDir/man1"
 }
 
 TEST()
diff --git a/dev-lang/janet/patches/janet-0.5.0.patch b/dev-lang/janet/patches/janet-0.5.0.patch
deleted file mode 100644
index cde93abc5..000000000
--- a/dev-lang/janet/patches/janet-0.5.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -47,6 +47,9 @@ else ifeq ($(UNAME), Linux)
- 	CLIBS:=$(CLIBS) -lrt -ldl
- endif
- # For other unix likes, add flags here!
-+ifeq ($(UNAME),Haiku)
-+	LDFLAGS=-Wl,--export-dynamic
-+endif
- 
- $(shell mkdir -p build/core build/mainclient build/webclient build/boot)
- all: $(JANET_TARGET) $(JANET_LIBRARY)
---- a/src/include/janet.h
-+++ b/src/include/janet.h
-@@ -51,6 +51,7 @@ extern "C" {
-     || defined(__FreeBSD__) || defined(__DragonFly__) \
-     || defined(__FreeBSD_kernel__) \
-     || defined(__GNU__) /* GNU/Hurd */ \
-+    || defined(__HAIKU__) \
-     || defined(__linux__) \
-     || defined(__NetBSD__) \
-     || defined(__OpenBSD__) \
diff --git a/dev-lang/janet/patches/janet-1.3.1.patch b/dev-lang/janet/patches/janet-1.3.1.patch
new file mode 100644
index 000000000..2538111ff
--- /dev/null
+++ b/dev-lang/janet/patches/janet-1.3.1.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile b/Makefile
+index 54c434a..c7a8935 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,17 +24,17 @@
+ 
+ PREFIX?=/usr/local
+ 
+-INCLUDEDIR=$(PREFIX)/include
+-BINDIR=$(PREFIX)/bin
+-LIBDIR=$(PREFIX)/lib
++INCLUDEDIR?=$(PREFIX)/include
++BINDIR?=$(PREFIX)/bin
++LIBDIR?=$(PREFIX)/lib
+ JANET_BUILD?="\"$(shell git log --pretty=format:'%h' -n 1)\""
+ CLIBS=-lm
+ JANET_TARGET=build/janet
+ JANET_LIBRARY=build/libjanet.so
+ JANET_STATIC_LIBRARY=build/libjanet.a
+-JANET_PATH?=$(PREFIX)/lib/janet
++JANET_PATH?=$(LIBDIR)/janet
+ MANPATH?=$(PREFIX)/share/man/man1/
+-PKG_CONFIG_PATH?=$(PREFIX)/lib/pkgconfig
++PKG_CONFIG_PATH?=$(LIBDIR)/pkgconfig
+ DEBUGGER=gdb
+ 
+ CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -Isrc/conf -fpic -O2 -fvisibility=hidden \
+@@ -53,7 +53,8 @@ else ifeq ($(UNAME), Linux)
+ 	CLIBS:=$(CLIBS) -lrt -ldl
+ endif
+ # For other unix likes, add flags here!
+-ifeq ($(UNAME),Haiku)
++ifeq ($(UNAME), Haiku)
++	LDCONFIG:=
+ 	LDFLAGS=-Wl,--export-dynamic
+ endif
+