Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Aug 2014 21:11:51 +0000 (UTC)
From:      Chris Rees <crees@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r366275 - head/textproc/mr-aspell
Message-ID:  <201408262111.s7QLBp9H019469@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: crees
Date: Tue Aug 26 21:11:51 2014
New Revision: 366275
URL: http://svnweb.freebsd.org/changeset/ports/366275
QAT: https://qat.redports.org/buildarchive/r366275/

Log:
  Stop mr-aspell conflicting with hi-aspell
  
  Reviewed by:	bapt

Modified:
  head/textproc/mr-aspell/Makefile
  head/textproc/mr-aspell/pkg-plist

Modified: head/textproc/mr-aspell/Makefile
==============================================================================
--- head/textproc/mr-aspell/Makefile	Tue Aug 26 21:04:26 2014	(r366274)
+++ head/textproc/mr-aspell/Makefile	Tue Aug 26 21:11:51 2014	(r366275)
@@ -3,7 +3,7 @@
 
 PORTNAME=	${DICT}-aspell
 DISTVERSION=	6-mr-0.10-0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	textproc
 
@@ -12,5 +12,15 @@ COMMENT=	Aspell Marathi dictionary
 
 DICT=	 	mr
 
+# This stops it conflicting on u-deva.cmap|.cset with hi-aspell
+post-patch:
+	${REINPLACE_CMD} '\,^data_files,s,u-deva\.c[sm][ea][tp],mr-&,g' \
+		${WRKSRC}/Makefile.pre
+	${REINPLACE_CMD} 's,u-deva,mr-&,' ${WRKSRC}/info ${WRKSRC}/mr.dat \
+		${WRKSRC}/u-deva.cset
+.for c in cmap cset
+	${MV} ${WRKSRC}/u-deva.$c ${WRKSRC}/mr-u-deva.$c
+.endfor
+
 .include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
 .include <bsd.port.post.mk>

Modified: head/textproc/mr-aspell/pkg-plist
==============================================================================
--- head/textproc/mr-aspell/pkg-plist	Tue Aug 26 21:04:26 2014	(r366274)
+++ head/textproc/mr-aspell/pkg-plist	Tue Aug 26 21:11:51 2014	(r366275)
@@ -1,6 +1,6 @@
 lib/aspell-%%VER%%/mr.dat
-lib/aspell-%%VER%%/u-deva.cmap
-lib/aspell-%%VER%%/u-deva.cset
+lib/aspell-%%VER%%/mr-u-deva.cmap
+lib/aspell-%%VER%%/mr-u-deva.cset
 share/aspell/mr.multi
 share/aspell/mr.rws
 share/aspell/marathi.alias



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