Update apache-maven to 3.2.3.

pkgsrc changes:
- Add missing $PKG_SYSCONFDIR/logging directory and config file
- Improve Makefile readability

Changes in 3.2.3:
- Switch access to Maven Central to HTTPS (MNG-5672)

Changes in 3.2.2:
- Support version ranges in parent elements (MNG-2199)
- Requiring multiple profile activation conditions to be true does
  not work (MNG-4565)
- Support resolution of Import Scope POMs from Repo that contains
  a ${parameter} (MNG-5639)
- Update maven-plugin-plugin:descriptor default binding from
  generate-resources phase to process-classes (MNG-5346)
- ${maven.build.timestamp} should use UTC instead of local timezone
  (or be configurable) (MNG-5452)
- ${maven.build.timestamp} uses incorrect ISO datetime separator
  (MNG-5647)

4 files changed, 26 insertions, 20 deletions

diff --git a/devel/apache-maven/Makefile b/devel/apache-maven/Makefile
index d7a8e10736d..6c2f76fc8d9 100644
--- a/devel/apache-maven/Makefile
+++ b/devel/apache-maven/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2014/05/15 11:17:29 fhajny Exp $
+# $NetBSD: Makefile,v 1.10 2014/12/09 11:43:40 fhajny Exp $
 #
 
-DISTNAME=	apache-maven-3.2.1
+DISTNAME=	apache-maven-3.2.3
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:=maven/maven-3/${PKGVERSION_NOREV}/binaries/}
 DISTFILES=	${DISTNAME}-bin${EXTRACT_SUFX}
@@ -19,21 +19,26 @@ NO_BUILD=	yes
 SUBST_CLASSES+=		maven
 SUBST_FILES.maven=	bin/mvn
 SUBST_STAGE.maven=	pre-configure
-SUBST_SED.maven=	-e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
-SUBST_SED.maven+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.maven+=	-e 's,@SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_VARS.maven=	PKG_JAVA_HOME PKG_SYSCONFDIR PREFIX
 
-INSTALLATION_DIRS=	bin etc/maven lib/java/maven lib/java/maven/boot
-INSTALLATION_DIRS+=	share/doc/java/maven share/examples/maven
+INSTALLATION_DIRS=	bin etc/maven lib/java/maven lib/java/maven/boot \
+			share/doc/java/maven share/examples/maven \
+			share/examples/maven/logging
 
 PKG_SYSCONFSUBDIR=	maven
-CONF_FILES+=	share/examples/maven/m2.conf ${PKG_SYSCONFDIR}/m2.conf
-CONF_FILES+=	share/examples/maven/settings.xml ${PKG_SYSCONFDIR}/settings.xml
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/logging
+CONF_FILES=		share/examples/maven/m2.conf \
+			${PKG_SYSCONFDIR}/m2.conf
+CONF_FILES+=		share/examples/maven/settings.xml \
+			${PKG_SYSCONFDIR}/settings.xml
+CONF_FILES+=		share/examples/maven/logging/simplelogger.properties \
+			${PKG_SYSCONFDIR}/logging/simplelogger.properties
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/mvn ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${DESTDIR}${PREFIX}/share/examples/maven
 	${INSTALL_DATA} ${WRKSRC}/conf/settings.xml ${DESTDIR}${PREFIX}/share/examples/maven
+	${INSTALL_DATA} ${WRKSRC}/conf/logging/simplelogger.properties ${DESTDIR}${PREFIX}/share/examples/maven/logging
 	${INSTALL_DATA} ${WRKSRC}/boot/*.jar ${DESTDIR}${PREFIX}/lib/java/maven/boot
 	${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${DESTDIR}${PREFIX}/lib/java/maven
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/share/doc/java/maven
diff --git a/devel/apache-maven/PLIST b/devel/apache-maven/PLIST
index 7bbf5a33e81..d6b0edee3b4 100644
--- a/devel/apache-maven/PLIST
+++ b/devel/apache-maven/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2014/05/15 11:17:29 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/12/09 11:43:40 fhajny Exp $
 bin/mvn
 lib/java/maven/aether-api-0.9.0.M2.jar
 lib/java/maven/aether-connector-wagon-0.9.0.M2.jar
@@ -43,5 +43,6 @@ lib/java/maven/wagon-provider-api-2.6.jar
 share/doc/java/maven/LICENSE
 share/doc/java/maven/NOTICE
 share/doc/java/maven/README.txt
+share/examples/maven/logging/simplelogger.properties
 share/examples/maven/m2.conf
 share/examples/maven/settings.xml
diff --git a/devel/apache-maven/distinfo b/devel/apache-maven/distinfo
index 6d89d060159..12a7d364c5a 100644
--- a/devel/apache-maven/distinfo
+++ b/devel/apache-maven/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2014/05/15 11:17:29 fhajny Exp $
+$NetBSD: distinfo,v 1.9 2014/12/09 11:43:40 fhajny Exp $
 
-SHA1 (apache-maven-3.2.1-bin.tar.gz) = 40e1bf0775fd3ebcac1dbeb61153b871b86b894f
-RMD160 (apache-maven-3.2.1-bin.tar.gz) = 4d79cdc8a8acb3ac70900a1822e45659b79884c7
-Size (apache-maven-3.2.1-bin.tar.gz) = 6927918 bytes
+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_mvn) = 72025874b63e904ba1c112cb3d461043ac93aba9
+SHA1 (patch-bin_mvn) = 3c70f0f6b50df1e001945155e08b9d8b90319955
diff --git a/devel/apache-maven/patches/patch-bin_mvn b/devel/apache-maven/patches/patch-bin_mvn
index 586a09de4a2..18f6c4a4c84 100644
--- a/devel/apache-maven/patches/patch-bin_mvn
+++ b/devel/apache-maven/patches/patch-bin_mvn
@@ -1,4 +1,4 @@
-$NetBSD: patch-bin_mvn,v 1.2 2013/05/18 05:37:03 markd Exp $
+$NetBSD: patch-bin_mvn,v 1.3 2014/12/09 11:43:40 fhajny Exp $
 
 Follow pkgsrc path convention.
 
@@ -9,7 +9,7 @@ Follow pkgsrc path convention.
  fi
  
 +if [ "$JAVA_HOME" = "" ] ; then
-+  JAVA_HOME=@JAVA_HOME@
++  JAVA_HOME=@PKG_JAVA_HOME@
 +fi
 +
 +if [ "$M2_HOME" = "" ] ; then
@@ -27,10 +27,10 @@ Follow pkgsrc path convention.
 -  -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
 -  "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
 +  -classpath "${M2_HOME}"/lib/java/maven/boot/plexus-classworlds-*.jar \
-+  "-Dclassworlds.conf=@SYSCONFDIR@/m2.conf" \
++  "-Dclassworlds.conf=@PKG_SYSCONFDIR@/m2.conf" \
    "-Dmaven.home=${M2_HOME}"  \
 -  ${CLASSWORLDS_LAUNCHER} "$@"
 \ No newline at end of file
-+  "-Dorg.apache.maven.global-settings=@SYSCONFDIR@/settings.xml" \
-+  "-Dorg.apache.maven.global-plugin-registry=@SYSCONFDIR@/plugin-registry.xml" \
++  "-Dorg.apache.maven.global-settings=@PKG_SYSCONFDIR@/settings.xml" \
++  "-Dorg.apache.maven.global-plugin-registry=@PKG_SYSCONFDIR@/plugin-registry.xml" \
 +  ${CLASSWORLDS_LAUNCHER} "$@"