Convert to use PLIST_VARS instead of manually passing "@comment "

through PLIST_SUBST to the plist module.

3 files changed, 30 insertions, 38 deletions

diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 80edd24bbdc..9ae8e7d1887 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2008/04/11 10:44:08 drochner Exp $
+# $NetBSD: Makefile,v 1.43 2008/04/12 22:43:02 jlam Exp $
 
 DISTNAME=	Python-2.4.5
 PKGNAME=	python24-2.4.5
@@ -69,37 +69,34 @@ IS_64BIT_PLATFORM?=	no
 .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 "
+PLIST.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
 
 # Mac OS X Leopard support:
 # 1.) Fix detection of setpgrp(2).
 # 2.) "lib-dynload/_OSA.so" isn't built.
+PLIST_VARS+=	osa
 .if !empty(MACHINE_PLATFORM:MDarwin-[9].*-*)
 CFLAGS+=	-D__DARWIN_UNIX03
-PLIST_SUBST+=	LEOPARD="@comment "
 .else
-PLIST_SUBST+=	LEOPARD=
+PLIST.osa=	yes
 .endif
 
 # Make sure python modules can link correctly
@@ -108,30 +105,25 @@ INSTALL_UNSTRIPPED=	yes
 CFLAGS+=		-I${WRKSRC}/Include
 .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:Q}
 MAKE_ENV+=	PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
 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 --git a/lang/python24/PLIST.Darwin b/lang/python24/PLIST.Darwin
index ba82423fec3..36a2765e749 100644
--- a/lang/python24/PLIST.Darwin
+++ b/lang/python24/PLIST.Darwin
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Darwin,v 1.5 2007/12/15 18:43:32 tron Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.6 2008/04/12 22:43:02 jlam Exp $
 lib/libpython2.4.2.dylib
 lib/python${PY_VER_SUFFIX}/lib-dynload/ColorPicker.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/MacOS.so
@@ -25,7 +25,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_Launch.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_List.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Menu.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Mlte.so
-${LEOPARD}lib/python${PY_VER_SUFFIX}/lib-dynload/_OSA.so
+${PLIST.osa}lib/python${PY_VER_SUFFIX}/lib-dynload/_OSA.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Qd.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Qdoffs.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Qt.so
diff --git a/lang/python24/PLIST.common b/lang/python24/PLIST.common
index 2b0bba56468..c79af0e6078 100644
--- a/lang/python24/PLIST.common
+++ b/lang/python24/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.9 2008/04/11 10:44:08 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.10 2008/04/12 22:43:02 jlam Exp $
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
 bin/smtpd${PY_VER_SUFFIX}.py
@@ -77,8 +77,8 @@ include/python${PY_VER_SUFFIX}/tupleobject.h
 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
@@ -1277,7 +1277,7 @@ 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/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
@@ -1286,22 +1286,22 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/collections.so
 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/md5.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/regex.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/sha.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so