Unify PLISTs between Solaris and everyone else. Also drop the removal

of screen.old... that just shouldn't happen.  Bump the PKGREVISION.

3 files changed, 17 insertions, 38 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 03f819d0d7b..f17849aad44 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2006/04/05 23:01:16 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2006/04/05 23:06:33 jlam Exp $
 
 DISTNAME=	screen-4.0.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	misc shells
 MASTER_SITES=	ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
 		${MASTER_SITE_GNU:=screen/}
@@ -31,16 +31,24 @@ SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=	-e 's,@EXAMPLES@,${PREFIX}/share/examples/screen,g'
 SUBST_STAGE.paths=	post-patch
 
+.if (${OPSYS} == "SunOS") && exists(/usr/5bin/tic)
+PLIST_SUBST+=	SCREEN_TERMINFO=
+post-install: screen-terminfo
+.else
+PLIST_SUBST+=	SCREEN_TERMINFO="@comment "
+.endif
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/screen
 	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc			\
 		${PREFIX}/share/examples/screen/etcscreenrc
 	${INSTALL_DATA} ${WRKSRC}/etc/screenrc				\
 		${PREFIX}/share/examples/screen/screenrc
-.if ${OPSYS} == "SunOS"
+
+.PHONY: screen-terminfo
+screen-terminfo:
 	cd ${WRKSRC}/terminfo &&					\
 	${SETENV} TERMINFO=${PREFIX}/share/lib/terminfo			\
 		/usr/5bin/tic screeninfo.src
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/screen/PLIST b/misc/screen/PLIST
index 86af6b5a4d9..d7a6aa9d150 100644
--- a/misc/screen/PLIST
+++ b/misc/screen/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.9 2006/04/05 23:01:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/04/05 23:06:33 jlam Exp $
 bin/screen
 bin/${DISTNAME}
 info/screen.info
 man/man1/screen.1
-@unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi
 share/examples/screen/etcscreenrc
 share/examples/screen/screenrc
+${SCREEN_TERMINFO}share/lib/terminfo/s/screen
+${SCREEN_TERMINFO}share/lib/terminfo/s/screen-bce
+${SCREEN_TERMINFO}share/lib/terminfo/s/screen-s
 share/screen/utf8encodings/01
 share/screen/utf8encodings/02
 share/screen/utf8encodings/03
@@ -25,4 +27,5 @@ share/screen/utf8encodings/cd
 share/screen/utf8encodings/d6
 @dirrm share/screen/utf8encodings
 @dirrm share/screen
+${SCREEN_TERMINFO}@unexec ${RMDIR} -p %D/share/lib/terminfo/s 2>/dev/null || ${TRUE}
 @dirrm share/examples/screen
diff --git a/misc/screen/PLIST.SunOS b/misc/screen/PLIST.SunOS
deleted file mode 100644
index a0ff5c773cc..00000000000
--- a/misc/screen/PLIST.SunOS
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.12 2006/04/05 23:01:16 jlam Exp $
-bin/screen
-bin/${DISTNAME}
-info/screen.info
-man/man1/screen.1
-@unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi
-share/examples/screen/etcscreenrc
-share/examples/screen/screenrc
-share/lib/terminfo/s/screen
-share/lib/terminfo/s/screen-bce
-share/lib/terminfo/s/screen-s
-share/screen/utf8encodings/01
-share/screen/utf8encodings/02
-share/screen/utf8encodings/03
-share/screen/utf8encodings/04
-share/screen/utf8encodings/18
-share/screen/utf8encodings/19
-share/screen/utf8encodings/a1
-share/screen/utf8encodings/bf
-share/screen/utf8encodings/c2
-share/screen/utf8encodings/c3
-share/screen/utf8encodings/c4
-share/screen/utf8encodings/c6
-share/screen/utf8encodings/c7
-share/screen/utf8encodings/c8
-share/screen/utf8encodings/cc
-share/screen/utf8encodings/cd
-share/screen/utf8encodings/d6
-@dirrm share/screen/utf8encodings
-@dirrm share/screen
-@unexec ${RMDIR} %D/share/lib/terminfo/s 2>/dev/null || true
-@dirrm share/examples/screen