Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Dec 2023 11:40:38 GMT
From:      Gordon Bergling <gbe@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: bb1f23aa2db1 - main - bsd-spell: Install as bspell instead of spell
Message-ID:  <202312191140.3BJBecQK039526@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by gbe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bb1f23aa2db1e409fe2538f2895dd1d2de6ef790

commit bb1f23aa2db1e409fe2538f2895dd1d2de6ef790
Author:     Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2023-12-19 11:40:06 +0000
Commit:     Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2023-12-19 11:40:06 +0000

    bsd-spell: Install as bspell instead of spell
    
    Install bsd-spell as bspell instead of spell since it otherwise
    conflicts with textproc/aspell-ispell.
    
    While here switch to pkg-plist for the pkg content listing.
    
    PR:     274217
    Reviewed by:    fernape
    Tested by:      fernape
    Approved by:    fernape
    Differential Revision:  https://reviews.freebsd.org/D43083
---
 textproc/bsd-spell/Makefile  | 11 ++---------
 textproc/bsd-spell/pkg-plist | 10 ++++++++++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/textproc/bsd-spell/Makefile b/textproc/bsd-spell/Makefile
index d94af4fb7edd..162fba1d8d9b 100644
--- a/textproc/bsd-spell/Makefile
+++ b/textproc/bsd-spell/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	bsd-spell
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.0.1
 CATEGORIES=	textproc
@@ -14,18 +15,10 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	gbergling
 GH_PROJECT=	bsdspell
 
-PLIST_FILES=	libexec/spellprog bin/spell bin/deroff \
-		man/man1/spell.1.gz man/man1/deroff.1.gz \
-		share/dict/american \
-		share/dict/british \
-		share/dict/special.4bsd \
-		share/dict/special.math \
-		share/dict/stop
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/usr.bin/spell/spellprog ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/usr.bin/deroff/deroff ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/usr.bin/spell/spell.sh ${STAGEDIR}${PREFIX}/bin/spell
+	${INSTALL_SCRIPT} ${WRKSRC}/usr.bin/spell/spell.sh ${STAGEDIR}${PREFIX}/bin/bspell
 
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/american ${STAGEDIR}${PREFIX}/share/dict
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/british ${STAGEDIR}${PREFIX}/share/dict
diff --git a/textproc/bsd-spell/pkg-plist b/textproc/bsd-spell/pkg-plist
new file mode 100644
index 000000000000..93d5e4177fcd
--- /dev/null
+++ b/textproc/bsd-spell/pkg-plist
@@ -0,0 +1,10 @@
+libexec/spellprog
+bin/bspell
+bin/deroff
+man/man1/spell.1.gz
+man/man1/deroff.1.gz
+share/dict/american
+share/dict/british
+share/dict/special.4bsd
+share/dict/special.math
+share/dict/stop



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312191140.3BJBecQK039526>