Date: Fri, 9 Jul 2004 11:20:32 GMT From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/68769: [PATCH] devel/maven: update to 1.0.r4 and MASTER_SITE_APACHE Message-ID: <200407091120.i69BKWAr039171@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/68769; it has been noted by GNATS.
From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
To: Rui Lopes <rui@ruilopes.com>
Cc: Volker Stolz <vs@freebsd.org>, freebsd-gnats-submit@freebsd.org
Subject: Re: ports/68769: [PATCH] devel/maven: update to 1.0.r4 and MASTER_SITE_APACHE
Date: Fri, 9 Jul 2004 13:17:49 +0200
--gBBFr7Ir9EOA20Yy
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi Rui and Volker,
Here is the final patch with:
- Modification Rui asked for (keep post-configure target)
- Removed some arguments to ${FIND} that were deprecated with this
release of Maven
- Dynamic pkg-plist (hence I removed the maintainer target)
So now the port portlints fine.
Herve
--gBBFr7Ir9EOA20Yy
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="maven-1.0.r4.patch"
--- maven-1.0.r4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/maven.original/Makefile /usr/ports/devel/maven/Makefile
--- /usr/ports/devel/maven.original/Makefile Wed Jul 7 15:35:39 2004
+++ /usr/ports/devel/maven/Makefile Fri Jul 9 13:09:41 2004
@@ -6,11 +6,11 @@
#
PORTNAME= maven
-PORTVERSION= 1.0.r2
+PORTVERSION= 1.0.r4
CATEGORIES= devel java
-MASTER_SITES= http://nagoya.apache.org/mirror/%SUBDIR%/binaries/
-MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}-1.0-rc2
+MASTER_SITES= ${MASTER_SITE_APACHE}
+MASTER_SITE_SUBDIR= ${PORTNAME}/binaries
+DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/}
MAINTAINER= rui@ruilopes.com
COMMENT= Java project management and project comprehension tool
@@ -19,32 +19,34 @@
USE_JAVA= yes
JAVA_VERSION= 1.3+
NO_BUILD= YES
-DIR= share/java/maven
-PLIST_SUB= DIR=${DIR}
+DATADIR= ${JAVASHAREDIR}/${PORTNAME}
PKGMESSAGE= ${WRKDIR}/pkg-message
+PLIST_FILES= bin/maven
+PLIST= ${WRKDIR}/pkg-plist
+
+post-extract:
+ @( ${FIND} ${WRKSRC} -not -name '*.bat' -type f \
+ | ${SORT} | ${SED} 's|^${WRKSRC}|%%DATADIR%%|' && \
+ ${FIND} ${WRKSRC} -type d \
+ | ${SORT} -r | ${SED} 's|^${WRKSRC}|@dirrm %%DATADIR%%|' ) >${PLIST}
post-configure:
- @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
- -e 's,%%DIR%%,${DIR},g' pkg-message > ${PKGMESSAGE}
+ @${SED} -e 's,%%DATADIR%%,${DATADIR},g' pkg-message > ${PKGMESSAGE}
do-install:
- @cd ${WRKSRC} && ${FIND} . \! -name '*.bat' \! -name repository \
- | ${CPIO} -pduv -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${DIR}
- ${CHMOD} -R ${LIBMODE} ${PREFIX}/${DIR}
- ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/${DIR}/bin
- ${CHMOD} -R ${BINMODE} ${PREFIX}/${DIR}/bin
- ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${DIR}/bin/*.conf
- ${CHMOD} ${SHAREMODE} ${PREFIX}/${DIR}/bin/*.conf
- ${FIND} ${PREFIX}/${DIR} -type d | ${XARGS} ${CHMOD} +rx
- ${LN} -fs ${PREFIX}/${DIR}/bin/maven ${PREFIX}/bin
+ @cd ${WRKSRC} && ${FIND} . -not -name '*.bat' \
+ | ${CPIO} -pduv -R ${LIBOWN}:${LIBGRP} ${DATADIR}
+ ${CHMOD} -R ${LIBMODE} ${DATADIR}
+ ${CHOWN} -R ${BINOWN}:${BINGRP} ${DATADIR}/bin
+ ${CHMOD} -R ${BINMODE} ${DATADIR}/bin
+ ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DATADIR}/bin/*.conf
+ ${CHMOD} ${SHAREMODE} ${DATADIR}/bin/*.conf
+ ${FIND} ${DATADIR} -type d | ${XARGS} ${CHMOD} +rx
+ ${LN} -fs ${DATADIR}/bin/maven ${PREFIX}/bin
post-install:
.if !defined(BATCH)
@${CAT} ${PKGMESSAGE}
.endif
-
-# This target is only meant to be used by the port maintainer.
-x-generate-plist:
- (/usr/ports/Tools/scripts/plist -d -m /etc/mtree/BSD.local.dist ${PREFIX}|sed -E 's,^share/nls/.+$$,,g;s,${DIR},%%DIR%%,g'|tr -s '\n') > temp-pkg-plist
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/devel/maven.original/distinfo /usr/ports/devel/maven/distinfo
--- /usr/ports/devel/maven.original/distinfo Wed Jul 7 15:35:39 2004
+++ /usr/ports/devel/maven/distinfo Wed Jul 7 15:41:18 2004
@@ -1,2 +1,2 @@
-MD5 (maven-1.0-rc2.tar.bz2) = 07cf754e8287a0390fee40672f9f974b
-SIZE (maven-1.0-rc2.tar.bz2) = 5599243
+MD5 (maven-1.0-rc4.tar.bz2) = 5d075ef832a27b55bf5c3760fbff788f
+SIZE (maven-1.0-rc4.tar.bz2) = 5879403
diff -ruN --exclude=CVS /usr/ports/devel/maven.original/pkg-message /usr/ports/devel/maven/pkg-message
--- /usr/ports/devel/maven.original/pkg-message Wed Jul 7 15:35:39 2004
+++ /usr/ports/devel/maven/pkg-message Wed Jul 7 16:14:43 2004
@@ -3,10 +3,10 @@
* JAVA_HOME
Set it to the base directory of your java installation.
* MAVEN_HOME
- Set it to ``%%PREFIX%%/%%DIR%%''.
+ Set it to ``%%DATADIR%%''.
Then, you should initialize your repository with:
- %%PREFIX%%/%%DIR%%/bin/install_repo.sh ~/.maven/repository
+ %%DATADIR%%/bin/install_repo.sh ~/.maven/repository
If you are behind a proxy, create a ~/.mavenrc file with something like:
MAVEN_OPTS="$MAVEN_OPTS -Dmaven.proxy.host=YOUR_PROXY_HOSTNAME
diff -ruN --exclude=CVS /usr/ports/devel/maven.original/pkg-plist /usr/ports/devel/maven/pkg-plist
--- /usr/ports/devel/maven.original/pkg-plist Wed Jul 7 15:35:39 2004
+++ /usr/ports/devel/maven/pkg-plist Thu Jan 1 01:00:00 1970
@@ -1,120 +0,0 @@
-bin/maven
-%%DIR%%/bin/forehead.conf
-%%DIR%%/bin/install_repo.sh
-%%DIR%%/bin/maven
-%%DIR%%/lib/ant-1.5.3-1.jar
-%%DIR%%/lib/ant-optional-1.5.3-1.jar
-%%DIR%%/lib/commons-beanutils-1.6.1.jar
-%%DIR%%/lib/commons-betwixt-1.0-beta-1.20030111.103454.jar
-%%DIR%%/lib/commons-cli-1.0-beta-2.jar
-%%DIR%%/lib/commons-collections-2.1.jar
-%%DIR%%/lib/commons-digester-1.4.1.jar
-%%DIR%%/lib/commons-grant-1.0-beta-4.jar
-%%DIR%%/lib/commons-graph-0.8.1.jar
-%%DIR%%/lib/commons-io-20030203.000550.jar
-%%DIR%%/lib/commons-jelly-20030902.160215.jar
-%%DIR%%/lib/commons-jelly-tags-ant-20030625.032346.jar
-%%DIR%%/lib/commons-jelly-tags-define-20030211.142932.jar
-%%DIR%%/lib/commons-jelly-tags-util-20030211.141939.jar
-%%DIR%%/lib/commons-jexl-1.0-beta-1.jar
-%%DIR%%/lib/commons-lang-2.0.jar
-%%DIR%%/lib/commons-logging-1.0.3.jar
-%%DIR%%/lib/dom4j-1.4-dev-8.jar
-%%DIR%%/lib/endorsed/xerces-2.4.0.jar
-%%DIR%%/lib/endorsed/xml-apis-1.0.b2.jar
-%%DIR%%/lib/forehead-1.0-beta-5.jar
-%%DIR%%/lib/log4j-1.2.8.jar
-%%DIR%%/lib/maven.jar
-%%DIR%%/lib/plexus-0.6.jar
-%%DIR%%/lib/werkz-20040114.081319.jar
-%%DIR%%/lib/which-1.0.jar
-%%DIR%%/maven-navigation-1.0.xsd
-%%DIR%%/maven-project.xsd
-%%DIR%%/plugins/maven-announcement-plugin-1.0.jar
-%%DIR%%/plugins/maven-ant-plugin-1.6.jar
-%%DIR%%/plugins/maven-antlr-plugin-1.1.jar
-%%DIR%%/plugins/maven-appserver-plugin-2.0.jar
-%%DIR%%/plugins/maven-artifact-plugin-1.1.jar
-%%DIR%%/plugins/maven-ashkelon-plugin-1.1.jar
-%%DIR%%/plugins/maven-aspectj-plugin-2.0.jar
-%%DIR%%/plugins/maven-aspectwerkz-plugin-1.1.jar
-%%DIR%%/plugins/maven-caller-plugin-1.0.jar
-%%DIR%%/plugins/maven-castor-plugin-1.1.jar
-%%DIR%%/plugins/maven-changelog-plugin-1.4.jar
-%%DIR%%/plugins/maven-changes-plugin-1.3.jar
-%%DIR%%/plugins/maven-checkstyle-plugin-2.3.jar
-%%DIR%%/plugins/maven-clean-plugin-1.1.jar
-%%DIR%%/plugins/maven-clover-plugin-1.4.jar
-%%DIR%%/plugins/maven-codeswitcher-plugin-1.1.jar
-%%DIR%%/plugins/maven-console-plugin-1.0.jar
-%%DIR%%/plugins/maven-cruisecontrol-plugin-1.1.jar
-%%DIR%%/plugins/maven-dashboard-plugin-1.2.jar
-%%DIR%%/plugins/maven-deploy-plugin-1.2.jar
-%%DIR%%/plugins/maven-developer-activity-plugin-1.4.jar
-%%DIR%%/plugins/maven-dist-plugin-1.4.jar
-%%DIR%%/plugins/maven-docbook-plugin-1.1.jar
-%%DIR%%/plugins/maven-ear-plugin-1.4.jar
-%%DIR%%/plugins/maven-eclipse-plugin-1.6.jar
-%%DIR%%/plugins/maven-ejb-plugin-1.3.jar
-%%DIR%%/plugins/maven-faq-plugin-1.2.jar
-%%DIR%%/plugins/maven-file-activity-plugin-1.4.jar
-%%DIR%%/plugins/maven-genapp-plugin-2.1.jar
-%%DIR%%/plugins/maven-gump-plugin-1.2.jar
-%%DIR%%/plugins/maven-hibernate-plugin-1.0.jar
-%%DIR%%/plugins/maven-html2xdoc-plugin-1.2.jar
-%%DIR%%/plugins/maven-idea-plugin-1.3.jar
-%%DIR%%/plugins/maven-j2ee-plugin-1.4.jar
-%%DIR%%/plugins/maven-jalopy-plugin-1.1.jar
-%%DIR%%/plugins/maven-jar-plugin-1.4.jar
-%%DIR%%/plugins/maven-java-plugin-1.3.jar
-%%DIR%%/plugins/maven-javacc-plugin-1.0.jar
-%%DIR%%/plugins/maven-javadoc-plugin-1.4.jar
-%%DIR%%/plugins/maven-jboss-plugin-1.4.jar
-%%DIR%%/plugins/maven-jbuilder-plugin-1.4.jar
-%%DIR%%/plugins/maven-jcoverage-plugin-1.0.3.jar
-%%DIR%%/plugins/maven-jdee-plugin-1.0.jar
-%%DIR%%/plugins/maven-jdepend-plugin-1.4.jar
-%%DIR%%/plugins/maven-jdeveloper-plugin-1.3.jar
-%%DIR%%/plugins/maven-jdiff-plugin-1.2.jar
-%%DIR%%/plugins/maven-jellydoc-plugin-1.2.jar
-%%DIR%%/plugins/maven-jetty-plugin-1.0.jar
-%%DIR%%/plugins/maven-jira-plugin-1.0.jar
-%%DIR%%/plugins/maven-jnlp-plugin-1.3.jar
-%%DIR%%/plugins/maven-junit-doclet-plugin-1.1.jar
-%%DIR%%/plugins/maven-junit-report-plugin-1.5.jar
-%%DIR%%/plugins/maven-jxr-plugin-1.3.jar
-%%DIR%%/plugins/maven-latex-plugin-1.1.jar
-%%DIR%%/plugins/maven-latka-plugin-1.3.jar
-%%DIR%%/plugins/maven-license-plugin-1.1.jar
-%%DIR%%/plugins/maven-linkcheck-plugin-1.2.jar
-%%DIR%%/plugins/maven-multichanges-plugin-1.0.jar
-%%DIR%%/plugins/maven-multiproject-plugin-1.2.jar
-%%DIR%%/plugins/maven-native-plugin-1.0.jar
-%%DIR%%/plugins/maven-nsis-plugin-1.0.jar
-%%DIR%%/plugins/maven-pdf-plugin-2.0.jar
-%%DIR%%/plugins/maven-perforce-plugin-1.1.jar
-%%DIR%%/plugins/maven-plugin-plugin-1.3.jar
-%%DIR%%/plugins/maven-pmd-plugin-1.3.jar
-%%DIR%%/plugins/maven-pom-plugin-1.3.jar
-%%DIR%%/plugins/maven-release-plugin-1.2.jar
-%%DIR%%/plugins/maven-repository-plugin-1.1.jar
-%%DIR%%/plugins/maven-scm-plugin-1.2.jar
-%%DIR%%/plugins/maven-shell-plugin-1.1.jar
-%%DIR%%/plugins/maven-simian-plugin-1.3.jar
-%%DIR%%/plugins/maven-site-plugin-1.5.jar
-%%DIR%%/plugins/maven-statcvs-plugin-2.1.jar
-%%DIR%%/plugins/maven-struts-plugin-1.2.jar
-%%DIR%%/plugins/maven-tasklist-plugin-2.3.jar
-%%DIR%%/plugins/maven-test-plugin-1.5.jar
-%%DIR%%/plugins/maven-tjdo-plugin-1.0.0.jar
-%%DIR%%/plugins/maven-uberjar-plugin-1.1.jar
-%%DIR%%/plugins/maven-vdoclet-plugin-1.1.jar
-%%DIR%%/plugins/maven-war-plugin-1.5.jar
-%%DIR%%/plugins/maven-webserver-plugin-2.0.jar
-%%DIR%%/plugins/maven-wizard-plugin-1.0.jar
-%%DIR%%/plugins/maven-xdoc-plugin-1.6.jar
-@dirrm %%DIR%%/plugins
-@dirrm %%DIR%%/lib/endorsed
-@dirrm %%DIR%%/lib
-@dirrm %%DIR%%/bin
-@dirrm %%DIR%%
--- maven-1.0.r4.patch ends here ---
--gBBFr7Ir9EOA20Yy--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407091120.i69BKWAr039171>