- Fix javaPathHelper use

- Use unversioned install directory
okay jasper@

devel/maven/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2013/03/02 12:35:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.19 2013/03/06 13:12:47 kurt Exp $
 
 COMMENT=	software project management and comprehension tool
 
@@ -6,6 +6,7 @@ V=		3.0.5
 DISTNAME=	apache-maven-$V
 PKGNAME=	${DISTNAME:S/apache-//}
 CATEGORIES=	devel
+REVISON=	0
 
 HOMEPAGE=	http://maven.apache.org/
 
@@ -28,27 +29,25 @@ RUN_DEPENDS=	java/javaPathHelper
 NO_BUILD=	Yes
 NO_REGRESS=	Yes
 
-MAVEN_HOME=	${LOCALBASE}/${DISTNAME}
+MAVEN_HOME=	${LOCALBASE}/maven
 SAMPLEDIR=	${PREFIX}/share/examples/maven
-SUBST_VARS+=	DISTNAME V
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${DISTNAME}
+	${INSTALL_DATA_DIR} ${PREFIX}/maven
 	${INSTALL_DATA_DIR} ${SAMPLEDIR}
 	cd ${WRKDIST} && \
 		tar -cf - bin boot lib `find * -prune -type f` | \
-		tar -C ${PREFIX}/${DISTNAME} -xf -
+		tar -C ${PREFIX}/maven -xf -
 	find ${WRKINST} -name \*.orig -or -name \*.bat -or -name \*.exe | \
 		xargs rm
 	${INSTALL_DATA} ${WRKSRC}/conf/settings.xml ${SAMPLEDIR}/
-	ln -s ${SYSCONFDIR}/maven ${PREFIX}/${DISTNAME}/conf
+	ln -s ${SYSCONFDIR}/maven ${PREFIX}/maven/conf
 	@perl -pi -e 's,%%SYSCONFDIR%%,${SYSCONFDIR},' \
-		${PREFIX}/${DISTNAME}/bin/mvn
+		${PREFIX}/maven/bin/mvn
 	@sed -e 's,%%MAVEN_HOME%%,${MAVEN_HOME},' \
 		< ${FILESDIR}/maven.rc \
 		> ${SAMPLEDIR}/maven.rc
-	@sed -e 's,%%DISTNAME%%,${DISTNAME},' \
-		-e 's,%%LOCALBASE%%,${LOCALBASE},' \
+	@sed -e 's,%%LOCALBASE%%,${LOCALBASE},' \
 		< ${FILESDIR}/mvn \
 		> ${WRKSRC}/bin/mvn
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/mvn ${PREFIX}/bin/

devel/maven/files/mvn

@@ -1,5 +1,5 @@
 #!/bin/sh
 #
-# $OpenBSD: mvn,v 1.1.1.1 2005/12/08 09:48:02 bernd Exp $
+# $OpenBSD: mvn,v 1.2 2013/03/06 13:12:47 kurt Exp $
 
-exec %%LOCALBASE%%/%%DISTNAME%%/bin/mvn "$@"
+exec %%LOCALBASE%%/maven/bin/mvn "$@"

devel/maven/patches/patch-bin_mvn

@@ -1,14 +1,14 @@
-$OpenBSD: patch-bin_mvn,v 1.3 2013/02/06 17:46:44 jasper Exp $
---- bin/mvn.orig	Mon Feb  4 22:39:01 2013
-+++ bin/mvn	Mon Feb  4 22:40:16 2013
+$OpenBSD: patch-bin_mvn,v 1.4 2013/03/06 13:12:47 kurt Exp $
+--- bin/mvn.orig	Tue Feb 19 08:54:21 2013
++++ bin/mvn	Tue Mar  5 23:18:26 2013
 @@ -36,8 +36,8 @@
  
  if [ -z "$MAVEN_SKIP_RC" ] ; then
  
 -  if [ -f /etc/mavenrc ] ; then
 -    . /etc/mavenrc
-+  if [ -f %%SYSCONFDIR%%/mavenrc ] ; then
-+    . %%SYSCONFDIR%%/mavenrc
++  if [ -f %%SYSCONFDIR%%/maven/maven.rc ] ; then
++    . %%SYSCONFDIR%%/maven/maven.rc
    fi
  
    if [ -f "$HOME/.mavenrc" ] ; then

devel/maven/pkg/PLIST

@@ -1,49 +1,49 @@
-@comment $OpenBSD: PLIST,v 1.5 2013/03/02 12:35:01 jasper Exp $
-${DISTNAME}/
-${DISTNAME}/LICENSE.txt
-${DISTNAME}/NOTICE.txt
-${DISTNAME}/README.txt
-${DISTNAME}/bin/
-${DISTNAME}/bin/m2.conf
-${DISTNAME}/bin/mvn
-${DISTNAME}/bin/mvnDebug
-${DISTNAME}/bin/mvnyjp
-${DISTNAME}/boot/
-${DISTNAME}/boot/plexus-classworlds-2.4.jar
-${DISTNAME}/conf
-${DISTNAME}/lib/
-${DISTNAME}/lib/aether-api-1.13.1.jar
-${DISTNAME}/lib/aether-connector-wagon-1.13.1.jar
-${DISTNAME}/lib/aether-impl-1.13.1.jar
-${DISTNAME}/lib/aether-spi-1.13.1.jar
-${DISTNAME}/lib/aether-util-1.13.1.jar
-${DISTNAME}/lib/commons-cli-1.2.jar
-${DISTNAME}/lib/ext/
-${DISTNAME}/lib/ext/README.txt
-${DISTNAME}/lib/maven-aether-provider-${V}.jar
-${DISTNAME}/lib/maven-artifact-${V}.jar
-${DISTNAME}/lib/maven-compat-${V}.jar
-${DISTNAME}/lib/maven-core-${V}.jar
-${DISTNAME}/lib/maven-embedder-${V}.jar
-${DISTNAME}/lib/maven-model-${V}.jar
-${DISTNAME}/lib/maven-model-builder-${V}.jar
-${DISTNAME}/lib/maven-plugin-api-${V}.jar
-${DISTNAME}/lib/maven-repository-metadata-${V}.jar
-${DISTNAME}/lib/maven-settings-${V}.jar
-${DISTNAME}/lib/maven-settings-builder-${V}.jar
-${DISTNAME}/lib/plexus-cipher-1.7.jar
-${DISTNAME}/lib/plexus-component-annotations-1.5.5.jar
-${DISTNAME}/lib/plexus-interpolation-1.14.jar
-${DISTNAME}/lib/plexus-sec-dispatcher-1.3.jar
-${DISTNAME}/lib/plexus-utils-2.0.6.jar
-${DISTNAME}/lib/sisu-guava-0.9.9.jar
-${DISTNAME}/lib/sisu-guice-3.1.0-no_aop.jar
-${DISTNAME}/lib/sisu-inject-bean-2.3.0.jar
-${DISTNAME}/lib/sisu-inject-plexus-2.3.0.jar
-${DISTNAME}/lib/wagon-file-2.4.jar
-${DISTNAME}/lib/wagon-http-2.4-shaded.jar
-${DISTNAME}/lib/wagon-provider-api-2.4.jar
+@comment $OpenBSD: PLIST,v 1.6 2013/03/06 13:12:47 kurt Exp $
 bin/mvn
+maven/
+maven/LICENSE.txt
+maven/NOTICE.txt
+maven/README.txt
+maven/bin/
+maven/bin/m2.conf
+maven/bin/mvn
+maven/bin/mvnDebug
+maven/bin/mvnyjp
+maven/boot/
+maven/boot/plexus-classworlds-2.4.jar
+maven/conf
+maven/lib/
+maven/lib/aether-api-1.13.1.jar
+maven/lib/aether-connector-wagon-1.13.1.jar
+maven/lib/aether-impl-1.13.1.jar
+maven/lib/aether-spi-1.13.1.jar
+maven/lib/aether-util-1.13.1.jar
+maven/lib/commons-cli-1.2.jar
+maven/lib/ext/
+maven/lib/ext/README.txt
+maven/lib/maven-aether-provider-3.0.5.jar
+maven/lib/maven-artifact-3.0.5.jar
+maven/lib/maven-compat-3.0.5.jar
+maven/lib/maven-core-3.0.5.jar
+maven/lib/maven-embedder-3.0.5.jar
+maven/lib/maven-model-3.0.5.jar
+maven/lib/maven-model-builder-3.0.5.jar
+maven/lib/maven-plugin-api-3.0.5.jar
+maven/lib/maven-repository-metadata-3.0.5.jar
+maven/lib/maven-settings-3.0.5.jar
+maven/lib/maven-settings-builder-3.0.5.jar
+maven/lib/plexus-cipher-1.7.jar
+maven/lib/plexus-component-annotations-1.5.5.jar
+maven/lib/plexus-interpolation-1.14.jar
+maven/lib/plexus-sec-dispatcher-1.3.jar
+maven/lib/plexus-utils-2.0.6.jar
+maven/lib/sisu-guava-0.9.9.jar
+maven/lib/sisu-guice-3.1.0-no_aop.jar
+maven/lib/sisu-inject-bean-2.3.0.jar
+maven/lib/sisu-inject-plexus-2.3.0.jar
+maven/lib/wagon-file-2.4.jar
+maven/lib/wagon-http-2.4-shaded.jar
+maven/lib/wagon-provider-api-2.4.jar
 share/examples/maven/
 @sample ${SYSCONFDIR}/maven/
 share/examples/maven/maven.rc