>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     
[email protected]:/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 ---

_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "[email protected]"

Reply via email to