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

>Number:         58386
>Category:       ports
>Synopsis:       [PATCH] sysutils/gkrellm2: 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/sysutils/gkrellm2/Makefile,v
retrieving revision 1.87
diff -u -r1.87 Makefile
--- Makefile	19 Oct 2003 19:04:47 -0000	1.87
+++ Makefile	22 Oct 2003 14:08:40 -0000
@@ -89,10 +89,11 @@
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/gkrellmd.sh > ${PREFIX}/etc/rc.d/gkrellmd.sh
 	@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/gkrellmd.sh
+	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/server/gkrellmd.conf \
-		${PREFIX}/etc/gkrellmd.conf.sample
+		${EXAMPLESDIR}/gkrellmd.conf
 	if [ ! -f ${PREFIX}/etc/gkrellmd.conf ]; then \
-		${CP} -p ${PREFIX}/etc/gkrellmd.conf.sample \
+		${CP} -p ${EXAMPLESDIR}/gkrellmd.conf \
 			${PREFIX}/etc/gkrellmd.conf; \
 	fi
 .if !defined(NOPORTDOCS)
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/sysutils/gkrellm2/pkg-plist,v
retrieving revision 1.22
diff -u -r1.22 pkg-plist
--- pkg-plist	31 Aug 2003 10:27:18 -0000	1.22
+++ pkg-plist	22 Oct 2003 14:08:40 -0000
@@ -4,10 +4,11 @@
 %%PORTDOCS%%share/doc/gkrellm/README
 %%PORTDOCS%%share/doc/gkrellm/Themes.html
 %%PORTDOCS%%@dirrm share/doc/gkrellm
-@unexec if cmp -s %D/etc/gkrellmd.conf %D/etc/gkrellmd.conf.sample; then rm -f %D/etc/gkrellmd.conf; fi
-etc/gkrellmd.conf.sample
+@unexec if cmp -s %D/etc/gkrellmd.conf %%EXAMPLESDIR%%/gkrellmd.conf; then rm -f %D/etc/gkrellmd.conf; fi
+%%EXAMPLESDIR%%/gkrellmd.conf
 @exec [ -f %B/gkrellmd.conf ] || cp %B/%f %B/gkrellmd.conf
 etc/rc.d/gkrellmd.sh
+@dirrm %%EXAMPLESDIR%%
 %%CLIENT%%@cwd %%X11BASE%%
 %%CLIENT%%man/man1/gkrellm.1.gz
 %%CLIENT%%bin/gkrellm
>Release-Note:
>Audit-Trail:
>Unformatted:

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