diff options
| author | markd <markd@pkgsrc.org> | 2013-05-18 05:37:03 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2013-05-18 05:37:03 +0000 |
| commit | e7080a77380d9b04b8de06bc1ea9148667596500 (patch) | |
| tree | 67764bc6a2b851998688af45736a543928353093 /devel | |
| parent | 36ff30336dbfa0d42455683141705aac8a823a8c (diff) | |
| download | pkgsrc-e7080a77380d9b04b8de06bc1ea9148667596500.tar.gz | |
Fix case when PKG_SYSCONFBASE != ${PREFIX}/etc
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/apache-maven/Makefile | 3 | ||||
| -rw-r--r-- | devel/apache-maven/distinfo | 4 | ||||
| -rw-r--r-- | devel/apache-maven/patches/patch-bin_mvn | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/devel/apache-maven/Makefile b/devel/apache-maven/Makefile index 666742707f1..a989a5ef6b3 100644 --- a/devel/apache-maven/Makefile +++ b/devel/apache-maven/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/03/03 16:53:42 yyamano Exp $ +# $NetBSD: Makefile,v 1.8 2013/05/18 05:37:03 markd Exp $ # DISTNAME= apache-maven-3.0.5 @@ -21,6 +21,7 @@ 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' INSTALLATION_DIRS= bin etc/maven lib/java/maven lib/java/maven/boot INSTALLATION_DIRS+= share/doc/java/maven share/examples/maven diff --git a/devel/apache-maven/distinfo b/devel/apache-maven/distinfo index 90f6871a198..52c6cf4e6d5 100644 --- a/devel/apache-maven/distinfo +++ b/devel/apache-maven/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2013/03/03 16:53:42 yyamano Exp $ +$NetBSD: distinfo,v 1.7 2013/05/18 05:37:03 markd Exp $ SHA1 (apache-maven-3.0.5-bin.tar.gz) = aecc0d3d67732939c0056d4a0d8510483ee1167e RMD160 (apache-maven-3.0.5-bin.tar.gz) = 05b877ea0f1880ad62b48a436658ba70cce94b73 Size (apache-maven-3.0.5-bin.tar.gz) = 5144659 bytes SHA1 (patch-bin_m2.conf) = e0d2d7442fd86e539d73c1cdb6449d9c8b412122 -SHA1 (patch-bin_mvn) = 1b14289cfc53b0fd6f9a2a85b0d26bcdbb8f56b2 +SHA1 (patch-bin_mvn) = 72025874b63e904ba1c112cb3d461043ac93aba9 diff --git a/devel/apache-maven/patches/patch-bin_mvn b/devel/apache-maven/patches/patch-bin_mvn index 5f26b136d5e..586a09de4a2 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.1 2013/03/03 16:53:42 yyamano Exp $ +$NetBSD: patch-bin_mvn,v 1.2 2013/05/18 05:37:03 markd Exp $ Follow pkgsrc path convention. @@ -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=${M2_HOME}/etc/maven/m2.conf" \ ++ "-Dclassworlds.conf=@SYSCONFDIR@/m2.conf" \ "-Dmaven.home=${M2_HOME}" \ - ${CLASSWORLDS_LAUNCHER} "$@" \ No newline at end of file -+ "-Dorg.apache.maven.global-settings=${M2_HOME}/etc/maven/settings.xml" \ -+ "-Dorg.apache.maven.global-plugin-registry=${M2_HOME}/etc/maven/plugin-registry.xml" \ ++ "-Dorg.apache.maven.global-settings=@SYSCONFDIR@/settings.xml" \ ++ "-Dorg.apache.maven.global-plugin-registry=@SYSCONFDIR@/plugin-registry.xml" \ + ${CLASSWORLDS_LAUNCHER} "$@" |