From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 29 00:20:09 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6949E1065674 for ; Wed, 29 Jun 2011 00:20:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4EE848FC17 for ; Wed, 29 Jun 2011 00:20:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p5T0K9cj069528 for ; Wed, 29 Jun 2011 00:20:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p5T0K8hK069527; Wed, 29 Jun 2011 00:20:09 GMT (envelope-from gnats) Date: Wed, 29 Jun 2011 00:20:09 GMT Message-Id: <201106290020.p5T0K8hK069527@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Guido Falsi Cc: Subject: Re: ports/158393: devel/monotone: upgrade to 1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Guido Falsi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2011 00:20:09 -0000 The following reply was made to PR ports/158393; it has been noted by GNATS. From: Guido Falsi To: bug-followup@FreeBSD.org, mad@madpilot.net, lapo@lapo.it Cc: Subject: Re: ports/158393: devel/monotone: upgrade to 1.0 Date: Wed, 29 Jun 2011 02:14:19 +0200 This is a multi-part message in MIME format. --------------000405020300060304020208 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Here is a revised patch which does not leave things around in the NOPORTDOCS and NO_INSTALL_MANPAGES cases. -- Guido Falsi --------------000405020300060304020208 Content-Type: text/plain; name="mtn.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="mtn.diff" diff -ruN monotone.old/Makefile monotone/Makefile --- monotone.old/Makefile 2011-06-29 02:10:51.204601454 +0200 +++ monotone/Makefile 2011-06-29 02:11:03.600767353 +0200 @@ -6,8 +6,7 @@ # PORTNAME= monotone -PORTVERSION= 0.99.1 -PORTREVISION= 1 +PORTVERSION= 1.0 CATEGORIES= devel MASTER_SITES= http://www.monotone.ca/downloads/${PORTVERSION}/ @@ -24,6 +23,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING SUB_FILES= pkg-message +USE_BZIP2= yes USE_PERL5_BUILD=yes USE_ICONV= yes USE_GMAKE= yes @@ -34,12 +34,29 @@ LDFLAGS="-L${LOCALBASE}/lib" \ MAKEINFO="makeinfo --no-split" -PLIST_FILES= bin/mtn bin/mtnopt share/zsh/site-functions/_mtn \ +PLIST_FILES= bin/mtn bin/mtn-cleanup bin/mtnopt \ + share/monotone/hooks/authorize_remote_automate.lua \ + share/monotone/hooks/get_passphrase_from_file.lua \ + share/monotone/hooks/monotone-buildbot.lua \ + share/monotone/hooks/monotone-ciabot.lua \ + share/monotone/hooks/monotone-cluster-push.lua \ + share/monotone/hooks/monotone-cvs-ignore.lua \ + share/monotone/hooks/monotone-mail-notify.lua \ + share/monotone/scripts/monotone-ciabot.py \ + share/monotone/scripts/monotone-mail-notify \ + etc/bash_completion.d/monotone.bash_completion \ + share/zsh/site-functions/_mtn \ "@unexec [ -f %D/bin/zsh ] || ${RMDIR} %D/share/zsh/site-functions 2>/dev/null || true" \ - "@dirrmtry share/zsh" + "@dirrmtry share/zsh" \ + "@dirrmtry etc/bash_completion.d" \ + "@dirrm share/monotone/hooks" \ + "@dirrm share/monotone/scripts" \ + "@dirrm share/monotone" .if !defined(NO_INSTALL_MANPAGES) INFO= monotone -MAN1= mtn.1 +MAN1= mtn.1 \ + mtn-cleanup.1 \ + mtnopt.1 .endif PORTDOCS= * @@ -54,7 +71,7 @@ .else USE_GETTEXT= yes PLIST_FILES+= share/locale/de/LC_MESSAGES/monotone.mo \ - share/locale/es/LC_MESSAGES/monotone.mo \ + share/locale/fr/LC_MESSAGES/monotone.mo \ share/locale/it/LC_MESSAGES/monotone.mo \ share/locale/pt/LC_MESSAGES/monotone.mo \ share/locale/sv/LC_MESSAGES/monotone.mo @@ -65,10 +82,12 @@ post-patch: .if defined(NOPORTDOCS) - ${REINPLACE_CMD} -Ee '/^install-data-am:/,/^$$/s/install-html(figure|image)?DATA //g' ${WRKSRC}/Makefile.in + ${REINPLACE_CMD} -Ee '/^install-(contrib|examples)-data:/{' -e 'n' -e 'd' -e '}' ${WRKSRC}/Makefile.in .endif .if defined(NO_INSTALL_MANPAGES) - ${REINPLACE_CMD} -Ee '/^install-data-am:/,/^$$/s/([[:space:]]*)install-(info-am|man)/\1/' ${WRKSRC}/Makefile.in + ${REINPLACE_CMD} -Ee '/^install-(info|man): /s/ install-.*$$//' ${WRKSRC}/Makefile.in + ${REINPLACE_CMD} -Ee '/^install-info: /s/ install-info-am$$//' \ + -e '/^install-data-am:/s/ install-info-am$$//' ${WRKSRC}/doc/Makefile.in .endif post-install: diff -ruN monotone.old/distinfo monotone/distinfo --- monotone.old/distinfo 2011-06-29 02:10:51.194591819 +0200 +++ monotone/distinfo 2011-06-29 02:11:03.600767353 +0200 @@ -1,2 +1,2 @@ -SHA256 (monotone-0.99.1.tar.gz) = 204ebb12f36599ac4c105ae5bf45edd7da13a4e57dc45f31789634fc8c2b30a1 -SIZE (monotone-0.99.1.tar.gz) = 4940291 +SHA256 (monotone-1.0.tar.bz2) = 5c530bc4652b2c08b5291659f0c130618a14780f075f981e947952dcaefc31dc +SIZE (monotone-1.0.tar.bz2) = 3588074 --------------000405020300060304020208--