kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix case when PKG_SYSCONFBASE != ${PREFIX}/etc

Browse source
This commit is contained in:
markd 2013-05-18 05:37:03 +00:00
parent 501c695bda
commit fe4f551edc
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/apache-maven/Makefile
View file

@ -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 DISTNAME= apache-maven-3.0.5
@ -21,6 +21,7 @@ SUBST_FILES.maven= bin/mvn
SUBST_STAGE.maven= pre-configure SUBST_STAGE.maven= pre-configure
SUBST_SED.maven= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' SUBST_SED.maven= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
SUBST_SED.maven+= -e 's,@PREFIX@,${PREFIX},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= bin etc/maven lib/java/maven lib/java/maven/boot
INSTALLATION_DIRS+= share/doc/java/maven share/examples/maven INSTALLATION_DIRS+= share/doc/java/maven share/examples/maven

4
devel/apache-maven/distinfo
View file

@ -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 SHA1 (apache-maven-3.0.5-bin.tar.gz) = aecc0d3d67732939c0056d4a0d8510483ee1167e
RMD160 (apache-maven-3.0.5-bin.tar.gz) = 05b877ea0f1880ad62b48a436658ba70cce94b73 RMD160 (apache-maven-3.0.5-bin.tar.gz) = 05b877ea0f1880ad62b48a436658ba70cce94b73
Size (apache-maven-3.0.5-bin.tar.gz) = 5144659 bytes Size (apache-maven-3.0.5-bin.tar.gz) = 5144659 bytes
SHA1 (patch-bin_m2.conf) = e0d2d7442fd86e539d73c1cdb6449d9c8b412122 SHA1 (patch-bin_m2.conf) = e0d2d7442fd86e539d73c1cdb6449d9c8b412122
SHA1 (patch-bin_mvn) = 1b14289cfc53b0fd6f9a2a85b0d26bcdbb8f56b2 SHA1 (patch-bin_mvn) = 72025874b63e904ba1c112cb3d461043ac93aba9

8
devel/apache-maven/patches/patch-bin_mvn
View file

@ -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. Follow pkgsrc path convention.
@ -27,10 +27,10 @@ Follow pkgsrc path convention.
- -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \ - -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
- "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ - "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
+ -classpath "${M2_HOME}"/lib/java/maven/boot/plexus-classworlds-*.jar \ + -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}" \ "-Dmaven.home=${M2_HOME}" \
- ${CLASSWORLDS_LAUNCHER} "$@" - ${CLASSWORLDS_LAUNCHER} "$@"
\ No newline at end of file \ No newline at end of file
+ "-Dorg.apache.maven.global-settings=${M2_HOME}/etc/maven/settings.xml" \ + "-Dorg.apache.maven.global-settings=@SYSCONFDIR@/settings.xml" \
+ "-Dorg.apache.maven.global-plugin-registry=${M2_HOME}/etc/maven/plugin-registry.xml" \ + "-Dorg.apache.maven.global-plugin-registry=@SYSCONFDIR@/plugin-registry.xml" \
+ ${CLASSWORLDS_LAUNCHER} "$@" + ${CLASSWORLDS_LAUNCHER} "$@"