CVS commit: pkgsrc/textproc/ispell-en_GB

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Mar 26 04:11:08 UTC 2021

Modified Files:
        pkgsrc/textproc/ispell-en_GB: Makefile PLIST

Log Message:
ispell-en_GB: generate usable dictionary files

Addresses PR pkg/55972, report and patch provided by Greg A. Woods,
additional adjustments by me. (Several people have noted that there
really should be a Makefile.common used here, but I'm not going to
touch more than this leaf package right now, since we're in a freeze.)


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/ispell-en_GB/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/ispell-en_GB/PLIST

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-en_GB/Makefile
diff -u pkgsrc/textproc/ispell-en_GB/Makefile:1.10 pkgsrc/textproc/ispell-en_GB/Makefile:1.11
--- pkgsrc/textproc/ispell-en_GB/Makefile:1.10  Thu Jan 28 22:35:12 2021
+++ pkgsrc/textproc/ispell-en_GB/Makefile       Fri Mar 26 04:11:08 2021
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2021/01/28 22:35:12 gutteridge Exp $
+# $NetBSD: Makefile,v 1.11 2021/03/26 04:11:08 gutteridge Exp $
 #
 
 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/
 
@@ -11,38 +12,29 @@ HOMEPAGE=   http://ficus-www.cs.ucla.edu/g
 COMMENT=       British dictionary for interactive spelling checker
 
 CONFLICTS+=    ispell-british-[0-9]*
-USE_TOOLS+=    yacc
 DEPENDS+=      ispell>=3.3.02:../../textproc/ispell
 
-PATCHDIR=      ${.CURDIR}/../../textproc/ispell/patches
 DISTINFO_FILE= ${.CURDIR}/../../textproc/ispell/distinfo
 
-BUILD_TARGET=  config.sh all-languages
+WRKSRC=        ${WRKDIR}/${DISTNAME}/languages/english
 
 DICT_LANG=     british
 
-MAKE_FLAGS+=   TMPDIR=${WRKDIR:Q}
-
 INSTALLATION_DIRS=     lib
-MAKE_JOBS_SAFE=                no
 
 OPSYSVARS+=    WORDS
 WORDS.SunOS=   /usr/dict/words
 WORDS.*=       /usr/share/dict/words
 
-do-configure:
-       cd ${WRKSRC};                                                   \
-       ${SED} -e 's|/usr/local|${PREFIX}|g' <local.h.bsd >local.h;     \
-       ${ECHO} "#define LANGUAGES \"{${DICT_LANG},MASTERDICTS=${DICT_LANG}.xlg,HASHFILES=${DICT_LANG}xlg.hash,EXTRADICT=}\""  >>local.h; \
-       ${ECHO} '#define MASTERHASH "${DICT_LANG}xlg.hash"'  >> local.h ;       \
-       ${ECHO} "#undef WORDS"  >> local.h ;                            \
-       ${ECHO} '#define WORDS   "${WORDS}"'  >> local.h ;              \
-       ${PRINTF} '#ifdef __sun\n#include<sys/types.h>\n#include<sys/dirent.h>\n#define USG 1\n#endif' >> local.h
+do-build:
+       cd ${WRKSRC};                                           \
+       ${MAKE} CONFIG= MUNCHLIST=${PREFIX}/bin/munchlist VARIANTS=british \
+         EXTRADICT=${WORDS} SHELLDEBUG=+vx AFFIXES=english.aff english.xlg+; \
+       ${MAKE} CONFIG= BUILDHASH=${PREFIX}/bin/buildhash EXTRADICT=${WORDS} \
+         AFFIXES=english.aff SHELLDEBUG=+vx xlg+.hash
 
 do-install:
-       ${CP} ${WRKSRC}/languages/${DICT_LANG}/${DICT_LANG}xlg.hash ${DESTDIR}${PREFIX}/lib
-       cd ${DESTDIR}${PREFIX}/lib;                                     \
-       ${RM} -f ${DICT_LANG}.hash;                                     \
-       ${LN} ${DICT_LANG}xlg.hash ${DICT_LANG}.hash
+       ${INSTALL_DATA} ${WRKSRC}/english.aff ${DESTDIR}${PREFIX}/lib/${DICT_LANG}.aff
+       ${INSTALL_DATA} ${WRKSRC}/xlg+.hash ${DESTDIR}${PREFIX}/lib/${DICT_LANG}.hash
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/ispell-en_GB/PLIST
diff -u pkgsrc/textproc/ispell-en_GB/PLIST:1.3 pkgsrc/textproc/ispell-en_GB/PLIST:1.4
--- pkgsrc/textproc/ispell-en_GB/PLIST:1.3      Sat May 25 23:46:51 2013
+++ pkgsrc/textproc/ispell-en_GB/PLIST  Fri Mar 26 04:11:08 2021
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2013/05/25 23:46:51 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/03/26 04:11:08 gutteridge Exp $
+lib/british.aff
 lib/british.hash
-lib/britishxlg.hash