From nobody@FreeBSD.org  Sun Apr 18 04:42:22 2004
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9728616A4CE
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 18 Apr 2004 04:42:22 -0700 (PDT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8D42443D66
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 18 Apr 2004 04:42:22 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.10/8.12.10) with ESMTP id i3IBgM72089920
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 18 Apr 2004 04:42:22 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.10/8.12.10/Submit) id i3IBgLRb089919;
	Sun, 18 Apr 2004 04:42:21 -0700 (PDT)
	(envelope-from nobody)
Message-Id: <200404181142.i3IBgLRb089919@www.freebsd.org>
Date: Sun, 18 Apr 2004 04:42:21 -0700 (PDT)
From: Kang Liu <liukang@bjpu.edu.cn>
To: freebsd-gnats-submit@FreeBSD.org
Cc: <rui@ruilopes.com>
Subject: [patch]update devel/maven to 1.0-rc2
X-Send-Pr-Version: www-2.3

>Number:         65703
>Category:       ports
>Synopsis:       [patch]update devel/maven to 1.0-rc2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 18 04:50:15 PDT 2004
>Closed-Date:    Thu May 06 14:28:18 PDT 2004
>Last-Modified:  Thu May 06 14:28:18 PDT 2004
>Originator:     Kang Liu
>Release:        4.9
>Organization:
Beijing University of Technology
>Environment:
4.9-STABLE FreeBSD
>Description:
1. Update maven to 1.0-rc2
2. Set USE_BZIP2=yes
3. Convert to bsd.java.mk 2.0 macros
4. Use alternative path in pkg-message
>How-To-Repeat:
n/a
>Fix:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/maven/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	31 Mar 2004 03:07:02 -0000	1.2
+++ distinfo	18 Apr 2004 11:22:32 -0000
@@ -1,2 +1,2 @@
-MD5 (maven-1.0-rc1.tar.gz) = 7f5e787ff3b930d906d01243ccf7c237
-SIZE (maven-1.0-rc1.tar.gz) = 4867912
+MD5 (maven-1.0-rc2.tar.bz2) = 07cf754e8287a0390fee40672f9f974b
+SIZE (maven-1.0-rc2.tar.bz2) = 5599243
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/maven/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	4 Feb 2004 05:19:43 -0000	1.4
+++ Makefile	18 Apr 2004 11:22:32 -0000
@@ -6,20 +6,27 @@
 #
 
 PORTNAME=	maven
-PORTVERSION=	1.0.r1
-PORTREVISION=	1
+PORTVERSION=	1.0.r2
 CATEGORIES=	devel java
 MASTER_SITES=	http://nagoya.apache.org/mirror/%SUBDIR%/binaries/
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-1.0-rc1
+DISTNAME=	${PORTNAME}-1.0-rc2
 
 MAINTAINER=	rui@ruilopes.com
 COMMENT=	Java project management and project comprehension tool
 
-USE_JAVA=	1.3+
+USE_BZIP2=	yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 NO_BUILD=	YES
 DIR=		share/java/maven
 PLIST_SUB=	DIR=${DIR}
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+post-configure:
+	@ ${SED} \
+	-e 's#%%PREFIX%%#${PREFIX}#g' \
+	-e 's#%%DIR%%#${DIR}#g' pkg-message > ${PKGMESSAGE}
 
 do-install:
 	@cd ${WRKSRC} && ${FIND} . \! -name '*.bat' \! -name repository \
