Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Jan 2010 06:34:29 GMT
From:      Sevan Janiyan <venture37@geeklan.co.uk>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/142415: [patch] chinese/dictd-database use $SUB_FILES to dynamically adjust pkg-message
Message-ID:  <201001070634.o076YTak082189@www.freebsd.org>
Resent-Message-ID: <201001070640.o076e3nT001813@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         142415
>Category:       ports
>Synopsis:       [patch] chinese/dictd-database use $SUB_FILES to dynamically adjust pkg-message
>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:   Thu Jan 07 06:40:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sevan Janiyan
>Release:        
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/chinese/dictd-database/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile	5 Jan 2009 17:27:24 -0000	1.27
+++ Makefile	7 Jan 2010 06:29:46 -0000
@@ -19,14 +19,11 @@
 RUN_DEPENDS=	${LOCALBASE}/sbin/dictd:${PORTSDIR}/net/dictd
 
 NO_BUILD=	yes
-
-MSG_FILE=	${PKGDIR}/pkg-message
-PKGMESSAGE=	${WRKSRC}/pkg-message
+SUB_FILES=	pkg-message
 
 DICTFILES=	cedict pydict moecomp netterm
 
 do-install:
-	${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
 	@${MKDIR} ${PREFIX}/lib/dict
 	for f in ${DICTFILES}; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$${f}.dict.dz ${PREFIX}/lib/dict; \
@@ -34,8 +31,6 @@
 	done
 
 post-install:
-	@${ECHO}
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO}
 
 .include <bsd.port.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	6 Apr 2005 13:07:42 -0000	1.7
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-*****************************************************************************
-
-You need to add following to /etc/rc.conf:
-
-dictd_flags="--locale zh_TW.UTF-8"
-
-And, you also need adding the following to %%PREFIX%%/etc/dictd.conf:
-
-database moecomp   { data "%%PREFIX%%/lib/dict/moecomp.dict.dz"
-                     index "%%PREFIX%%/lib/dict/moecomp.index" }
-database netterm   { data "%%PREFIX%%/lib/dict/netterm.dict.dz"
-                     index "%%PREFIX%%/lib/dict/netterm.index" }
-database pydict    { data "%%PREFIX%%/lib/dict/pydict.dict.dz"
-                     index "%%PREFIX%%/lib/dict/pydict.index" }
-database cedict    { data "%%PREFIX%%/lib/dict/cedict.dict.dz"
-                     index "%%PREFIX%%/lib/dict/cedict.index" }
-
-*****************************************************************************
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	7 Jan 2010 06:29:46 -0000
@@ -0,0 +1,18 @@
+*****************************************************************************
+
+You need to add following to /etc/rc.conf:
+
+dictd_flags="--locale zh_TW.UTF-8"
+
+And, you also need adding the following to %%PREFIX%%/etc/dictd.conf:
+
+database moecomp   { data "%%PREFIX%%/lib/dict/moecomp.dict.dz"
+                     index "%%PREFIX%%/lib/dict/moecomp.index" }
+database netterm   { data "%%PREFIX%%/lib/dict/netterm.dict.dz"
+                     index "%%PREFIX%%/lib/dict/netterm.index" }
+database pydict    { data "%%PREFIX%%/lib/dict/pydict.dict.dz"
+                     index "%%PREFIX%%/lib/dict/pydict.index" }
+database cedict    { data "%%PREFIX%%/lib/dict/cedict.dict.dz"
+                     index "%%PREFIX%%/lib/dict/cedict.index" }
+
+*****************************************************************************


>Release-Note:
>Audit-Trail:
>Unformatted:



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