diff options
| author | fhajny <fhajny@pkgsrc.org> | 2014-12-09 11:52:03 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2014-12-09 11:52:03 +0000 |
| commit | 915dbcdb24e4f349a73e4444943346eb50fed195 (patch) | |
| tree | 8cb2ded23876db06f75feafa7444ac980917f8aa /devel | |
| parent | 5021d84476c50f29fd0b7dff120814e997c722d9 (diff) | |
| download | pkgsrc-915dbcdb24e4f349a73e4444943346eb50fed195.tar.gz | |
Add forgotten patch file change.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/apache-maven/Makefile | 4 | ||||
| -rw-r--r-- | devel/apache-maven/distinfo | 4 | ||||
| -rw-r--r-- | devel/apache-maven/patches/patch-bin_m2.conf | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/devel/apache-maven/Makefile b/devel/apache-maven/Makefile index 6c2f76fc8d9..76ad4259206 100644 --- a/devel/apache-maven/Makefile +++ b/devel/apache-maven/Makefile @@ -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 @@ USE_TOOLS+= pax 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 --git a/devel/apache-maven/distinfo b/devel/apache-maven/distinfo index 12a7d364c5a..6b041d06c7e 100644 --- a/devel/apache-maven/distinfo +++ b/devel/apache-maven/distinfo @@ -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 --git a/devel/apache-maven/patches/patch-bin_m2.conf b/devel/apache-maven/patches/patch-bin_m2.conf index 6bdd0671eb2..9b2df006b67 100644 --- a/devel/apache-maven/patches/patch-bin_m2.conf +++ b/devel/apache-maven/patches/patch-bin_m2.conf @@ -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
|