diff options
| author |  Jon Bernard <jbernard@jbernard.io>
| 2019-12-02 22:11:29 -0500 |
|---|---|---|
| committer | Jon Bernard <jbernard@jbernard.io>
| 2019-12-02 22:11:29 -0500 |
| commit | 9b2072da59d8fb196c62c748968d55b6d1a4a32b (patch) | |
| tree | 5e1ccd74e040da16583398fda16a8113f7da6a0c | |
| parent | 0b852a317e8d470656f5732a4a0e105c418b7311 (diff) | |
| download | mystuff-9b2072da59d8fb196c62c748968d55b6d1a4a32b.tar.gz mystuff-9b2072da59d8fb196c62c748968d55b6d1a4a32b.tar.bz2 mystuff-9b2072da59d8fb196c62c748968d55b6d1a4a32b.zip | |
Fixup leiningen
| -rw-r--r-- | devel/leiningen/Makefile | 5 | ||||
| -rw-r--r-- | devel/leiningen/patches/patch-bin_lein-pkg | 20 | ||||
| -rw-r--r-- | devel/leiningen/pkg/PLIST | 2 |
3 files changed, 15 insertions, 12 deletions
diff --git a/devel/leiningen/Makefile b/devel/leiningen/Makefile index fb16d8f..363fdbf 100644 --- a/devel/leiningen/Makefile +++ b/devel/leiningen/Makefile @@ -33,14 +33,11 @@ LEIN_DIR = ${PREFIX}/share/java BASH_DIR = ${PREFIX}/share/bash-completion/completions ZSH_DIR = ${PREFIX}/share/zsh/site-functions -SUBST_VARS += JAR_FILE \ - LEIN_DIR - do-install: ${SUBST_PROGRAM} ${LEIN} ${PREFIX}/bin/lein ${INSTALL_MAN} ${WRKSRC}/doc/lein.1 ${PREFIX}/man/man1/ ${INSTALL_DATA_DIR} ${LEIN_DIR} ${BASH_DIR} ${ZSH_DIR} - ${INSTALL_DATA} ${FULLDISTDIR}/${JAR_FILE} ${LEIN_DIR}/ + ${INSTALL_DATA} ${FULLDISTDIR}/${JAR_FILE} ${LEIN_DIR}/${PKGNAME}-standalone.jar ${INSTALL_DATA} ${WRKSRC}/bash_completion.bash ${BASH_DIR}/lein ${INSTALL_DATA} ${WRKSRC}/zsh_completion.zsh ${ZSH_DIR}/_lein diff --git a/devel/leiningen/patches/patch-bin_lein-pkg b/devel/leiningen/patches/patch-bin_lein-pkg index 36ed72c..538f556 100644 --- a/devel/leiningen/patches/patch-bin_lein-pkg +++ b/devel/leiningen/patches/patch-bin_lein-pkg @@ -4,31 +4,37 @@ $OpenBSD$ - set path to standalone jar - use sha1(1) ---- bin/lein-pkg.orig Mon Feb 20 11:42:41 2017 -+++ bin/lein-pkg Mon Feb 20 11:42:56 2017 +Index: bin/lein-pkg +--- bin/lein-pkg.orig ++++ bin/lein-pkg @@ -1,4 +1,4 @@ -#!/bin/bash +#!${LOCALBASE}/bin/bash # This variant of the lein script is meant for downstream packagers. # It has all the cross-platform stuff stripped out as well as the -@@ -57,7 +57,7 @@ LEIN_JVM_OPTS="${LEIN_JVM_OPTS:-'-Xms64m -Xmx512m'}" +@@ -43,7 +43,7 @@ LEIN_JVM_OPTS="${LEIN_JVM_OPTS:-'-Xms64m -Xmx512m'}" # If you're not using an uberjar you'll need to list each dependency # and add them individually to the classpath/bootclasspath as well. -LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar -+LEIN_JAR=${LEIN_DIR}/${JAR_FILE} ++LEIN_JAR=${LOCALBASE}/share/java/leiningen-$LEIN_VERSION-standalone.jar # Do not use installed leiningen jar during self-compilation if ! { [ "$1" = "compile" ] && -@@ -88,8 +88,8 @@ fi +@@ -88,12 +88,10 @@ fi if [ "$LEIN_FAST_TRAMPOLINE" != "" ] && [ -r project.clj ]; then INPUTS="$* $(cat project.clj) $(test -f "$LEIN_HOME/profiles.clj" && cat "$LEIN_HOME/profiles.clj")" - if command -v shasum >/dev/null 2>&1; then - SUM="shasum" +- elif command -v sha1sum >/dev/null 2>&1; then +- SUM="sha1sum" + if command -v sha1 >/dev/null 2>&1; then + SUM="sha1" - elif command -v sha1sum >/dev/null 2>&1; then - SUM="sha1sum" else +- command_not_found "sha1sum or shasum" ++ command_not_found "sha1" + fi + + INPUT_CHECKSUM=$(echo "$INPUTS" | $SUM | cut -f 1 -d " ") diff --git a/devel/leiningen/pkg/PLIST b/devel/leiningen/pkg/PLIST index 96fef8d..ffed47a 100644 --- a/devel/leiningen/pkg/PLIST +++ b/devel/leiningen/pkg/PLIST @@ -5,7 +5,7 @@ share/bash-completion/ share/bash-completion/completions/ share/bash-completion/completions/lein share/java/ -share/java/${JAR_FILE} +share/java/leiningen-2.9.1-standalone.jar share/zsh/ share/zsh/site-functions/ share/zsh/site-functions/_lein |