Make this install and deinstall cleanly under IRIX and Linux.

4 files changed, 88 insertions, 13 deletions

diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index fc0be936efe..465c5ecbfed 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/07/22 09:16:03 recht Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/04 00:49:26 jschauma Exp $
 #
 
 DISTNAME=	py152
@@ -20,8 +20,16 @@ INSTALL_TARGET=	altinstall
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "IRIX"
+PLIST_SRC=      ${.CURDIR}/../../lang/python15/PLIST.common
+.if exists(${.CURDIR}/../../lang/python15/PLIST.${OPSYS})
+PLIST_SRC+=     ${.CURDIR}/../../lang/python15/PLIST.${OPSYS}
+.endif
+PLIST_SRC+=     ${.CURDIR}/../../lang/python15/PLIST.common_end
+
+.if ${OPSYS} == "Darwin"
 PY_PLATNAME=	${LOWER_OPSYS}
+.elif ${OPSYS} == "IRIX"
+PY_PLATNAME=	${LOWER_OPSYS:C/\..*//}
 .else
 PY_PLATNAME=	${LOWER_OPSYS}${OS_VERSION:C/\..*//}
 .endif
diff --git a/lang/python15/PLIST.IRIX b/lang/python15/PLIST.IRIX
new file mode 100644
index 00000000000..e7d9e34e9ac
--- /dev/null
+++ b/lang/python15/PLIST.IRIX
@@ -0,0 +1,66 @@
+@comment $NetBSD: PLIST.IRIX,v 1.1 2004/10/04 00:49:26 jschauma Exp $
+lib/python1.5/plat-${PY_PLATNAME}/AL.py
+lib/python1.5/plat-${PY_PLATNAME}/AL.pyc
+lib/python1.5/plat-${PY_PLATNAME}/AL.pyo
+lib/python1.5/plat-${PY_PLATNAME}/CD.py
+lib/python1.5/plat-${PY_PLATNAME}/CD.pyc
+lib/python1.5/plat-${PY_PLATNAME}/CD.pyo
+lib/python1.5/plat-${PY_PLATNAME}/CL.py
+lib/python1.5/plat-${PY_PLATNAME}/CL.pyc
+lib/python1.5/plat-${PY_PLATNAME}/CL.pyo
+lib/python1.5/plat-${PY_PLATNAME}/DEVICE.py
+lib/python1.5/plat-${PY_PLATNAME}/DEVICE.pyc
+lib/python1.5/plat-${PY_PLATNAME}/DEVICE.pyo
+lib/python1.5/plat-${PY_PLATNAME}/ERRNO.py
+lib/python1.5/plat-${PY_PLATNAME}/ERRNO.pyc
+lib/python1.5/plat-${PY_PLATNAME}/ERRNO.pyo
+lib/python1.5/plat-${PY_PLATNAME}/FILE.py
+lib/python1.5/plat-${PY_PLATNAME}/FILE.pyc
+lib/python1.5/plat-${PY_PLATNAME}/FILE.pyo
+lib/python1.5/plat-${PY_PLATNAME}/FL.py
+lib/python1.5/plat-${PY_PLATNAME}/FL.pyc
+lib/python1.5/plat-${PY_PLATNAME}/FL.pyo
+lib/python1.5/plat-${PY_PLATNAME}/GET.py
+lib/python1.5/plat-${PY_PLATNAME}/GET.pyc
+lib/python1.5/plat-${PY_PLATNAME}/GET.pyo
+lib/python1.5/plat-${PY_PLATNAME}/GL.py
+lib/python1.5/plat-${PY_PLATNAME}/GL.pyc
+lib/python1.5/plat-${PY_PLATNAME}/GL.pyo
+lib/python1.5/plat-${PY_PLATNAME}/GLWS.py
+lib/python1.5/plat-${PY_PLATNAME}/GLWS.pyc
+lib/python1.5/plat-${PY_PLATNAME}/GLWS.pyo
+lib/python1.5/plat-${PY_PLATNAME}/IOCTL.py
+lib/python1.5/plat-${PY_PLATNAME}/IOCTL.pyc
+lib/python1.5/plat-${PY_PLATNAME}/IOCTL.pyo
+lib/python1.5/plat-${PY_PLATNAME}/SV.py
+lib/python1.5/plat-${PY_PLATNAME}/SV.pyc
+lib/python1.5/plat-${PY_PLATNAME}/SV.pyo
+lib/python1.5/plat-${PY_PLATNAME}/WAIT.py
+lib/python1.5/plat-${PY_PLATNAME}/WAIT.pyc
+lib/python1.5/plat-${PY_PLATNAME}/WAIT.pyo
+lib/python1.5/plat-${PY_PLATNAME}/cddb.py
+lib/python1.5/plat-${PY_PLATNAME}/cddb.pyc
+lib/python1.5/plat-${PY_PLATNAME}/cddb.pyo
+lib/python1.5/plat-${PY_PLATNAME}/cdplayer.py
+lib/python1.5/plat-${PY_PLATNAME}/cdplayer.pyc
+lib/python1.5/plat-${PY_PLATNAME}/cdplayer.pyo
+lib/python1.5/plat-${PY_PLATNAME}/flp.doc
+lib/python1.5/plat-${PY_PLATNAME}/flp.py
+lib/python1.5/plat-${PY_PLATNAME}/flp.pyc
+lib/python1.5/plat-${PY_PLATNAME}/flp.pyo
+lib/python1.5/plat-${PY_PLATNAME}/jpeg.py
+lib/python1.5/plat-${PY_PLATNAME}/jpeg.pyc
+lib/python1.5/plat-${PY_PLATNAME}/jpeg.pyo
+lib/python1.5/plat-${PY_PLATNAME}/panel.py
+lib/python1.5/plat-${PY_PLATNAME}/panel.pyc
+lib/python1.5/plat-${PY_PLATNAME}/panel.pyo
+lib/python1.5/plat-${PY_PLATNAME}/panelparser.py
+lib/python1.5/plat-${PY_PLATNAME}/panelparser.pyc
+lib/python1.5/plat-${PY_PLATNAME}/panelparser.pyo
+lib/python1.5/plat-${PY_PLATNAME}/readcd.doc
+lib/python1.5/plat-${PY_PLATNAME}/readcd.py
+lib/python1.5/plat-${PY_PLATNAME}/readcd.pyc
+lib/python1.5/plat-${PY_PLATNAME}/readcd.pyo
+lib/python1.5/plat-${PY_PLATNAME}/torgb.py
+lib/python1.5/plat-${PY_PLATNAME}/torgb.pyc
+lib/python1.5/plat-${PY_PLATNAME}/torgb.pyo
diff --git a/lang/python15/PLIST b/lang/python15/PLIST.common
index f767d6f0f5b..6ac1c385d31 100644
--- a/lang/python15/PLIST
+++ b/lang/python15/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/06/23 15:54:08 minskim Exp $
+@comment $NetBSD: PLIST.common,v 1.1 2004/10/04 00:49:26 jschauma Exp $
 bin/python1.5
 include/python1.5/Python.h
 include/python1.5/abstract.h
@@ -932,13 +932,3 @@ lib/python1.5/xdrlib.pyo
 lib/python1.5/xmllib.py
 lib/python1.5/xmllib.pyc
 lib/python1.5/xmllib.pyo
-@dirrm lib/python1.5/test/output
-@dirrm lib/python1.5/test
-@dirrm lib/python1.5/plat-${PY_PLATNAME}
-@dirrm lib/python1.5/lib-tk
-@dirrm lib/python1.5/lib-stdwin
-@exec ${MKDIR} %D/lib/python1.5/lib-dynload
-@dirrm lib/python1.5/lib-dynload
-@dirrm lib/python1.5/config
-@dirrm lib/python1.5
-@dirrm include/python1.5
diff --git a/lang/python15/PLIST.common_end b/lang/python15/PLIST.common_end
new file mode 100644
index 00000000000..857d2052dbe
--- /dev/null
+++ b/lang/python15/PLIST.common_end
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.common_end,v 1.1 2004/10/04 00:49:26 jschauma Exp $
+@dirrm lib/python1.5/test/output
+@dirrm lib/python1.5/test
+@dirrm lib/python1.5/plat-${PY_PLATNAME}
+@dirrm lib/python1.5/lib-tk
+@dirrm lib/python1.5/lib-stdwin
+@exec ${MKDIR} %D/lib/python1.5/lib-dynload
+@dirrm lib/python1.5/lib-dynload
+@dirrm lib/python1.5/config
+@dirrm lib/python1.5
+@dirrm include/python1.5