pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/python25 Convert to PLIST_VARS
details: https://anonhg.NetBSD.org/pkgsrc/rev/22c25ce9d531
branches: trunk
changeset: 541742:22c25ce9d531
user: tnn <tnn%pkgsrc.org@localhost>
date: Fri Apr 25 11:34:11 2008 +0000
description:
Convert to PLIST_VARS
diffstat:
lang/python25/Makefile | 40 ++++++++++++++++------------------------
lang/python25/PLIST.common | 20 ++++++++++----------
2 files changed, 26 insertions(+), 34 deletions(-)
diffs (140 lines):
diff -r d8d20ece30cd -r 22c25ce9d531 lang/python25/Makefile
--- a/lang/python25/Makefile Fri Apr 25 11:23:26 2008 +0000
+++ b/lang/python25/Makefile Fri Apr 25 11:34:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/04/24 04:42:00 bjs Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/25 11:34:11 tnn Exp $
DISTNAME= Python-2.5.2
PKGNAME= python25-2.5.2
@@ -73,27 +73,24 @@
.endif
# the dl module isn't built for 64 bit archs and Darwin
-.if !empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) || (${OPSYS} == "Darwin")
-PLIST_SUBST+= DLMODULE="@comment "
-.else
-PLIST_SUBST+= DLMODULE=
+PLIST_VARS+= dl
+.if empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) && (${OPSYS} != "Darwin")
+PLIST.dl= yes
.endif
# setup.py causes some modules to be built if the platform is *not* 64bit.
+PLIST_VARS+= extra-so
.if !empty(IS_64BIT_PLATFORM:M[nN][oO])
-PLIST_SUBST+= EXTRA_SO=
-.else
-PLIST_SUBST+= EXTRA_SO="@comment "
+LIST.extra-so= yes
.endif
# ossaudiodev is only available on x86 for the following platforms
+PLIST_VARS+= oss
.if (${MACHINE_ARCH} == "i386") && \
(${PY_PLATNAME} == "linux2" || ${OPSYS} == "FreeBSD")
-PLIST_SUBST+= OSSAUDIODEV=
+PLIST.oss= yes
.elif (${MACHINE_ARCH} == "x86_64") && (${PY_PLATNAME} == "linux2")
-PLIST_SUBST+= OSSAUDIODEV=
-.else
-PLIST_SUBST+= OSSAUDIODEV="@comment "
+PLIST.oss= yes
.endif
# Make sure python modules can link correctly
@@ -101,30 +98,25 @@
INSTALL_UNSTRIPPED= yes
.endif
+PLIST_VARS+= bsddb dll nis no-nis
.if ${OPSYS} == "IRIX"
. if ${ABI} == "64"
-PLIST_SUBST+= NISMODULE="@comment "
-PLIST_SUBST+= NO_NISMODULE="@comment "
+PLIST.no-nis= yes
. else
-PLIST_SUBST+= NISMODULE=
-PLIST_SUBST+= NO_NISMODULE="@comment "
+PLIST.nis= yes
. endif
-PLIST_SUBST+= BSDDBMODULE="@comment "
-PLIST_SUBST+= NOSHLIB="@comment "
.else
. include "../../mk/bdb.buildlink3.mk"
MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE}
MAKE_ENV+= PY_BDB_INCDIRS=${BUILDLINK_INCDIRS.${BDB_TYPE}:S,^,${BDBBASE}/,:Q}
MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib
LIBS+= ${BDB_LIBS}
-PLIST_SUBST+= BSDDBMODULE=
-PLIST_SUBST+= NOSHLIB=
+PLIST.bsddb= yes
+PLIST.dll= yes
. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
-PLIST_SUBST+= NISMODULE=
-PLIST_SUBST+= NO_NISMODULE="@comment "
+PLIST.nis= yes
. else
-PLIST_SUBST+= NISMODULE="@comment "
-PLIST_SUBST+= NO_NISMODULE=
+PLIST.no-nis= yes
. endif
.endif
diff -r d8d20ece30cd -r 22c25ce9d531 lang/python25/PLIST.common
--- a/lang/python25/PLIST.common Fri Apr 25 11:23:26 2008 +0000
+++ b/lang/python25/PLIST.common Fri Apr 25 11:34:11 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1.1.1 2008/04/24 01:50:58 tnn Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2008/04/25 11:34:11 tnn Exp $
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}-config
@@ -84,8 +84,8 @@
include/python${PY_VER_SUFFIX}/ucnhash.h
include/python${PY_VER_SUFFIX}/unicodeobject.h
include/python${PY_VER_SUFFIX}/weakrefobject.h
-${NOSHLIB}lib/libpython${PY_VER_SUFFIX}.so
-${NOSHLIB}lib/libpython${PY_VER_SUFFIX}.so.1.0
+${PLIST.dll}lib/libpython${PY_VER_SUFFIX}.so
+${PLIST.dll}lib/libpython${PY_VER_SUFFIX}.so.1.0
lib/python${PY_VER_SUFFIX}/BaseHTTPServer.py
lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyc
lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyo
@@ -1543,7 +1543,7 @@
lib/python${PY_VER_SUFFIX}/lib-dynload/array.so
lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so
lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so
-${BSDDBMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so
+${PLIST.bsddb}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so
lib/python${PY_VER_SUFFIX}/lib-dynload/bz2.so
lib/python${PY_VER_SUFFIX}/lib-dynload/cPickle.so
lib/python${PY_VER_SUFFIX}/lib-dynload/cStringIO.so
@@ -1552,21 +1552,21 @@
lib/python${PY_VER_SUFFIX}/lib-dynload/crypt.so
lib/python${PY_VER_SUFFIX}/lib-dynload/datetime.so
lib/python${PY_VER_SUFFIX}/lib-dynload/dbm.so
-${DLMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so
+${PLIST.dl}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so
lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so
lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
-${EXTRA_SO}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so
+${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so
lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so
lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
-${NISMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
-${NO_NISMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
+${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
+${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so
lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
-${EXTRA_SO}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so
-${OSSAUDIODEV}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so
+${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so
+${PLIST.oss}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so
lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so
lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
Home |
Main Index |
Thread Index |
Old Index