summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorgutteridge <gutteridge@pkgsrc.org>2021-06-10 23:43:26 +0000
committergutteridge <gutteridge@pkgsrc.org>2021-06-10 23:43:26 +0000
commit1ca6ee54a3c6612c3dfdea4995b0afa1176356c7 (patch)
tree4e68da2acf0d2b3d121a9c3397ad30a17eb1f19f /textproc
parent6c60441e1b31a50dfd23ff4167b28bba86326d03 (diff)
downloadpkgsrc-1ca6ee54a3c6612c3dfdea4995b0afa1176356c7.tar.gz
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.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/ispell-en_GB/Makefile9
-rw-r--r--textproc/ispell/Makefile6
-rw-r--r--textproc/ispell/Makefile.common8
3 files changed, 14 insertions, 9 deletions
diff --git a/textproc/ispell-en_GB/Makefile b/textproc/ispell-en_GB/Makefile
index cff67ed4aec..f072f71f5c0 100644
--- a/textproc/ispell-en_GB/Makefile
+++ b/textproc/ispell-en_GB/Makefile
@@ -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 interactive spelling checker
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
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index f186e203803..7dd9d81d56f 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -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
diff --git a/textproc/ispell/Makefile.common b/textproc/ispell/Makefile.common
new file mode 100644
index 00000000000..b16c7f88120
--- /dev/null
+++ b/textproc/ispell/Makefile.common
@@ -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