Date: Sat, 23 Jan 2010 02:56:11 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: clsung@FreeBSD.org Subject: ports/143101: [PATCH] net/dictd: use $SUB_FILES to dynamically adjust dictd.conf Message-ID: <201001230256.o0N2uBoo008071@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001230300.o0N30F7G095525@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143101 >Category: ports >Synopsis: [PATCH] net/dictd: use $SUB_FILES to dynamically adjust dictd.conf >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: Sat Jan 23 03:00:15 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Sevan Janiyan >Release: FreeBSD 8.0-RELEASE-p2 amd64 >Organization: >Environment: System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 5 21:11:58 UTC >Description: no need to invoke sed manually Added file(s): - files/dictd.conf.in Removed file(s): - files/dictd.conf Port maintainer (clsung@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- dictd-1.11.1_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/dictd/Makefile,v retrieving revision 1.47 diff -u -r1.47 Makefile --- Makefile 14 Dec 2009 01:08:54 -0000 1.47 +++ Makefile 23 Jan 2010 02:53:54 -0000 @@ -29,7 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -SUB_FILES+= pkg-message +SUB_FILES+= dictd.conf pkg-message SUB_LIST+= PORTSDIR=${PORTSDIR} USE_GMAKE= yes @@ -44,7 +44,7 @@ @${REINPLACE_CMD} -e "s|\([\ \t(]\)T_USER|\1T_USERNAME|g" ${WRKSRC}/*.[chly] post-install: - @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/${PORTNAME}.conf > ${PREFIX}/etc/${PORTNAME}.conf.sample + @${CP} ${WRKDIR}/${PORTNAME}.conf > ${PREFIX}/etc/${PORTNAME}.conf.sample @[ -f ${PREFIX}/etc/${PORTNAME}.conf ] || ${CP} ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf @${CAT} ${PKGMESSAGE} Index: files/dictd.conf =================================================================== RCS file: files/dictd.conf diff -N files/dictd.conf --- files/dictd.conf 15 Oct 2001 14:20:51 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -database web1913 { data "%%PREFIX%%/lib/dict/web1913.dict.dz" - index "%%PREFIX%%/lib/dict/web1913.index" } -database wn { data "%%PREFIX%%/lib/dict/wn.dict.dz" - index "%%PREFIX%%/lib/dict/wn.index" } -database gazetteer { data "%%PREFIX%%/lib/dict/gazetteer.dict.dz" - index "%%PREFIX%%/lib/dict/gazetteer.index" } -database jargon { data "%%PREFIX%%/lib/dict/jargon.dict.dz" - index "%%PREFIX%%/lib/dict/jargon.index" } -database foldoc { data "%%PREFIX%%/lib/dict/foldoc.dict.dz" - index "%%PREFIX%%/lib/dict/foldoc.index" } -database elements { data "%%PREFIX%%/lib/dict/elements.dict.dz" - index "%%PREFIX%%/lib/dict/elements.index" } -database easton { data "%%PREFIX%%/lib/dict/easton.dict.dz" - index "%%PREFIX%%/lib/dict/easton.index" } -database hitchcock { data "%%PREFIX%%/lib/dict/hitchcock.dict.dz" - index "%%PREFIX%%/lib/dict/hitchcock.index" } -database vera { data "%%PREFIX%%/lib/dict/vera.dict.dz" - index "%%PREFIX%%/lib/dict/vera.index" } -database devils { data "%%PREFIX%%/lib/dict/devils.dict.dz" - index "%%PREFIX%%/lib/dict/devils.index" } -database world95 { data "%%PREFIX%%/lib/dict/world95.dict.dz" - index "%%PREFIX%%/lib/dict/world95.index" } Index: files/dictd.conf.in =================================================================== RCS file: files/dictd.conf.in diff -N files/dictd.conf.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/dictd.conf.in 23 Jan 2010 02:53:54 -0000 @@ -0,0 +1,22 @@ +database web1913 { data "%%PREFIX%%/lib/dict/web1913.dict.dz" + index "%%PREFIX%%/lib/dict/web1913.index" } +database wn { data "%%PREFIX%%/lib/dict/wn.dict.dz" + index "%%PREFIX%%/lib/dict/wn.index" } +database gazetteer { data "%%PREFIX%%/lib/dict/gazetteer.dict.dz" + index "%%PREFIX%%/lib/dict/gazetteer.index" } +database jargon { data "%%PREFIX%%/lib/dict/jargon.dict.dz" + index "%%PREFIX%%/lib/dict/jargon.index" } +database foldoc { data "%%PREFIX%%/lib/dict/foldoc.dict.dz" + index "%%PREFIX%%/lib/dict/foldoc.index" } +database elements { data "%%PREFIX%%/lib/dict/elements.dict.dz" + index "%%PREFIX%%/lib/dict/elements.index" } +database easton { data "%%PREFIX%%/lib/dict/easton.dict.dz" + index "%%PREFIX%%/lib/dict/easton.index" } +database hitchcock { data "%%PREFIX%%/lib/dict/hitchcock.dict.dz" + index "%%PREFIX%%/lib/dict/hitchcock.index" } +database vera { data "%%PREFIX%%/lib/dict/vera.dict.dz" + index "%%PREFIX%%/lib/dict/vera.index" } +database devils { data "%%PREFIX%%/lib/dict/devils.dict.dz" + index "%%PREFIX%%/lib/dict/devils.index" } +database world95 { data "%%PREFIX%%/lib/dict/world95.dict.dz" + index "%%PREFIX%%/lib/dict/world95.index" } --- dictd-1.11.1_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001230256.o0N2uBoo008071>