[pkgsrc/trunk]: pkgsrc/textproc/enchant Make enchant.ordering a CONF_FILE.

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fadd9bd7959a
branches:  trunk
changeset: 386690:fadd9bd7959a
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Fri Oct 26 17:03:27 2018 +0000

description:
Make enchant.ordering a CONF_FILE.

This mirrors the same commit in wip. Logically, the ordering file is the
default config.

No more PLIST conflicts between enchant versions 1 and 2.

diffstat:

 textproc/enchant/Makefile   |  11 ++++++++---
 textproc/enchant/PLIST      |   4 ++--
 textproc/enchant/options.mk |   5 +++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 1ddd54b51932 -r fadd9bd7959a textproc/enchant/Makefile
--- a/textproc/enchant/Makefile Fri Oct 26 13:49:23 2018 +0000
+++ b/textproc/enchant/Makefile Fri Oct 26 17:03:27 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2018/10/24 15:42:47 bsiegert Exp $
+# $NetBSD: Makefile,v 1.39 2018/10/26 17:03:27 bsiegert Exp $
 #
 
 DISTNAME=              enchant-1.6.0
-PKGREVISION=           6
+PKGREVISION=           7
 CATEGORIES=            textproc
 MASTER_SITES=          http://www.abisource.com/downloads/enchant/1.6.0/
 
@@ -19,7 +19,12 @@
 GNU_CONFIGURE=         yes
 CFLAGS.SunOS+=         -D__EXTENSIONS__
 
-CONFIGURE_ARGS+=       --with-myspell-dir=${BUILDLINK_PREFIX.hunspell}/share/hunspell
+INSTALLATION_DIRS+=    share/examples
+MAKE_DIRS+=            ${PREFIX}/share/enchant
+CONF_FILES=            ${PREFIX}/share/examples/enchant-1.ordering ${PREFIX}/share/enchant/enchant.ordering
+
+post-install:
+       cd ${DESTDIR}${PREFIX}/share && ${MV} enchant/enchant.ordering examples/enchant-1.ordering
 
 .include "options.mk"
 
diff -r 1ddd54b51932 -r fadd9bd7959a textproc/enchant/PLIST
--- a/textproc/enchant/PLIST    Fri Oct 26 13:49:23 2018 +0000
+++ b/textproc/enchant/PLIST    Fri Oct 26 17:03:27 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:17:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/10/26 17:03:27 bsiegert Exp $
 bin/enchant
 bin/enchant-lsmod
 include/enchant/enchant++.h
@@ -10,4 +10,4 @@
 lib/libenchant.la
 lib/pkgconfig/enchant.pc
 man/man1/enchant.1
-share/enchant/enchant.ordering
+share/examples/enchant-1.ordering
diff -r 1ddd54b51932 -r fadd9bd7959a textproc/enchant/options.mk
--- a/textproc/enchant/options.mk       Fri Oct 26 13:49:23 2018 +0000
+++ b/textproc/enchant/options.mk       Fri Oct 26 17:03:27 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2009/10/12 19:56:04 ahoka Exp $
+# $NetBSD: options.mk,v 1.6 2018/10/26 17:03:27 bsiegert Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.enchant
 PKG_SUPPORTED_OPTIONS= aspell enchant-zemberek hunspell ispell
@@ -28,8 +28,9 @@
 
 PLIST_VARS+=            hunspell
 .if !empty(PKG_OPTIONS:Mhunspell)
+.include "../../textproc/hunspell/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-myspell
-.include "../../textproc/hunspell/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-myspell-dir=${BUILDLINK_PREFIX.hunspell}/share/hunspell
 DEPENDS+=              hunspell-en_US-[0-9]*:../../textproc/hunspell-en_US
 PLIST.hunspell=                yes
 .else