pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/shells/zsh Fix PLIST on OpenBSD.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/147df9c83730
branches:  trunk
changeset: 497925:147df9c83730
user:      hiramatsu <hiramatsu%pkgsrc.org@localhost>
date:      Sun Aug 07 20:18:07 2005 +0000

description:
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.

diffstat:

 shells/zsh/Makefile.common |  15 ++++++++-------
 shells/zsh/PLIST.IRIX      |   2 --
 shells/zsh/PLIST.Interix   |   2 --
 shells/zsh/PLIST.Linux     |   2 --
 shells/zsh/PLIST.terminfo  |   2 ++
 5 files changed, 10 insertions(+), 13 deletions(-)

diffs (55 lines):

diff -r b36ce828bf65 -r 147df9c83730 shells/zsh/Makefile.common
--- a/shells/zsh/Makefile.common        Sun Aug 07 19:47:23 2005 +0000
+++ b/shells/zsh/Makefile.common        Sun Aug 07 20:18:07 2005 +0000
@@ -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 @@
 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
+PLIST_SRC+=     ${PKGDIR}/PLIST.shlibs
 .    endif
-.    if ${OPSYS} != "IRIX" && ${OPSYS} != "Linux"
-PLIST_SRC+=    ${PKGDIR}/PLIST.shlibs
-.    endif
+
 PLIST_SRC+=    ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
 .  endif
 .endif
diff -r b36ce828bf65 -r 147df9c83730 shells/zsh/PLIST.IRIX
--- a/shells/zsh/PLIST.IRIX     Sun Aug 07 19:47:23 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r b36ce828bf65 -r 147df9c83730 shells/zsh/PLIST.Interix
--- a/shells/zsh/PLIST.Interix  Sun Aug 07 19:47:23 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r b36ce828bf65 -r 147df9c83730 shells/zsh/PLIST.Linux
--- a/shells/zsh/PLIST.Linux    Sun Aug 07 19:47:23 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r b36ce828bf65 -r 147df9c83730 shells/zsh/PLIST.terminfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/zsh/PLIST.terminfo Sun Aug 07 20:18:07 2005 +0000
@@ -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



Home | Main Index | Thread Index | Old Index