Fri Apr 25 11:34:11 2008 UTC ()
Convert to PLIST_VARS


(tnn)
diff -r1.2 -r1.3 pkgsrc/lang/python25/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/lang/python25/PLIST.common
cvs diff -r1.2 -r1.3 pkgsrc/lang/python25/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python25/Attic/Makefile 2008/04/24 04:42:00 1.2
+++ pkgsrc/lang/python25/Attic/Makefile 2008/04/25 11:34:11 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2008/04/24 04:42:00 bjs Exp $ 1# $NetBSD: Makefile,v 1.3 2008/04/25 11:34:11 tnn Exp $
2 2
3DISTNAME= Python-2.5.2 3DISTNAME= Python-2.5.2
4PKGNAME= python25-2.5.2 4PKGNAME= python25-2.5.2
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= lang python 6CATEGORIES= lang python
7MASTER_SITES= ftp://ftp.python.org/pub/python/2.5.2/ \ 7MASTER_SITES= ftp://ftp.python.org/pub/python/2.5.2/ \
8 http://www.python.org/ftp/python/2.5.2/ 8 http://www.python.org/ftp/python/2.5.2/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= recht@NetBSD.org 11MAINTAINER= recht@NetBSD.org
12HOMEPAGE= http://www.python.org/ 12HOMEPAGE= http://www.python.org/
13COMMENT= Interpreted, interactive, object-oriented programming language 13COMMENT= Interpreted, interactive, object-oriented programming language
14 14
@@ -63,78 +63,70 @@ PY_PLATNAME= hp-ux11 @@ -63,78 +63,70 @@ PY_PLATNAME= hp-ux11
63PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} 63PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
64.endif 64.endif
65PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} 65PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q}
66 66
67.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \ 67.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \
68 (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \ 68 (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \
69 (defined(ABI) && ${ABI} == "64") 69 (defined(ABI) && ${ABI} == "64")
70IS_64BIT_PLATFORM?= yes 70IS_64BIT_PLATFORM?= yes
71.else 71.else
72IS_64BIT_PLATFORM?= no 72IS_64BIT_PLATFORM?= no
73.endif 73.endif
74 74
75# the dl module isn't built for 64 bit archs and Darwin 75# the dl module isn't built for 64 bit archs and Darwin
76.if !empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) || (${OPSYS} == "Darwin") 76PLIST_VARS+= dl
77PLIST_SUBST+= DLMODULE="@comment " 77.if empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) && (${OPSYS} != "Darwin")
78.else 78PLIST.dl= yes
79PLIST_SUBST+= DLMODULE= 
80.endif 79.endif
81 80
82# setup.py causes some modules to be built if the platform is *not* 64bit. 81# setup.py causes some modules to be built if the platform is *not* 64bit.
 82PLIST_VARS+= extra-so
83.if !empty(IS_64BIT_PLATFORM:M[nN][oO]) 83.if !empty(IS_64BIT_PLATFORM:M[nN][oO])
84PLIST_SUBST+= EXTRA_SO= 84LIST.extra-so= yes
85.else 
86PLIST_SUBST+= EXTRA_SO="@comment " 
87.endif 85.endif
88 86
89# ossaudiodev is only available on x86 for the following platforms 87# ossaudiodev is only available on x86 for the following platforms
 88PLIST_VARS+= oss
90.if (${MACHINE_ARCH} == "i386") && \ 89.if (${MACHINE_ARCH} == "i386") && \
91 (${PY_PLATNAME} == "linux2" || ${OPSYS} == "FreeBSD") 90 (${PY_PLATNAME} == "linux2" || ${OPSYS} == "FreeBSD")
92PLIST_SUBST+= OSSAUDIODEV= 91PLIST.oss= yes
93.elif (${MACHINE_ARCH} == "x86_64") && (${PY_PLATNAME} == "linux2") 92.elif (${MACHINE_ARCH} == "x86_64") && (${PY_PLATNAME} == "linux2")
94PLIST_SUBST+= OSSAUDIODEV= 93PLIST.oss= yes
95.else 
96PLIST_SUBST+= OSSAUDIODEV="@comment " 
97.endif 94.endif
98 95
99# Make sure python modules can link correctly 96# Make sure python modules can link correctly
100.if ${OPSYS} == "Darwin" 97.if ${OPSYS} == "Darwin"
101INSTALL_UNSTRIPPED= yes 98INSTALL_UNSTRIPPED= yes
102.endif 99.endif
103 100
 101PLIST_VARS+= bsddb dll nis no-nis
