From lapo@mail.lapo.it  Sun Jun  1 08:36:26 2008
Return-Path: <lapo@mail.lapo.it>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B1A841065680
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  1 Jun 2008 08:36:26 +0000 (UTC)
	(envelope-from lapo@mail.lapo.it)
Received: from mail.lapo.it (motoko.lapo.it [88.198.0.105])
	by mx1.freebsd.org (Postfix) with ESMTP id 1BDE18FC16
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  1 Jun 2008 08:36:25 +0000 (UTC)
	(envelope-from lapo@mail.lapo.it)
Received: (qmail 80386 invoked by uid 1001); 1 Jun 2008 08:36:23 -0000
Message-Id: <20080601083623.80385.qmail@mail.lapo.it>
Date: 1 Jun 2008 08:36:23 -0000
From: Lapo Luchini <lapo@lapo.it>
Reply-To: Lapo Luchini <lapo@lapo.it>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Ion-Mihai Tetcu <itetcu@FreeBSD.org>, Lapo Luchini <lapo@lapo.it>
Subject: port fix: devel/monotone
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         124182
>Category:       ports
>Synopsis:       port fix: devel/monotone
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 01 08:40:03 UTC 2008
>Closed-Date:    Sun Jun 08 14:31:55 UTC 2008
>Last-Modified:  Sun Jun  8 14:40:01 UTC 2008
>Originator:     Lapo Luchini
>Release:        FreeBSD 6.3-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD motoko.lapo.it 6.3-PRERELEASE FreeBSD 6.3-PRERELEASE #8: Thu Dec 13 09:33:49 CET 2007 root@motoko.lapo.it:/usr/obj/usr/src/sys/MOTOKO amd64

>Description:

As reported by itetcu@FreeBSD.org, monotone port wrongly installed some 
docs even when not told to.

I also went ahead and not installed INFOs if no man pages are wanted 
(is that right? I didn't see any info-specific NO-flag).

>How-To-Repeat:

Install with NOPORTDOCS defined.

>Fix:

diff -ruN monotone.orig/Makefile monotone/Makefile
--- monotone.orig/Makefile	2008-04-16 13:21:00.000000000 +0200
+++ monotone/Makefile	2008-06-01 10:30:45.033235495 +0200
@@ -30,8 +30,12 @@
 PLIST_FILES=	bin/mtn share/zsh/site-functions/_mtn \
 		"@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true" \
 		"@dirrmtry share/zsh"
+.if !defined(NO_INSTALL_MANPAGES)
 INFO=		monotone
-PORTDOCS=	NEWS UPGRADE monotone.html
+.endif
+.if !defined(NOPORTDOCS)
+PORTDOCS=	NEWS UPGRADE monotone.html texinfo.css
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -55,6 +59,12 @@
 post-extract:
 	@${RM} -f ${WRKSRC}/monotone.info*
 
+post-patch:
+	${REINPLACE_CMD} -e '/^install-data-am:/s/ install-htmlDATA//' ${WRKSRC}/Makefile.in
+.if defined(NO_INSTALL_MANPAGES)
+	${REINPLACE_CMD} -e '/^install-data-am:/s/ install-info-am//' ${WRKSRC}/Makefile.in
+.endif
+
 post-install:
 	${MKDIR} ${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${PREFIX}/share/zsh/site-functions/_mtn
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: itetcu 
Responsible-Changed-When: Sun Jun 1 21:14:19 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=124182 
State-Changed-From-To: open->closed 
State-Changed-By: itetcu 
State-Changed-When: Sun Jun 8 14:31:54 UTC 2008 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=124182 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/124182: commit references a PR
Date: Sun,  8 Jun 2008 14:31:40 +0000 (UTC)

 itetcu      2008-06-08 14:31:34 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/monotone       Makefile 
   Log:
   - As reported by itetcu@FreeBSD.org, monotone port wrongly installed some
   docs even when not told to. I also went ahead and not installed INFOs if no man
   pages are wanted.
   - bump PORTREVISION
   
   PR:             ports/124182
   Submitted by:   Lapo Luchini (maintainer)
   
   Revision  Changes    Path
   1.39      +12 -2     ports/devel/monotone/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
