From f1c00c3deebbcaadd95a5199b2b9eaf5eba41d6a Mon Sep 17 00:00:00 2001 From: edwin Date: Mon, 19 Jul 2004 07:21:17 +0000 Subject: [PATCH] misc/screen: Utilize EXAMPLESDIR Utilize EXAMPLESDIR to improves layout; i.e., configuration file -> ${PREFIX}/etc sample configuration file -> ${PREFIX}/share/examples/${PORTNAME} This change helps if many configuration files and sample ones exist. PR: ports/58385 Submitted by: Hideyuki KURASHINA Approved by: maintainer timeout --- misc/screen/Makefile | 6 ++++-- misc/screen/pkg-plist | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'misc/screen') diff --git a/misc/screen/Makefile b/misc/screen/Makefile index 41e3eca0bc79..00e0c073286b 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -7,6 +7,7 @@ PORTNAME= screen PORTVERSION= 4.0.2 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \ ${MASTER_SITE_GNU} @@ -31,9 +32,10 @@ post-patch: @${RM} ${WRKSRC}/doc/screen.info* post-install: - @${CP} ${WRKSRC}/etc/etcscreenrc ${PREFIX}/etc/screenrc.sample + @${MKDIR} ${EXAMPLESDIR} + @${CP} ${WRKSRC}/etc/etcscreenrc ${EXAMPLESDIR}/screenrc @if [ ! -f ${PREFIX}/etc/screenrc ]; then \ - ${CP} ${PREFIX}/etc/screenrc.sample ${PREFIX}/etc/screenrc ; \ + ${CP} ${EXAMPLESDIR}/screenrc ${PREFIX}/etc/screenrc ; \ fi .include diff --git a/misc/screen/pkg-plist b/misc/screen/pkg-plist index 5bb876cf63a9..32112173b2b7 100644 --- a/misc/screen/pkg-plist +++ b/misc/screen/pkg-plist @@ -16,8 +16,9 @@ bin/screen %%DATADIR%%/utf8encodings/cc %%DATADIR%%/utf8encodings/cd %%DATADIR%%/utf8encodings/d6 -@unexec if cmp -s %D/etc/screenrc %D/etc/screenrc.sample; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi -etc/screenrc.sample +@unexec if cmp -s %D/etc/screenrc %%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 %B/screenrc ] || cp %B/%f %B/screenrc +@dirrm %%EXAMPLESDIR%% @dirrm %%DATADIR%%/utf8encodings @dirrm %%DATADIR%% -- cgit