104.if ${OPSYS} == "IRIX" 102.if ${OPSYS} == "IRIX"
105. if ${ABI} == "64" 103. if ${ABI} == "64"
106PLIST_SUBST+= NISMODULE="@comment " 104PLIST.no-nis= yes
107PLIST_SUBST+= NO_NISMODULE="@comment " 
108. else 105. else
109PLIST_SUBST+= NISMODULE= 106PLIST.nis= yes
110PLIST_SUBST+= NO_NISMODULE="@comment " 
111. endif 107. endif
112PLIST_SUBST+= BSDDBMODULE="@comment " 
113PLIST_SUBST+= NOSHLIB="@comment " 
114.else 108.else
115. include "../../mk/bdb.buildlink3.mk" 109. include "../../mk/bdb.buildlink3.mk"
116MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} 110MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE}
117MAKE_ENV+= PY_BDB_INCDIRS=${BUILDLINK_INCDIRS.${BDB_TYPE}:S,^,${BDBBASE}/,:Q} 111MAKE_ENV+= PY_BDB_INCDIRS=${BUILDLINK_INCDIRS.${BDB_TYPE}:S,^,${BDBBASE}/,:Q}
118MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib 112MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib
119LIBS+= ${BDB_LIBS} 113LIBS+= ${BDB_LIBS}
120PLIST_SUBST+= BSDDBMODULE= 114PLIST.bsddb= yes
121PLIST_SUBST+= NOSHLIB= 115PLIST.dll= yes
122. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) 116. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
123PLIST_SUBST+= NISMODULE= 117PLIST.nis= yes
124PLIST_SUBST+= NO_NISMODULE="@comment " 
125. else 118. else
126PLIST_SUBST+= NISMODULE="@comment " 119PLIST.no-nis= yes
127PLIST_SUBST+= NO_NISMODULE= 
128. endif 120. endif
129.endif 121.endif
130 122
131.if defined(BUILDLINK_TRANSFORM) 123.if defined(BUILDLINK_TRANSFORM)
132MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q} 124MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q}
133.endif 125.endif
134 126
135PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 127PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
136 128
137TEST_TARGET= test 129TEST_TARGET= test
138INSTALL_TARGET= altinstall 130INSTALL_TARGET= altinstall
139 131
140REPLACE_INTERPRETER+= py25 132REPLACE_INTERPRETER+= py25
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/python25/Attic/PLIST.common (expand / switch to unified diff)

