Fix PLIST on OpenBSD.

- Changed IRIX, Interix, Linux and OpenBSD share PLIST.terminfo,
  instead of PLIST for each OS.

- zsh doesn't build libzsh-4.2.5.so on OpenBSD, so PLIST.shlibs
  should be excluded.

5 files changed, 10 insertions, 13 deletions

diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index 4dcdcc23992..91374f2f78a 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2005/07/29 18:32:18 jlam Exp $
+# $NetBSD: Makefile.common,v 1.26 2005/08/07 20:18:07 hiramatsu Exp $
 
 DISTNAME=       zsh-${ZSH_VERSION}
 CATEGORIES=	shells
@@ -54,14 +54,15 @@ LDFLAGS+=	-static
 PLIST_SRC=	${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
 .  else
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/zsh
-.    if exists(${PKGDIR}/PLIST.${OPSYS})
-PLIST_SRC=	${PKGDIR}/PLIST.${OPSYS}
+
+.    if ${OPSYS} == "Linux" || ${OPSYS} == "IRIX" || ${OPSYS} == "OpenBSD"
+PLIST_SRC+=     ${PKGDIR}/PLIST.terminfo
+.    elif ${OPSYS} == "Interix"
+PLIST_SRC+=     ${PKGDIR}/PLIST.terminfo ${PKGDIR}/PLIST.shlibs
 .    else
-PLIST_SRC=	# empty
-.    endif
-.    if ${OPSYS} != "IRIX" && ${OPSYS} != "Linux"
-PLIST_SRC+=	${PKGDIR}/PLIST.shlibs
+PLIST_SRC+=     ${PKGDIR}/PLIST.shlibs
 .    endif
+
 PLIST_SRC+=	${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
 .  endif
 .endif
diff --git a/shells/zsh/PLIST.IRIX b/shells/zsh/PLIST.IRIX
deleted file mode 100644
index e2bb90e95d7..00000000000
--- a/shells/zsh/PLIST.IRIX
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.IRIX,v 1.1 2005/03/04 03:59:32 jschauma Exp $
-lib/zsh/${PKGVERSION}/zsh/terminfo.so
diff --git a/shells/zsh/PLIST.Interix b/shells/zsh/PLIST.Interix
deleted file mode 100644
index 84ae3701ea0..00000000000
--- a/shells/zsh/PLIST.Interix
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Interix,v 1.1 2005/01/25 13:11:16 tv Exp $
-lib/zsh/${PKGVERSION}/zsh/terminfo.so
diff --git a/shells/zsh/PLIST.Linux b/shells/zsh/PLIST.Linux
deleted file mode 100644
index c61f85f8a64..00000000000
--- a/shells/zsh/PLIST.Linux
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2005/06/14 18:39:29 minskim Exp $
-lib/zsh/${PKGVERSION}/zsh/terminfo.so
diff --git a/shells/zsh/PLIST.terminfo b/shells/zsh/PLIST.terminfo
new file mode 100644
index 00000000000..157b0c54721
--- /dev/null
+++ b/shells/zsh/PLIST.terminfo
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.terminfo,v 1.1 2005/08/07 20:18:07 hiramatsu Exp $
+lib/zsh/${PKGVERSION}/zsh/terminfo.so