diff options
Diffstat (limited to 'lang/python21')
| -rw-r--r-- | lang/python21/Makefile | 20 | ||||
| -rw-r--r-- | lang/python21/PLIST.common | 16 |
2 files changed, 16 insertions, 20 deletions
diff --git a/lang/python21/Makefile b/lang/python21/Makefile index a0be4440c58..971dd535f4d 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2006/10/04 21:07:52 rillig Exp $ +# $NetBSD: Makefile,v 1.35 2008/04/12 22:43:02 jlam Exp $ # DISTNAME= Python-2.1.3 @@ -35,6 +35,8 @@ INSTALL_TARGET= altinstall .include "../../mk/bsd.prefs.mk" +PLIST_VARS= bsddb socket termios + PLIST_SRC= ${.CURDIR}/../../lang/python21/PLIST.common .if exists(${.CURDIR}/../../lang/python21/PLIST.${OPSYS}) PLIST_SRC+= ${.CURDIR}/../../lang/python21/PLIST.${OPSYS} @@ -52,29 +54,23 @@ PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} .endif PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} -PLAT_SOCKET= "@comment " -PLAT_TERMIOS= "@comment " .if !empty(MACHINE_PLATFORM:MNetBSD-[2-9].*) . if exists(/usr/include/sys/socket.h) -PLAT_SOCKET= "" +PLIST.socket= yes . endif . if exists(/usr/include/termios.h) -PLAT_TERMIOS= "" +PLIST.termios= yes . endif .endif -PLIST_SUBST+= PLAT_SOCKET=${PLAT_SOCKET} PLAT_TERMIOS=${PLAT_TERMIOS} # bsddb.so is not built on Solaris (or IRIX?) -BSDDB= -.if ${OPSYS} == "SunOS" || ${OPSYS} == "IRIX" -BSDDB= "@comment " -.else -.include "../../mk/bdb.buildlink3.mk" +.if ${OPSYS} != "SunOS" && ${OPSYS} != "IRIX" +. include "../../mk/bdb.buildlink3.mk" +PLIST.bsddb= yes MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE:Q} MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}} MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib .endif -PLIST_SUBST+= BSDDB=${BSDDB} PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} diff --git a/lang/python21/PLIST.common b/lang/python21/PLIST.common index 4dc02cd6363..a431b70e98e 100644 --- a/lang/python21/PLIST.common +++ b/lang/python21/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.2 2005/05/29 11:18:35 minskim Exp $ +@comment $NetBSD: PLIST.common,v 1.3 2008/04/12 22:43:02 jlam Exp $ bin/pydoc${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX} include/python${PY_VER_SUFFIX}/Python.h @@ -622,7 +622,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_testcapi.so lib/python${PY_VER_SUFFIX}/lib-dynload/_weakref.so lib/python${PY_VER_SUFFIX}/lib-dynload/array.so lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so -${BSDDB}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb.so +${PLIST.bsddb}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb.so lib/python${PY_VER_SUFFIX}/lib-dynload/cPickle.so lib/python${PY_VER_SUFFIX}/lib-dynload/cStringIO.so lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so @@ -832,12 +832,12 @@ lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/FCNTL.pyo lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/IN.py lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/IN.pyc lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/IN.pyo -${PLAT_SOCKET}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SOCKET.py -${PLAT_SOCKET}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SOCKET.pyc -${PLAT_SOCKET}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SOCKET.pyo -${PLAT_TERMIOS}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TERMIOS.py -${PLAT_TERMIOS}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TERMIOS.pyc -${PLAT_TERMIOS}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TERMIOS.pyo +${PLIST.socket}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SOCKET.py +${PLIST.socket}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SOCKET.pyc +${PLIST.socket}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SOCKET.pyo +${PLIST.termios}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TERMIOS.py +${PLIST.termios}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TERMIOS.pyc +${PLIST.termios}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TERMIOS.pyo lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/regen lib/python${PY_VER_SUFFIX}/popen2.py lib/python${PY_VER_SUFFIX}/popen2.pyc |