[pkgsrc/trunk]: pkgsrc/textproc/aspell-da (pkgsrc)

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d5c1e6080713
branches:  trunk
changeset: 649828:d5c1e6080713
user:      mef <mef%pkgsrc.org@localhost>
date:      Sat Apr 11 02:01:55 2015 +0000

description:
(pkgsrc)
 - Add LICENSE as gnu-gpl-v2
 - Add (tricky) SUBST to avoid editting patch-aa version to version
   patch-aa will be different on the fixed (no-editting) line but of version
(upstream)
 - Update 1.7.30 to 1.7.42
   ChangeLog unknown

diffstat:

 textproc/aspell-da/Makefile         |  12 +++++++++---
 textproc/aspell-da/distinfo         |  10 +++++-----
 textproc/aspell-da/patches/patch-aa |   8 ++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diffs (66 lines):

diff -r fbab4c94f8c9 -r d5c1e6080713 textproc/aspell-da/Makefile
--- a/textproc/aspell-da/Makefile       Sat Apr 11 01:26:56 2015 +0000
+++ b/textproc/aspell-da/Makefile       Sat Apr 11 02:01:55 2015 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2014/05/29 23:37:33 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2015/04/11 02:01:55 mef Exp $
 
-DISTNAME=      aspell-da-1.7.30
-PKGREVISION=   2
+DISTNAME=      aspell-da-1.7.42
 CATEGORIES=    textproc
 MASTER_SITES=  http://da.speling.org/filer/
 EXTRACT_SUFX=  .tar.bz2
@@ -9,6 +8,7 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://da.speling.org/
 COMMENT=       Danish language support for aspell
+LICENSE=       gnu-gpl-v2
 
 CONFLICTS+=    aspell-danish-[0-9]*
 USE_TOOLS+=    perl
@@ -16,5 +16,11 @@
 
 INSTALLATION_DIRS+=    lib/aspell share/aspell
 
+SUBST_CLASSES+=                        avoid_patch
+SUBST_MESSAGE.avoid_patch=     Adjust before patch to absorb versioning (or avoid manual edit)
+SUBST_FILES.avoid_patch+=      Makefile
+SUBST_STAGE.avoid_patch=       pre-patch
+SUBST_SED.avoid_patch+=                -e 's/${PKGVERSION_NOREV}/@@PKGVERSION_NOREV@@/'
+
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fbab4c94f8c9 -r d5c1e6080713 textproc/aspell-da/distinfo
--- a/textproc/aspell-da/distinfo       Sat Apr 11 01:26:56 2015 +0000
+++ b/textproc/aspell-da/distinfo       Sat Apr 11 02:01:55 2015 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2013/04/09 02:33:38 rodent Exp $
+$NetBSD: distinfo,v 1.2 2015/04/11 02:01:55 mef Exp $
 
-SHA1 (aspell-da-1.7.30.tar.bz2) = 7b629f8a87840571ef29bbf312210f8a0e6bcbe2
-RMD160 (aspell-da-1.7.30.tar.bz2) = 278335a74a65d0b18d4e7e57400f4afa7552257c
-Size (aspell-da-1.7.30.tar.bz2) = 229478 bytes
-SHA1 (patch-aa) = 93f01850310b6b39ca31b607bcd2525125277eb7
+SHA1 (aspell-da-1.7.42.tar.bz2) = 3f5403f0a32e90085d829986db7db009977100cc
+RMD160 (aspell-da-1.7.42.tar.bz2) = af3b8a8cab07776c11a647102b29616bf654552b
+Size (aspell-da-1.7.42.tar.bz2) = 238132 bytes
+SHA1 (patch-aa) = da8496bc1643cb291ca2db038d8d299e956243e8
diff -r fbab4c94f8c9 -r d5c1e6080713 textproc/aspell-da/patches/patch-aa
--- a/textproc/aspell-da/patches/patch-aa       Sat Apr 11 01:26:56 2015 +0000
+++ b/textproc/aspell-da/patches/patch-aa       Sat Apr 11 02:01:55 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:38 rodent Exp $
+$NetBSD: patch-aa,v 1.2 2015/04/11 02:01:55 mef Exp $
 
---- Makefile.orig      2009-11-04 13:52:19.000000000 -0800
-+++ Makefile   2009-12-02 09:45:44.000000000 -0800
+--- Makefile.orig      2013-01-18 18:38:05.000000000 +0900
++++ Makefile   2015-04-11 10:43:20.000000000 +0900
 @@ -9,16 +9,14 @@ country_code=DK
  lang=da
- version=1.7.30
+ version=@@PKGVERSION_NOREV@@
  
 -dictdir=`aspell dump config | grep '^\# dict-dir current: ' | cut -d' ' -f4`
 -datadir=`aspell dump config | grep '^\# data-dir current: ' | cut -d' ' -f4`