From 3bd117e04b35eb3acd023487031eff01ecc404a2 Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Tue, 22 Oct 2013 20:15:16 +0000 Subject: [PATCH] Convert to staging. PR: 183186 Submitted by: mat --- sysutils/screen/Makefile | 12 +++++------- sysutils/screen/pkg-plist | 9 +++++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index 2a8010c6e42f..7c950e9030fe 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -24,12 +24,12 @@ XTERM_256_DESC= Enable support for 256 colour xterm HOSTINLOCKED_DESC= Print user@host in locked message SHOWENC_DESC= Show encoding on the status line -NO_STAGE= yes +OPTIONS_SUB= + .include GNU_CONFIGURE= yes .if ${PORT_OPTIONS:MMAN} -MAN1= screen.1 MAKE_ARGS+= -DWITH_MAN .endif .if ${PORT_OPTIONS:MINFO} @@ -75,10 +75,8 @@ post-patch: @${REINPLACE_CMD} -e 's|/dev/ptmx|/nonexistent|' ${WRKSRC}/configure post-install: - @${MKDIR} ${EXAMPLESDIR} - @${CP} ${WRKSRC}/etc/etcscreenrc ${EXAMPLESDIR}/screenrc - @if [ ! -f ${PREFIX}/etc/screenrc ]; then \ - ${CP} ${EXAMPLESDIR}/screenrc ${PREFIX}/etc/screenrc ; \ - fi + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc ${STAGEDIR}${EXAMPLESDIR}/screenrc + .include diff --git a/sysutils/screen/pkg-plist b/sysutils/screen/pkg-plist index 4bf7b39f7bc4..5deb6fcc1d85 100644 --- a/sysutils/screen/pkg-plist +++ b/sysutils/screen/pkg-plist @@ -1,4 +1,8 @@ bin/screen +%%MAN%%man/man1/screen.1.gz +@unexec if cmp -s %D/etc/screenrc %D/%%EXAMPLESDIR%%/screenrc; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi +%%EXAMPLESDIR%%/screenrc +@exec [ -f %D/etc/screenrc ] || cp %B/%f %D/etc/screenrc %%DATADIR%%/utf8encodings/01 %%DATADIR%%/utf8encodings/02 %%DATADIR%%/utf8encodings/03 @@ -16,9 +20,6 @@ bin/screen %%DATADIR%%/utf8encodings/cc %%DATADIR%%/utf8encodings/cd %%DATADIR%%/utf8encodings/d6 -@unexec if cmp -s %D/etc/screenrc %D/%%EXAMPLESDIR%%/screenrc; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi -%%EXAMPLESDIR%%/screenrc -@exec [ -f %D/etc/screenrc ] || cp %B/%f %D/etc/screenrc -@dirrm %%EXAMPLESDIR%% @dirrm %%DATADIR%%/utf8encodings @dirrm %%DATADIR%% +@dirrm %%EXAMPLESDIR%%