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

- fix a path and zap bogus stuff from post-install.

Browse Source
This commit is contained in:
jasper 2011-09-27 09:16:41 +00:00
parent 4836fcdde5
commit 7c48b0a4fe
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/leiningen/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.1.1.1 2011/09/21 13:40:16 jasper Exp $
# $OpenBSD: Makefile,v 1.2 2011/09/27 09:16:41 jasper Exp $
COMMENT= tool for building of code, written in Clojure
# Full tarball with the script and the leiningen jar taken from github
V= 1.6.1.1
DISTNAME= leiningen-$V
REVISION= 0
CATEGORIES= devel java
@ -31,8 +32,7 @@ RUN_DEPENDS= devel/apache-ant \
java/javaPathHelper \
shells/bash
SUBST_VARS+= MODJAVA_SHARE_DIR \
MODJAVA_JAR_DIR
SUBST_VARS+= MODJAVA_JAR_DIR
do-configure:
${SUBST_CMD} ${WRKSRC}/lein
@ -40,7 +40,5 @@ do-configure:
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/lein ${PREFIX}/bin/
${INSTALL_DATA_DIR} ${MODJAVA_JAR_DIR}/lein/
${INSTALL_DATA} ${WRKSRC}/leiningen-$V-standalone.jar \
${MODJAVA_JAR_DIR}/lein/leiningen-standalone.jar
.include <bsd.port.mk>

10
devel/leiningen/patches/patch-lein
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-lein,v 1.1.1.1 2011/09/21 13:40:16 jasper Exp $
$OpenBSD: patch-lein,v 1.2 2011/09/27 09:16:41 jasper Exp $
- Adjust paths to java, clojure and jar files
--- lein.orig Tue Sep 20 13:27:07 2011
+++ lein Tue Sep 20 14:35:22 2011
+++ lein Tue Sep 27 11:07:58 2011
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
@ -19,13 +19,11 @@ $OpenBSD: patch-lein,v 1.1.1.1 2011/09/21 13:40:16 jasper Exp $
LEIN_HOME=${LEIN_HOME:-"$HOME/.lein"}
DEV_PLUGINS="$(ls -1 lib/dev/*jar 2> /dev/null)"
@@ -62,8 +62,8 @@ unique_user_plugins () {
LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)"
@@ -63,7 +63,7 @@ LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)"
LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)"
CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/"
-LEIN_JAR="$HOME/.lein/self-installs/leiningen-$LEIN_VERSION-standalone.jar"
LEIN_JAR="$HOME/.lein/self-installs/leiningen-$LEIN_VERSION-standalone.jar"
-CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar"
+LEIN_JAR="${MODJAVA_SHARE_DIR}/lein/leiningen-standalone.jar"
+CLOJURE_JAR="${LOCALBASE}/clojure/clojure.jar:${MODJAVA_JAR_DIR}/asm.jar"
NULL_DEVICE=/dev/null