--- pkgsrc/lang/python25/Attic/PLIST.common 2008/04/24 01:50:58 1.1.1.1
+++ pkgsrc/lang/python25/Attic/PLIST.common 2008/04/25 11:34:11 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.common,v 1.1.1.1 2008/04/24 01:50:58 tnn Exp $ 1@comment $NetBSD: PLIST.common,v 1.2 2008/04/25 11:34:11 tnn Exp $
2bin/pydoc${PY_VER_SUFFIX} 2bin/pydoc${PY_VER_SUFFIX}
3bin/python${PY_VER_SUFFIX} 3bin/python${PY_VER_SUFFIX}
4bin/python${PY_VER_SUFFIX}-config 4bin/python${PY_VER_SUFFIX}-config
5bin/smtpd${PY_VER_SUFFIX}.py 5bin/smtpd${PY_VER_SUFFIX}.py
6include/python${PY_VER_SUFFIX}/Python-ast.h 6include/python${PY_VER_SUFFIX}/Python-ast.h
7include/python${PY_VER_SUFFIX}/Python.h 7include/python${PY_VER_SUFFIX}/Python.h
8include/python${PY_VER_SUFFIX}/abstract.h 8include/python${PY_VER_SUFFIX}/abstract.h
9include/python${PY_VER_SUFFIX}/asdl.h 9include/python${PY_VER_SUFFIX}/asdl.h
10include/python${PY_VER_SUFFIX}/ast.h 10include/python${PY_VER_SUFFIX}/ast.h
11include/python${PY_VER_SUFFIX}/bitset.h 11include/python${PY_VER_SUFFIX}/bitset.h
12include/python${PY_VER_SUFFIX}/boolobject.h 12include/python${PY_VER_SUFFIX}/boolobject.h
13include/python${PY_VER_SUFFIX}/bufferobject.h 13include/python${PY_VER_SUFFIX}/bufferobject.h
14include/python${PY_VER_SUFFIX}/cStringIO.h 14include/python${PY_VER_SUFFIX}/cStringIO.h
@@ -74,28 +74,28 @@ include/python${PY_VER_SUFFIX}/setobject @@ -74,28 +74,28 @@ include/python${PY_VER_SUFFIX}/setobject
74include/python${PY_VER_SUFFIX}/sliceobject.h 74include/python${PY_VER_SUFFIX}/sliceobject.h
75include/python${PY_VER_SUFFIX}/stringobject.h 75include/python${PY_VER_SUFFIX}/stringobject.h
76include/python${PY_VER_SUFFIX}/structmember.h 76include/python${PY_VER_SUFFIX}/structmember.h
77include/python${PY_VER_SUFFIX}/structseq.h 77include/python${PY_VER_SUFFIX}/structseq.h
78include/python${PY_VER_SUFFIX}/symtable.h 78include/python${PY_VER_SUFFIX}/symtable.h
79include/python${PY_VER_SUFFIX}/sysmodule.h 79include/python${PY_VER_SUFFIX}/sysmodule.h
80include/python${PY_VER_SUFFIX}/timefuncs.h 80include/python${PY_VER_SUFFIX}/timefuncs.h
81include/python${PY_VER_SUFFIX}/token.h 81include/python${PY_VER_SUFFIX}/token.h
82include/python${PY_VER_SUFFIX}/traceback.h 82include/python${PY_VER_SUFFIX}/traceback.h
83include/python${PY_VER_SUFFIX}/tupleobject.h 83include/python${PY_VER_SUFFIX}/tupleobject.h
84include/python${PY_VER_SUFFIX}/ucnhash.h 84include/python${PY_VER_SUFFIX}/ucnhash.h
85include/python${PY_VER_SUFFIX}/unicodeobject.h 85include/python${PY_VER_SUFFIX}/unicodeobject.h
86include/python${PY_VER_SUFFIX}/weakrefobject.h 86include/python${PY_VER_SUFFIX}/weakrefobject.h
87${NOSHLIB}lib/libpython${PY_VER_SUFFIX}.so 87${PLIST.dll}lib/libpython${PY_VER_SUFFIX}.so
88${NOSHLIB}lib/libpython${PY_VER_SUFFIX}.so.1.0 88${PLIST.dll}lib/libpython${PY_VER_SUFFIX}.so.1.0
89lib/python${PY_VER_SUFFIX}/BaseHTTPServer.py 89lib/python${PY_VER_SUFFIX}/BaseHTTPServer.py
90lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyc 90lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyc
91lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyo 91lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyo
92lib/python${PY_VER_SUFFIX}/Bastion.py 92lib/python${PY_VER_SUFFIX}/Bastion.py
93lib/python${PY_VER_SUFFIX}/Bastion.pyc 93lib/python${PY_VER_SUFFIX}/Bastion.pyc
94lib/python${PY_VER_SUFFIX}/Bastion.pyo 94lib/python${PY_VER_SUFFIX}/Bastion.pyo
95lib/python${PY_VER_SUFFIX}/CGIHTTPServer.py 95lib/python${PY_VER_SUFFIX}/CGIHTTPServer.py
96lib/python${PY_VER_SUFFIX}/CGIHTTPServer.pyc 96lib/python${PY_VER_SUFFIX}/CGIHTTPServer.pyc
97lib/python${PY_VER_SUFFIX}/CGIHTTPServer.pyo 97lib/python${PY_VER_SUFFIX}/CGIHTTPServer.pyo
98lib/python${PY_VER_SUFFIX}/ConfigParser.py 98lib/python${PY_VER_SUFFIX}/ConfigParser.py
99lib/python${PY_VER_SUFFIX}/ConfigParser.pyc 99lib/python${PY_VER_SUFFIX}/ConfigParser.pyc
100lib/python${PY_VER_SUFFIX}/ConfigParser.pyo 100lib/python${PY_VER_SUFFIX}/ConfigParser.pyo
101lib/python${PY_VER_SUFFIX}/Cookie.py 101lib/python${PY_VER_SUFFIX}/Cookie.py
@@ -1533,50 +1533,50 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_ @@ -1533,50 +1533,50 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
1533lib/python${PY_VER_SUFFIX}/lib-dynload/_hotshot.so 1533lib/python${PY_VER_SUFFIX}/lib-dynload/_hotshot.so
1534lib/python${PY_VER_SUFFIX}/lib-dynload/_locale.so 1534lib/python${PY_VER_SUFFIX}/lib-dynload/_locale.so
1535lib/python${PY_VER_SUFFIX}/lib-dynload/_lsprof.so 1535lib/python${PY_VER_SUFFIX}/lib-dynload/_lsprof.so
1536lib/python${PY_VER_SUFFIX}/lib-dynload/_multibytecodec.so 1536lib/python${PY_VER_SUFFIX}/lib-dynload/_multibytecodec.so
1537lib/python${PY_VER_SUFFIX}/lib-dynload/_random.so 1537lib/python${PY_VER_SUFFIX}/lib-dynload/_random.so
1538lib/python${PY_VER_SUFFIX}/lib-dynload/_socket.so 1538lib/python${PY_VER_SUFFIX}/lib-dynload/_socket.so
1539lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so 1539lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so
1540lib/python${PY_VER_SUFFIX}/lib-dynload/_struct.so 1540lib/python${PY_VER_SUFFIX}/lib-dynload/_struct.so
1541lib/python${PY_VER_SUFFIX}/lib-dynload/_testcapi.so 1541lib/python${PY_VER_SUFFIX}/lib-dynload/_testcapi.so
1542lib/python${PY_VER_SUFFIX}/lib-dynload/_weakref.so 1542lib/python${PY_VER_SUFFIX}/lib-dynload/_weakref.so
1543lib/python${PY_VER_SUFFIX}/lib-dynload/array.so 1543lib/python${PY_VER_SUFFIX}/lib-dynload/array.so
1544lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so 1544lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so
1545lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so 1545lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so
1546${BSDDBMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so 1546${PLIST.bsddb}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so
1547lib/python${PY_VER_SUFFIX}/lib-dynload/bz2.so 1547lib/python${PY_VER_SUFFIX}/lib-dynload/bz2.so
1548lib/python${PY_VER_SUFFIX}/lib-dynload/cPickle.so 1548lib/python${PY_VER_SUFFIX}/lib-dynload/cPickle.so
1549lib/python${PY_VER_SUFFIX}/lib-dynload/cStringIO.so 1549lib/python${PY_VER_SUFFIX}/lib-dynload/cStringIO.so
1550lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so 1550lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so
1551lib/python${PY_VER_SUFFIX}/lib-dynload/collections.so 1551lib/python${PY_VER_SUFFIX}/lib-dynload/collections.so
1552lib/python${PY_VER_SUFFIX}/lib-dynload/crypt.so 1552lib/python${PY_VER_SUFFIX}/lib-dynload/crypt.so
1553lib/python${PY_VER_SUFFIX}/lib-dynload/datetime.so 1553lib/python${PY_VER_SUFFIX}/lib-dynload/datetime.so
1554lib/python${PY_VER_SUFFIX}/lib-dynload/dbm.so 1554lib/python${PY_VER_SUFFIX}/lib-dynload/dbm.so
1555${DLMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so 1555${PLIST.dl}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so
1556lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so 1556lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so
1557lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so 1557lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
1558${EXTRA_SO}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so 1558${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so
1559lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so 1559lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so
1560lib/python${PY_VER_SUFFIX}/lib-dynload/math.so 1560lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
1561lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so 1561lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
1562${NISMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so 1562${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
1563${NO_NISMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so 1563${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
1564lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so 1564lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
1565lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so 1565lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
1566lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so 1566lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so
1567lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so 1567lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
1568${EXTRA_SO}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so 1568${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so
1569${OSSAUDIODEV}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so 1569${PLIST.oss}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so
1570lib/python${PY_VER_SUFFIX}/lib-dynload/select.so 1570lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
1571lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so 1571lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so
1572lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so 1572lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
1573lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so 1573lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so
1574lib/python${PY_VER_SUFFIX}/lib-dynload/time.so 1574lib/python${PY_VER_SUFFIX}/lib-dynload/time.so
1575lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so 1575lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so
1576lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so 1576lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so
1577lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.py 1577lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.py
1578lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyc 1578lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyc
1579lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyo 1579lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyo
1580lib/python${PY_VER_SUFFIX}/lib-tk/Dialog.py 1580lib/python${PY_VER_SUFFIX}/lib-tk/Dialog.py
1581lib/python${PY_VER_SUFFIX}/lib-tk/Dialog.pyc 1581lib/python${PY_VER_SUFFIX}/lib-tk/Dialog.pyc
1582lib/python${PY_VER_SUFFIX}/lib-tk/Dialog.pyo 1582lib/python${PY_VER_SUFFIX}/lib-tk/Dialog.pyo