[pkgsrc/trunk]: pkgsrc/devel/apache-maven Add forgotten patch file change.

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7ee12346e4e
branches:  trunk
changeset: 642994:f7ee12346e4e
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Tue Dec 09 11:52:03 2014 +0000

description:
Add forgotten patch file change.

diffstat:

 devel/apache-maven/Makefile                  |   4 ++--
 devel/apache-maven/distinfo                  |   4 ++--
 devel/apache-maven/patches/patch-bin_m2.conf |  10 ++++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diffs (55 lines):

diff -r ee7210c524cb -r f7ee12346e4e devel/apache-maven/Makefile
--- a/devel/apache-maven/Makefile       Tue Dec 09 11:43:53 2014 +0000
+++ b/devel/apache-maven/Makefile       Tue Dec 09 11:52:03 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/12/09 11:43:40 fhajny Exp $
+# $NetBSD: Makefile,v 1.11 2014/12/09 11:52:03 fhajny Exp $
 #
 
 DISTNAME=      apache-maven-3.2.3
@@ -17,7 +17,7 @@
 NO_BUILD=      yes
 
 SUBST_CLASSES+=                maven
-SUBST_FILES.maven=     bin/mvn
+SUBST_FILES.maven=     bin/m2.conf bin/mvn
 SUBST_STAGE.maven=     pre-configure
 SUBST_VARS.maven=      PKG_JAVA_HOME PKG_SYSCONFDIR PREFIX
 
diff -r ee7210c524cb -r f7ee12346e4e devel/apache-maven/distinfo
--- a/devel/apache-maven/distinfo       Tue Dec 09 11:43:53 2014 +0000
+++ b/devel/apache-maven/distinfo       Tue Dec 09 11:52:03 2014 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2014/12/09 11:43:40 fhajny Exp $
+$NetBSD: distinfo,v 1.10 2014/12/09 11:52:03 fhajny Exp $
 
 SHA1 (apache-maven-3.2.3-bin.tar.gz) = 1ce6641f7dcb4fd5785bedcdca2979da83f6d23f
 RMD160 (apache-maven-3.2.3-bin.tar.gz) = 45d5e349f232ba6ec32239bda107e59d31a1a231
 Size (apache-maven-3.2.3-bin.tar.gz) = 6956162 bytes
-SHA1 (patch-bin_m2.conf) = e0d2d7442fd86e539d73c1cdb6449d9c8b412122
+SHA1 (patch-bin_m2.conf) = e267855998ee06efa649aee9e30a28833b7223cb
 SHA1 (patch-bin_mvn) = 3c70f0f6b50df1e001945155e08b9d8b90319955
diff -r ee7210c524cb -r f7ee12346e4e devel/apache-maven/patches/patch-bin_m2.conf
--- a/devel/apache-maven/patches/patch-bin_m2.conf      Tue Dec 09 11:43:53 2014 +0000
+++ b/devel/apache-maven/patches/patch-bin_m2.conf      Tue Dec 09 11:52:03 2014 +0000
@@ -1,14 +1,16 @@
-$NetBSD: patch-bin_m2.conf,v 1.1 2013/03/03 16:53:42 yyamano Exp $
+$NetBSD: patch-bin_m2.conf,v 1.2 2014/12/09 11:52:03 fhajny Exp $
 
 Follow pkgsrc path convention.
 
---- bin/m2.conf.orig   2013-02-19 13:54:21.000000000 +0000
+--- bin/m2.conf.orig   2014-08-11 20:59:27.000000000 +0000
 +++ bin/m2.conf
-@@ -3,5 +3,5 @@ main is org.apache.maven.cli.MavenCli fr
+@@ -3,6 +3,6 @@ main is org.apache.maven.cli.MavenCli fr
  set maven.home default ${user.home}/m2
  
  [plexus.core]
 -optionally ${maven.home}/lib/ext/*.jar
 +optionally ${maven.home}/lib/java/maven/*.jar
- load       ${maven.home}/lib/*.jar
+ load       ${maven.home}/lib/*.jar
+-load       ${maven.home}/conf/logging
 \ No newline at end of file
++load       @PKG_SYSCONFDIR@/logging