Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 23 Oct 2003 00:01:48 +0900 (JST)
From:      Hideyuki KURASHINA <rushani@FreeBSD.org>, Hideyuki KURASHINA <rushani@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        cy@FreeBSD.org
Subject:   ports/58385: [PATCH] misc/screen: Utilize EXAMPLESDIR
Message-ID:  <20031023.000148.115910288.rushani@FreeBSD.org>
Resent-Message-ID: <200310221510.h9MFAI8b017637@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 

>Number:         58385
>Category:       ports
>Synopsis:       [PATCH] misc/screen: Utilize EXAMPLESDIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 22 08:10:18 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Hideyuki KURASHINA
>Release:        FreeBSD  5.1-RELEASE-p10 i386
>Organization:
>Environment:

	System: FreeBSD ***.*******.jp 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #1: Wed Oct 22 03:10:46 JST 2003
	
>Description:

	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.

>How-To-Repeat:
	
>Fix:

	Apply following patch;

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/screen/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- Makefile	13 Oct 2003 03:28:04 -0000	1.52
+++ Makefile	22 Oct 2003 13:53:37 -0000
@@ -30,9 +30,10 @@
 	@${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 <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/misc/screen/pkg-plist,v
retrieving revision 1.26
diff -u -r1.26 pkg-plist
--- pkg-plist	13 Oct 2003 03:28:04 -0000	1.26
+++ pkg-plist	22 Oct 2003 13:53:37 -0000
@@ -16,8 +16,9 @@
 share/screen/utf8encodings/cc
 share/screen/utf8encodings/cd
 share/screen/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 share/screen/utf8encodings
 @dirrm share/screen
>Release-Note:
>Audit-Trail:
>Unformatted:

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031023.000148.115910288.rushani>