drop combination of sed and perl in favor of SUBST_CMD
This commit is contained in:
parent
ea539b6481
commit
b6fda76c64
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.23 2014/11/11 08:29:59 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.24 2014/11/11 08:40:38 jasper Exp $
|
||||
|
||||
COMMENT= software project management and comprehension tool
|
||||
|
||||
@ -28,6 +28,8 @@ NO_TEST= Yes
|
||||
MAVEN_HOME= ${LOCALBASE}/maven
|
||||
SAMPLEDIR= ${PREFIX}/share/examples/maven
|
||||
|
||||
SUBST_VARS+= MAVEN_HOME
|
||||
|
||||
do-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/maven
|
||||
${INSTALL_DATA_DIR} ${SAMPLEDIR}
|
||||
@ -40,14 +42,8 @@ do-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/conf/logging/* ${SAMPLEDIR}/logging/
|
||||
${INSTALL_DATA} ${WRKSRC}/conf/settings.xml ${SAMPLEDIR}/
|
||||
ln -s ${SYSCONFDIR}/maven ${PREFIX}/maven/conf
|
||||
@perl -pi -e 's,%%SYSCONFDIR%%,${SYSCONFDIR},' \
|
||||
${PREFIX}/maven/bin/mvn
|
||||
@sed -e 's,%%MAVEN_HOME%%,${MAVEN_HOME},' \
|
||||
< ${FILESDIR}/maven.rc \
|
||||
> ${SAMPLEDIR}/maven.rc
|
||||
@sed -e 's,%%LOCALBASE%%,${LOCALBASE},' \
|
||||
< ${FILESDIR}/mvn \
|
||||
> ${WRKSRC}/bin/mvn
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/bin/mvn ${PREFIX}/bin/
|
||||
${SUBST_CMD} ${WRKSRC}/bin/mvn
|
||||
${SUBST_CMD} -c ${FILESDIR}/maven.rc ${SAMPLEDIR}/maven.rc
|
||||
${SUBST_CMD} -m 755 -c ${FILESDIR}/mvn ${PREFIX}/bin/mvn
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: maven.rc,v 1.2 2006/08/07 19:30:52 kurt Exp $
|
||||
# $OpenBSD: maven.rc,v 1.3 2014/11/11 08:40:38 jasper Exp $
|
||||
#
|
||||
# Define JAVA_HOME, M2_HOME and MAVEN_OPTS here.
|
||||
#
|
||||
|
||||
JAVA_HOME=$(javaPathHelper -h maven)
|
||||
|
||||
M2_HOME=%%MAVEN_HOME%%
|
||||
M2_HOME=${MAVEN_HOME}
|
||||
|
||||
#MAVEN_OPTS=
|
||||
|
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $OpenBSD: mvn,v 1.2 2013/03/06 13:12:47 kurt Exp $
|
||||
# $OpenBSD: mvn,v 1.3 2014/11/11 08:40:38 jasper Exp $
|
||||
|
||||
exec %%LOCALBASE%%/maven/bin/mvn "$@"
|
||||
exec ${LOCALBASE}/maven/bin/mvn "$@"
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-bin_mvn,v 1.4 2013/03/06 13:12:47 kurt Exp $
|
||||
$OpenBSD: patch-bin_mvn,v 1.5 2014/11/11 08:40:38 jasper Exp $
|
||||
--- bin/mvn.orig Tue Feb 19 08:54:21 2013
|
||||
+++ bin/mvn Tue Mar 5 23:18:26 2013
|
||||
@@ -36,8 +36,8 @@
|
||||
@ -7,8 +7,8 @@ $OpenBSD: patch-bin_mvn,v 1.4 2013/03/06 13:12:47 kurt Exp $
|
||||
|
||||
- if [ -f /etc/mavenrc ] ; then
|
||||
- . /etc/mavenrc
|
||||
+ if [ -f %%SYSCONFDIR%%/maven/maven.rc ] ; then
|
||||
+ . %%SYSCONFDIR%%/maven/maven.rc
|
||||
+ if [ -f ${SYSCONFDIR}/maven/maven.rc ] ; then
|
||||
+ . ${SYSCONFDIR}/maven/maven.rc
|
||||
fi
|
||||
|
||||
if [ -f "$HOME/.mavenrc" ] ; then
|
||||
|
Loading…
x
Reference in New Issue
Block a user