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

through PLIST_SUBST to the plist module.

2 files changed, 26 insertions, 33 deletions

diff --git a/lang/python23/Makefile.common b/lang/python23/Makefile.common
index 22fc97537a3..216da3bd470 100644
--- a/lang/python23/Makefile.common
+++ b/lang/python23/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2007/12/24 01:19:47 minskim Exp $
+# $NetBSD: Makefile.common,v 1.38 2008/04/12 22:43:02 jlam Exp $
 #
 
 DISTNAME=	Python-2.3.5
@@ -59,29 +59,26 @@ 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") || (${OPSYS} == "Interix")
-PLIST_SUBST+=	DLMODULE="@comment "
-.else
-PLIST_SUBST+=	DLMODULE=
+PLIST_VARS+=		dl
+.if empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) && \
+    (${OPSYS} != "Darwin") && (${OPSYS} != "Interix")
+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" || ${PY_PLATNAME} == "freebsd4" || \
      ${PY_PLATNAME} == "freebsd5")
-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
@@ -89,27 +86,23 @@ PLIST_SUBST+=	OSSAUDIODEV="@comment "
 INSTALL_UNSTRIPPED=	yes
 .endif
 
+PLIST_VARS+=	bsddb dll nis
 .if ${OPSYS} == "IRIX"
-.  if ${ABI} == "64"
-PLIST_SUBST+=	NISMODULE="@comment "
-.  else
-PLIST_SUBST+=	NISMODULE=
+.  if ${ABI} != "64"
+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
 MAKE_ENV+=	PY_BDB_LIBS=${BDB_LIBS:Q}
-PLIST_SUBST+=	BSDDBMODULE=
-PLIST_SUBST+=	NOSHLIB=
+PLIST.bsddb=	yes
+PLIST.dll=	yes
 .  if ${OPSYS} == "Interix"
-PLIST_SUBST+=	NISMODULE="@comment "
 CONFIGURE_ENV+=	ac_cv_header_stropts_h=no
 .  else
-PLIST_SUBST+=	NISMODULE=
+PLIST.nis=	yes
 .  endif
 .endif
 
diff --git a/lang/python23/PLIST.common b/lang/python23/PLIST.common
index 82ebc5caef2..759b49c312f 100644
--- a/lang/python23/PLIST.common
+++ b/lang/python23/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.7 2004/11/24 20:45:10 jschauma Exp $
+@comment $NetBSD: PLIST.common,v 1.8 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
@@ -72,8 +72,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
@@ -1126,9 +1126,9 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so
 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
-${EXTRA_SO}lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so
+${PLIST.extra-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
@@ -1136,23 +1136,23 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.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
+${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.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/pcre.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/pwd.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/rotor.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/sha.so