@@ -31,7 +38,11 @@
 	${CHMOD} ${SHAREMODE} ${PREFIX}/${DIR}/bin/*.conf
 	${FIND} ${PREFIX}/${DIR} -type d | ${XARGS} ${CHMOD} +rx
 	${LN} -fs ${PREFIX}/${DIR}/bin/maven ${PREFIX}/bin
-	@${CAT} ${PKGDIR}/pkg-message
+
+post-install:
+.if !defined(BATCH)
+	@ ${CAT} ${PKGMESSAGE}
+.endif
 
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
Index: pkg-message
===================================================================
RCS file: /home/ncvs/ports/devel/maven/pkg-message,v
retrieving revision 1.2
diff -u -r1.2 pkg-message
--- pkg-message	21 Oct 2003 21:33:19 -0000	1.2
+++ pkg-message	18 Apr 2004 11:22:32 -0000
@@ -3,10 +3,10 @@
   * JAVA_HOME
     Set it to the base directory of your java installation.
   * MAVEN_HOME
-    Set it to ``/usr/local/share/java/maven''.
+    Set it to %%PREFIX%%/%%DIR%%.
 
 Then, you should initialize your repository with:
-  /usr/local/share/java/maven/bin/install_repo.sh ~/.maven/repository
+  %%PREFIX%%/%%DIR%%/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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/maven/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	21 Oct 2003 20:49:20 -0000	1.1
+++ pkg-plist	18 Apr 2004 11:22:32 -0000
@@ -17,8 +17,8 @@
 %%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-1.0-b1.1.jar
-%%DIR%%/lib/commons-logging-1.0.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
@@ -26,92 +26,93 @@
 %%DIR%%/lib/log4j-1.2.8.jar
 %%DIR%%/lib/maven.jar
 %%DIR%%/lib/plexus-0.6.jar
-%%DIR%%/lib/werkz-1.0-beta-10.jar
+%%DIR%%/lib/werkz-20040114.081319.jar
 %%DIR%%/lib/which-1.0.jar
-%%DIR%%/lib/xpp3-1.1.2a.jar
+%%DIR%%/maven-navigation-1.0.xsd
 %%DIR%%/maven-project.xsd
-%%DIR%%/plugins/maven-ant-plugin-1.4.jar
+%%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-dev.jar
-%%DIR%%/plugins/maven-artifact-plugin-1.0.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-cactus-plugin-3.1.jar
-%%DIR%%/plugins/maven-castor-plugin-1.0.jar
-%%DIR%%/plugins/maven-changelog-plugin-1.3.jar
-%%DIR%%/plugins/maven-changes-plugin-1.2.jar
-%%DIR%%/plugins/maven-checkstyle-plugin-2.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.2.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.0.jar
-%%DIR%%/plugins/maven-deploy-plugin-1.1.jar
-%%DIR%%/plugins/maven-developer-activity-plugin-1.3.jar
-%%DIR%%/plugins/maven-dist-plugin-1.3.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.2.jar
-%%DIR%%/plugins/maven-eclipse-plugin-1.4.jar
-%%DIR%%/plugins/maven-ejb-plugin-1.1.jar
-%%DIR%%/plugins/maven-faq-plugin-1.1.jar
-%%DIR%%/plugins/maven-file-activity-plugin-1.3.jar
-%%DIR%%/plugins/maven-genapp-plugin-2.0.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-SNAPHOT.jar
-%%DIR%%/plugins/maven-html2xdoc-plugin-1.1.jar
-%%DIR%%/plugins/maven-idea-plugin-1.2.jar
-%%DIR%%/plugins/maven-j2ee-plugin-1.3.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.3.jar
+%%DIR%%/plugins/maven-jar-plugin-1.4.jar
 %%DIR%%/plugins/maven-java-plugin-1.3.jar
-%%DIR%%/plugins/maven-javadoc-plugin-1.3.jar
-%%DIR%%/plugins/maven-jboss-plugin-1.3.jar
-%%DIR%%/plugins/maven-jbuilder-plugin-1.3.jar
-%%DIR%%/plugins/maven-jcoverage-plugin-1.0.1.jar
-%%DIR%%/plugins/maven-jdee-plugin-1.0-beta-1.jar
-%%DIR%%/plugins/maven-jdepend-plugin-1.3.jar
-%%DIR%%/plugins/maven-jdeveloper-plugin-1.2.jar
-%%DIR%%/plugins/maven-jellydoc-plugin-1.1.jar
-%%DIR%%/plugins/maven-jnlp-plugin-1.2.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.3.jar
-%%DIR%%/plugins/maven-jxr-plugin-1.2.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.1.jar
-%%DIR%%/plugins/maven-multiproject-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-pdf-plugin-1.2.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-plexus-plugin-0.3.jar
-%%DIR%%/plugins/maven-plugin-plugin-1.1.jar
-%%DIR%%/plugins/maven-pmd-plugin-1.2.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.1.jar
-%%DIR%%/plugins/maven-repository-plugin-1.0.jar
-%%DIR%%/plugins/maven-runner-plugin-0.3.jar
-%%DIR%%/plugins/maven-scm-plugin-1.1.jar
-%%DIR%%/plugins/maven-sea-plugin-1.0.jar
-%%DIR%%/plugins/maven-shell-plugin-1.0.jar
-%%DIR%%/plugins/maven-simian-plugin-1.2.jar
-%%DIR%%/plugins/maven-site-plugin-1.3.jar
-%%DIR%%/plugins/maven-statcvs-plugin-2.0.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-summit-plugin-1.1.jar
-%%DIR%%/plugins/maven-tasklist-plugin-2.2.jar
-%%DIR%%/plugins/maven-test-plugin-1.4.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-torque-plugin-3.2.jar
-%%DIR%%/plugins/maven-touchstone-partner-plugin-1.0.jar
-%%DIR%%/plugins/maven-touchstone-plugin-1.0.jar
 %%DIR%%/plugins/maven-uberjar-plugin-1.1.jar
 %%DIR%%/plugins/maven-vdoclet-plugin-1.1.jar
-%%DIR%%/plugins/maven-war-plugin-1.4.jar
-%%DIR%%/plugins/maven-was40-plugin-1.0.jar
-%%DIR%%/plugins/maven-webserver-plugin-2.0-dev.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-word2html-plugin-1.4.jar
-%%DIR%%/plugins/maven-xdoc-plugin-1.4.jar
+%%DIR%%/plugins/maven-xdoc-plugin-1.6.jar
 @dirrm %%DIR%%/plugins
 @dirrm %%DIR%%/lib/endorsed
 @dirrm %%DIR%%/lib

>Release-Note:
>Audit-Trail:

From: Rui Lopes <rui@ruilopes.com>
To: Kang Liu <liukang@bjpu.edu.cn>, freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/65703: [patch]update devel/maven to 1.0-rc2
Date: Mon, 19 Apr 2004 10:19:49 +0100

 --=-Pu/RhXRYWGMttXai5Q4x
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 
 Hi,
 
 Thanks for the update Kang!  I just made some minor style changes.
 
 Dear commiter, please apply the attached patch after the PR patch,
 thanks!
 
 
 Regards,
 Rui Lopes
 
 PS: Kang, next time don't forget to CC the maintainer too ;)
 
 --=-Pu/RhXRYWGMttXai5Q4x
 Content-Disposition: attachment; filename=maven_minor_minor_style_patch.patch
 Content-Type: text/x-patch; name=maven_minor_minor_style_patch.patch; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 
 diff -ru maven.orig.with.patch/Makefile maven/Makefile
 --- maven.orig.with.patch/Makefile	Mon Apr 19 09:50:16 2004
 +++ maven/Makefile	Mon Apr 19 09:21:08 2004
 @@ -24,9 +24,8 @@
  PKGMESSAGE=	${WRKDIR}/pkg-message
  
  post-configure:
 -	@ ${SED} \
 -	-e 's#%%PREFIX%%#${PREFIX}#g' \
 -	-e 's#%%DIR%%#${DIR}#g' pkg-message > ${PKGMESSAGE}
 +	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
 +		-e 's,%%DIR%%,${DIR},g' pkg-message > ${PKGMESSAGE}
  
  do-install:
  	@cd ${WRKSRC} && ${FIND} . \! -name '*.bat' \! -name repository \
 @@ -41,7 +40,7 @@
  
  post-install:
  .if !defined(BATCH)
 -	@ ${CAT} ${PKGMESSAGE}
 +	@${CAT} ${PKGMESSAGE}
  .endif
  
  # This target is only meant to be used by the port maintainer.
 diff -ru maven.orig.with.patch/pkg-message maven/pkg-message
 --- maven.orig.with.patch/pkg-message	Mon Apr 19 09:50:16 2004
 +++ maven/pkg-message	Mon Apr 19 09:31:36 2004
 @@ -3,7 +3,7 @@
    * JAVA_HOME
      Set it to the base directory of your java installation.
    * MAVEN_HOME
 -    Set it to %%PREFIX%%/%%DIR%%.
 +    Set it to ``%%PREFIX%%/%%DIR%%''.
  
  Then, you should initialize your repository with:
    %%PREFIX%%/%%DIR%%/bin/install_repo.sh ~/.maven/repository
 
 --=-Pu/RhXRYWGMttXai5Q4x--
 
State-Changed-From-To: open->closed 
State-Changed-By: thierry 
State-Changed-When: Thu May 6 14:27:01 PDT 2004 
State-Changed-Why:  

Committed, thanks! 


http://www.freebsd.org/cgi/query-pr.cgi?pr=65703 
>Unformatted:
