git: 09b65d60120f - main - textproc/aspell: garbage-collect DOCS option (now useless)

From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Wed, 31 Jan 2024 04:39:14 UTC
The branch main has been updated by danfe:

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

commit 09b65d60120f8d75a7d799e4f8ea02468334d3e7
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2024-01-31 04:38:02 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2024-01-31 04:38:02 +0000

    textproc/aspell: garbage-collect DOCS option (now useless)
    
    As of r332672, manpages are always installed and condition
    .if ${PORT_OPTIONS:MDOCS} had been removed; since the port
    does not install any other documentation, drop it from the
    option list as well.  While here, sort INFO alphabetically
    and GC the linking gimmick added for version 0.50.4.1 back
    in 2003 (r94146, now commit ed1d8c2ac3336): these days, it
    builds and links fine regardless of the optimization level.
    
    PR:     252357
    Fixes:  f027257d68fb6
---
 textproc/aspell/Makefile | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 5aa71287c1c6..a841ca9e8422 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -12,17 +12,12 @@ WWW=		http://aspell.net/
 LICENSE=	LGPL21
 
 USES=		cpe gmake iconv libtool ncurses perl5 shebangfix
-
-OPTIONS_DEFINE=	NLS DOCS
-OPTIONS_SUB=	yes
-
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-dict-dir=${DATADIR}	\
 		--enable-docdir=${DOCSDIR}	\
 		--enable-curses="${NCURSESLIBS}" \
 		--enable-static
-
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	scripts/aspell-import
 CPE_VENDOR=	gnu
@@ -32,18 +27,14 @@ VERINST=	${PORTVERSION:R:R}
 SUB_FILES=	aspell.ver
 PLIST_SUB=	VER=${VERINST}
 SUB_LIST=	VERINST=${VERINST}
-INFO=	aspell-dev aspell
+INFO=		aspell aspell-dev
+
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-.include <bsd.port.options.mk>
-
-# Does not link without at least -O
-.if !defined(CFLAGS) || ${CFLAGS:M-O*} == ""
-CFLAGS+=		-O
-.endif
-
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/aspell.ver ${STAGEDIR}${PREFIX}/etc