CVS commit: pkgsrc/textproc/enchant

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Oct 26 17:03:27 UTC 2018

Modified Files:
        pkgsrc/textproc/enchant: Makefile PLIST options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/textproc/enchant/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/enchant/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/enchant/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/enchant/Makefile
diff -u pkgsrc/textproc/enchant/Makefile:1.38 pkgsrc/textproc/enchant/Makefile:1.39
--- pkgsrc/textproc/enchant/Makefile:1.38       Wed Oct 24 15:42:47 2018
+++ pkgsrc/textproc/enchant/Makefile    Fri Oct 26 17:03:27 2018
@@ -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 @@ PKGCONFIG_OVERRIDE+= enchant.pc.in
 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"
 

Index: pkgsrc/textproc/enchant/PLIST
diff -u pkgsrc/textproc/enchant/PLIST:1.6 pkgsrc/textproc/enchant/PLIST:1.7
--- pkgsrc/textproc/enchant/PLIST:1.6   Sun Jun 14 18:17:15 2009
+++ pkgsrc/textproc/enchant/PLIST       Fri Oct 26 17:03:27 2018
@@ -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 @@ ${PLIST.hunspell}lib/enchant/libenchant_
 lib/libenchant.la
 lib/pkgconfig/enchant.pc
 man/man1/enchant.1
-share/enchant/enchant.ordering
+share/examples/enchant-1.ordering

Index: pkgsrc/textproc/enchant/options.mk
diff -u pkgsrc/textproc/enchant/options.mk:1.5 pkgsrc/textproc/enchant/options.mk:1.6
--- pkgsrc/textproc/enchant/options.mk:1.5      Mon Oct 12 19:56:04 2009
+++ pkgsrc/textproc/enchant/options.mk  Fri Oct 26 17:03:27 2018
@@ -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 @@ CONFIGURE_ARGS+=      --disable-zemberek
 
 PLIST_VARS+=            hunspell
 .if !empty(PKG_OPTIONS:Mhunspell)
-CONFIGURE_ARGS+=       --enable-myspell
 .include "../../textproc/hunspell/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-myspell
+CONFIGURE_ARGS+=       --with-myspell-dir=${BUILDLINK_PREFIX.hunspell}/share/hunspell
 DEPENDS+=              hunspell-en_US-[0-9]*:../../textproc/hunspell-en_US
 PLIST.hunspell=                yes
 .else