CVS commit: pkgsrc/textproc

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Jun 10 23:43:26 UTC 2021

Modified Files:
        pkgsrc/textproc/ispell: Makefile
        pkgsrc/textproc/ispell-en_GB: Makefile
Added Files:
        pkgsrc/textproc/ispell: Makefile.common

Log Message:
ispell & ispell-en_GB: use Makefile.common

Centralize some basics so ispell-en_GB doesn't need to be manually
adjusted every time ispell gets an update. Addresses a lingering issue
from PR pkg/55972 noted by Greg A. Woods.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/textproc/ispell/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/ispell/Makefile.common
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/ispell-en_GB/Makefile

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

Modified files:

Index: pkgsrc/textproc/ispell/Makefile
diff -u pkgsrc/textproc/ispell/Makefile:1.30 pkgsrc/textproc/ispell/Makefile:1.31
--- pkgsrc/textproc/ispell/Makefile:1.30        Thu Jun 10 10:10:47 2021
+++ pkgsrc/textproc/ispell/Makefile     Thu Jun 10 23:43:26 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2021/06/10 10:10:47 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2021/06/10 23:43:26 gutteridge Exp $
+
+.include       "Makefile.common"
 
-DISTNAME=      ispell-3.4.04
 CATEGORIES=    textproc
 MASTER_SITES=  https://www.cs.hmc.edu/~geoff/tars/
 
@@ -21,7 +22,6 @@ MAKE_JOBS_SAFE=       no
 CFLAGS+=       -DHAVE_INTTYPES_H
 .endif
 
-
 .if ${OPSYS} == "SunOS"
 EXTRADICT=     /usr/dict/words
 .else

Index: pkgsrc/textproc/ispell-en_GB/Makefile
diff -u pkgsrc/textproc/ispell-en_GB/Makefile:1.11 pkgsrc/textproc/ispell-en_GB/Makefile:1.12
--- pkgsrc/textproc/ispell-en_GB/Makefile:1.11  Fri Mar 26 04:11:08 2021
+++ pkgsrc/textproc/ispell-en_GB/Makefile       Thu Jun 10 23:43:26 2021
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2021/03/26 04:11:08 gutteridge Exp $
-#
+# $NetBSD: Makefile,v 1.12 2021/06/10 23:43:26 gutteridge Exp $
+
+.include       "../../textproc/ispell/Makefile.common"
 
-DISTNAME=      ispell-3.4.02
 PKGNAME=       ${DISTNAME:S/-/-${DICT_LANG}-/1}
-PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  http://fmg-www.cs.ucla.edu/geoff/tars/
 
@@ -14,8 +13,6 @@ COMMENT=      British dictionary for interact
 CONFLICTS+=    ispell-british-[0-9]*
 DEPENDS+=      ispell>=3.3.02:../../textproc/ispell
 
-DISTINFO_FILE= ${.CURDIR}/../../textproc/ispell/distinfo
-
 WRKSRC=        ${WRKDIR}/${DISTNAME}/languages/english
 
 DICT_LANG=     british

Added files:

Index: pkgsrc/textproc/ispell/Makefile.common
diff -u /dev/null pkgsrc/textproc/ispell/Makefile.common:1.1
--- /dev/null   Thu Jun 10 23:43:26 2021
+++ pkgsrc/textproc/ispell/Makefile.common      Thu Jun 10 23:43:26 2021
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile.common,v 1.1 2021/06/10 23:43:26 gutteridge Exp $
+
+# used by textproc/ispell/Makefile
+# used by textproc/ispell-en_GB/Makefile
+
+DISTNAME=      ispell-3.4.04
+
+DISTINFO_FILE= ${.CURDIR}/../../textproc/ispell/distinfo