From owner-freebsd-python@FreeBSD.ORG  Tue May 26 23:05:18 2009
Return-Path: <owner-freebsd-python@FreeBSD.ORG>
Delivered-To: python@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 633E9106566C;
	Tue, 26 May 2009 23:05:18 +0000 (UTC)
	(envelope-from root@squish.rachie.is-a-geek.net)
Received: from mailhub.rachie.is-a-geek.net (rachie.is-a-geek.net
	[66.230.99.27])
	by mx1.freebsd.org (Postfix) with ESMTP id 31DCE8FC0C;
	Tue, 26 May 2009 23:05:18 +0000 (UTC)
	(envelope-from root@squish.rachie.is-a-geek.net)
Received: from squish.rachie.is-a-geek.net (squish.rachie.is-a-geek.net
	[192.168.2.70])
	by mailhub.rachie.is-a-geek.net (Postfix) with ESMTP id D525B7E837;
	Tue, 26 May 2009 14:48:27 -0800 (AKDT)
Received: by squish.rachie.is-a-geek.net (Postfix, from userid 0)
	id 8D5343502C; Tue, 26 May 2009 14:48:27 -0800 (AKDT)
To: FreeBSD-gnats-submit@freebsd.org
From: Mel <mel@rachie.is-a-geek.net>
X-send-pr-version: 3.113
X-GNATS-Notify: 
Message-Id: <20090526224827.8D5343502C@squish.rachie.is-a-geek.net>
Date: Tue, 26 May 2009 14:48:27 -0800 (AKDT)
Cc: MAINTAINER <python@FreeBSD.org>
Subject: [patch] lang/python-doc-html: Fix index build with python 2.6+
X-BeenThere: freebsd-python@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: FreeBSD-specific Python issues <freebsd-python.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-python>, 
	<mailto:freebsd-python-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-python>
List-Post: <mailto:freebsd-python@freebsd.org>
List-Help: <mailto:freebsd-python-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-python>,
	<mailto:freebsd-python-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 May 2009 23:05:18 -0000


>Submitter-Id:	current-users
>Originator:	Mel
>Confidential:	no 
>Synopsis:	[patch] lang/python-doc-html: Fix index build with python 2.6+
>Severity:	non-critical
>Priority:	medium
>Category:	ports
>Class:		sw-bug
>Release:	FreeBSD 7.1-STABLE i386
>Environment:
System: FreeBSD squish.rachie.is-a-geek.net 7.1-STABLE FreeBSD 7.1-STABLE #7: Sun Feb  8 17:45:44 AKST 2009     root@squish.rachie.is-a-geek.net:/data/obj/data/RELENG_7/src/sys/GENERIC-ICHSMB  i386


	
>Description:
Index build fails when PYTHON_DEFAULT_VERSION is set to >=2.6 in /etc/make.conf. This
is because of the error that is presented in the Makefile, and slave ports are not
properly handled.

>How-To-Repeat:
echo PYTHON_DEFAULT_VERSION=python2.6 >>/etc/make.conf && make -C \
	/usr/ports/lang/python-doc-postscript-a4 describe
>Fix:

	



--- patch-lang%python-doc-html%Makefile begins here ---
Index: lang/python-doc-html/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/python-doc-html/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- lang/python-doc-html/Makefile	13 Oct 2008 08:23:00 -0000	1.24
+++ lang/python-doc-html/Makefile	26 May 2009 22:40:19 -0000
@@ -38,11 +38,16 @@
 .endif
 .else # ${PYTHON_REL} >= 260
 .if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter"
+.if defined(MASTERDIR)
+IGNORE=		"${DOCFORMAT} only available for versions older then 2.6"
+NO_DESCRIBE=	yes
+.else
 .BEGIN:
 	@${ECHO} "ERROR: invalid value for DOCFORMAT: \"${DOCFORMAT}\""
 	@${ECHO} "Possible values are:  html, pdf-a4, pdf-letter."
 	@${FALSE}
 .endif
+.endif
 
 DISTNAME=	python-docs-${DOCFORMAT}
 DIST_SUBDIR=	python${PYTHON_REL}
--- patch-lang%python-doc-html%Makefile ends here ---