Date: Sun, 18 Jul 2004 18:30:25 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: <200407181830.i6IIUPGv074849@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 <stolz@i2.informatik.rwth-aachen.de>,
freebsd-gnats-submit@freebsd.org
Subject: Re: ports/68769: [PATCH] devel/maven: update to 1.0.r4 and MASTER_SITE_APACHE
Date: Sun, 18 Jul 2004 20:28:15 +0200
--mYCpIKhGyMATD0i+
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Rui,
On Sat, Jul 17, 2004 at 10:36:37PM +0100, Rui Lopes wrote:
> See the attached patch, it contains all "fixes" from the discussion
> and updates Maven to 1.0 final. If you are agree with it, lets have
> this commited.
I agree with it, excepted for some small problem I noticed. The
following statement will not perform what you intend it to do:
.for file in ${WRKSRC}/${dir}/*.jar
<...>
.endfor
The star (*) is a shell wildcard and make will not expand it. Actually
here's the output I get:
/bin/mkdir -p /usr/local/share/java/maven/lib
install -o root -g wheel -m 444
/usr/ports/devel/maven/work/maven-1.0//lib/*.jar /usr/local/share/java/maven/lib
/bin/mkdir -p /usr/local/share/java/maven/lib/endorsed
install -o root -g wheel -m 444
/usr/ports/devel/maven/work/maven-1.0//lib/endorsed/*.jar /usr/local/share/java/maven/lib/endorsed
/bin/mkdir -p /usr/local/share/java/maven/plugins
install -o root -g wheel -m 444
/usr/ports/devel/maven/work/maven-1.0//plugins/*.jar /usr/local/share/java/maven/plugins
IMHO you may remove the nested loop by using the wildcard directly (just
as it performs with your patch). I attached a patch (to be applied
against Makefile from 1.0.r2).
Herve.
--mYCpIKhGyMATD0i+
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="maven.diff"
--- Makefile.orig Wed Jul 7 15:35:39 2004
+++ Makefile Sun Jul 18 20:20:43 2004
@@ -6,11 +6,10 @@
#
PORTNAME= maven
-PORTVERSION= 1.0.r2
+PORTVERSION= 1.0
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
MAINTAINER= rui@ruilopes.com
COMMENT= Java project management and project comprehension tool
@@ -19,24 +18,26 @@
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
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}
+BINFILES= install_repo.sh maven
+DIRECTORIES= lib lib/endorsed plugins
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
+ ${MKDIR} ${DATADIR}/bin
+.for file in ${BINFILES}
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${DATADIR}/bin
+.endfor
+ ${LN} -fs ${DATADIR}/bin/maven ${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/bin/forehead.conf ${DATADIR}/bin
+ ${INSTALL_DATA} ${WRKSRC}/*.xsd ${DATADIR}
+.for dir in ${DIRECTORIES}
+ ${MKDIR} ${DATADIR}/${dir}
+ ${INSTALL_DATA} ${WRKSRC}/${dir}/*.jar ${DATADIR}/${dir}
+.endfor
post-install:
.if !defined(BATCH)
@@ -45,6 +46,6 @@
# 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
+ (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${SED} -E 's,.*share/nls/.+$$,,g;s,${DATADIR:S,^${PREFIX}/,,},%%DATADIR%%,g'|${TR} -s '\n') > temp-pkg-plist
.include <bsd.port.mk>
--mYCpIKhGyMATD0i+--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407181830.i6IIUPGv074849>