Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Jun 2011 08:00:22 GMT
From:      Guido Falsi <mad@madpilot.net>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/158393: devel/monotone: upgrade to 1.0
Message-ID:  <201106290800.p5T80MHI022649@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/158393; it has been noted by GNATS.

From: Guido Falsi <mad@madpilot.net>
To: bug-followup@FreeBSD.org, Lapo Luchini <lapo@lapo.it>
Cc:  
Subject: Re: ports/158393: devel/monotone: upgrade to 1.0
Date: Wed, 29 Jun 2011 09:53:04 +0200

 --TybLhxa8M7aNoW+V
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Corrected a whitespace error. New patch following.
 
 -- 
 Guido Falsi <mad@madpilot.net>
 
 --TybLhxa8M7aNoW+V
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="mtn.diff"
 
 diff -ruN monotone.old/Makefile monotone/Makefile
 --- monotone.old/Makefile	2011-06-29 09:28:32.857487407 +0200
 +++ monotone/Makefile	2011-06-29 09:49:41.471685191 +0200
 @@ -6,40 +6,57 @@
  #
  
  PORTNAME=	monotone
 -PORTVERSION=	0.99.1
 -PORTREVISION=	1
 +PORTVERSION=	1.0
  CATEGORIES=	devel
  MASTER_SITES=	http://www.monotone.ca/downloads/${PORTVERSION}/
  
  MAINTAINER=	lapo@lapo.it
  COMMENT=	A distributed version control system with digital signatures
  
 +LICENSE=	GPLv2
 +LICENSE_FILE=	${WRKSRC}/COPYING
 +
  BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
  LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
  		idn.17:${PORTSDIR}/dns/libidn \
  		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
  		botan.0:${PORTSDIR}/security/botan
  
 -LICENSE=	GPLv2
 -LICENSE_FILE=	${WRKSRC}/COPYING
 -
  SUB_FILES=	pkg-message
 +USE_BZIP2=	yes
  USE_PERL5_BUILD=yes
  USE_ICONV=	yes
  USE_GMAKE=	yes
  USE_LUA=	5.1+
  
  GNU_CONFIGURE=	yes
 -CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 -		LDFLAGS="-L${LOCALBASE}/lib" \
 +CPPFLAGS=	-I${LOCALBASE}/include
 +CONFIGURE_ENV=	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 09:28:32.843487350 +0200
 +++ monotone/distinfo	2011-06-29 09:48:55.225137089 +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
 
 --TybLhxa8M7aNoW+V--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106290800.p5T80MHI022649>