>Number:         14523
>Category:       pkg
>Synopsis:       lang/python/Makefile.inc is out of date (breaks 9 packges)
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Nov 10 07:33:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Jarkko Torppa
>Release:        NetBSD 1.5.1
>Organization:
Cute Communications
>Environment:
	
System: NetBSD tuhnu.cutery.fi 1.5.2 NetBSD 1.5.2 (TUHNU) #3: Wed Nov 7 20:31:29 EET 2001 root@:/foo/1.5.2/src/sys/arch/i386/compile/TUHNU i386


>Description:

lang/python/Makefile.inc is out of date, this breaks building of 9
python extension. Intention of this file seems to be that stuff that
is shipped with python but not build by the main-package are handled
in this.

databases/py-gdbm/Makefile:.include "../../lang/python/Makefile.inc"
devel/py-curses/Makefile:.include "../../lang/python/Makefile.inc"
devel/py-idle/Makefile:.include "../../lang/python/Makefile.inc"
lang/py-extclass/Makefile:.include "../../lang/python/Makefile.inc"
print/py-reportlab/Makefile:.include "../../lang/python/Makefile.inc"
textproc/py-dtml/Makefile:.include "../../lang/python/Makefile.inc"
www/py-pcgi/Makefile:.include "../../lang/python/Makefile.inc"
www/py-zpublisher/Makefile:.include "../../lang/python/Makefile.inc"
x11/py-Tk/Makefile:.include "../../lang/python/Makefile.inc"

>How-To-Repeat:

Build python-2.0.1 from lang/python and try to build one of the above
packges after it. It tries to use python-2.0 sources for these packages.

>Fix:

This is a stop-gag path for the problem, real fix should take into
account that there are now two python's in the pkgsrc.


Index: lang/python/Makefile.inc
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python/Makefile.inc,v
retrieving revision 1.2
diff -u -r1.2 Makefile.inc
--- Makefile.inc        2001/05/30 04:59:36     1.2
+++ Makefile.inc        2001/11/10 15:28:26
@@ -2,12 +2,14 @@
 #
 
 PY_VERSION=    2.0
-PY_DISTNAME=   BeOpen-Python-${PY_VERSION}
-PY_MASTER_SITES=http://www.pythonlabs.com/products/python${PY_VERSION}/downloads/
+PY_MINORVER=    ${PY_VERSION}.1
+PY_DISTNAME=   Python-${PY_MINORVER}
+PY_MASTER_SITES=ftp://ftp.python.org/pub/python/${PY_MINORVER}/
+EXTRACT_SUFX=   .tgz
 DIST_SUBDIR?=  python
 
-PY_WRKSRC=     ${WRKDIR}/Python-${PY_VERSION}/Modules
-PY_MODULES=    Python-${PY_VERSION}/Modules
+PY_WRKSRC=     ${WRKDIR}/Python-${PY_MINORVER}/Modules
+PY_MODULES=    Python-${PY_MINORVER}/Modules
 
 PY_CONFIGDIR=  ${LOCALBASE}/lib/python${PY_VERSION}/config
 PY_LIBPATH=    lib/python${PY_VERSION}
@@ -19,7 +21,7 @@
 
 PY_COMPILEDIR= ${PY_PROG} ${PY_LIBDIR}/compileall.py
 
-DEPENDS+=      python-${PY_VERSION}*:../../lang/python
+DEPENDS+=      python-${PY_MINORVER}*:../../lang/python
 
 ALL_TARGET?=   default
>Release-Note:
>Audit-Trail:
>Unformatted: