From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jul 18 18:30:25 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8523E16A4CF for ; Sun, 18 Jul 2004 18:30:25 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68E9543D45 for ; Sun, 18 Jul 2004 18:30:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6IIUPfW074851 for ; Sun, 18 Jul 2004 18:30:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6IIUPGv074849; Sun, 18 Jul 2004 18:30:25 GMT (envelope-from gnats) Date: Sun, 18 Jul 2004 18:30:25 GMT Message-Id: <200407181830.i6IIUPGv074849@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Herve Quiroz Subject: Re: ports/68769: [PATCH] devel/maven: update to 1.0.r4 and MASTER_SITE_APACHE X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Herve Quiroz List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2004 18:30:25 -0000 The following reply was made to PR ports/68769; it has been noted by GNATS. From: Herve Quiroz To: Rui Lopes Cc: Volker Stolz , 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 --mYCpIKhGyMATD0i+--