Re: git: 51ebcb95f10d - main - japanese/skkinput: Remove invalid option

On 2024-07-03T00:27:25.000+02:00, Vladimir Druzenko <vvd@FreeBSD.org>
wrote:

> The branch main has been updated by vvd:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=51ebcb95f10d11c6a432f174424b866ff557b5dc
> 
> commit 51ebcb95f10d11c6a432f174424b866ff557b5dc
> 
> Author:     mew14930xvi <mew14930xvi@inbox.lv>
> 
> AuthorDate: 2024-07-02 22:11:50 +0000
> 
> Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
> 
> CommitDate: 2024-07-02 22:26:16 +0000
> 
>     japanese/skkinput: Remove invalid option
> 
>     
> 
>     Remove RSKKSERV option (Depends on japanese/rskkserv expired in 2014-09)
> 
>     Add LICENSE_FILE
> 
>     Add japanese/skkserv option
> 
>     If not selected in the options, do not install dictionary server
> 
>     Switch post-install to post-install-DOCS-on
> 
>     
> 
>     PR:             279374
> 
>     Approved by:    koma2@lovepeers.org (maintainer, timeout > 1 month)
> 
> ---
> 
>  japanese/skkinput/Makefile | 31 +++++++++++++------------------
> 
>  1 file changed, 13 insertions(+), 18 deletions(-)
> 
> diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile
> 
> index 58c03328d5e6..27305c5a9c13 100644
> 
> --- a/japanese/skkinput/Makefile
> 
> +++ b/japanese/skkinput/Makefile
> 
> @@ -1,6 +1,6 @@
> 
>  PORTNAME=    skkinput
> 
>  PORTVERSION=    2.06.4
> 
> -PORTREVISION=    3
> 
> +PORTREVISION=    4
> 
>  CATEGORIES=    japanese x11
> 
>  MASTER_SITES=    OSDN/skkinput2
> 
>  
> 
> @@ -8,7 +8,8 @@ MAINTAINER=    koma2@lovepeers.org
> 
>  COMMENT=    SKK-like Japanese input method for X11
> 
>  WWW=        http://skkinput2.sourceforge.jp/
> 
>  
> 
> -LICENSE=    GPLv2
> 
> +LICENSE=    GPLv2+
> 
> +LICENSE_FILE=    ${WRKSRC}/GPL
> 
>  
> 
>  USES=        imake xorg
> 
>  USE_XORG=    ice sm x11 xext xt xmu
> 
> @@ -17,24 +18,18 @@ PLIST_FILES=    bin/skkinput lib/X11/app-defaults/Skkinput \
> 
>          share/man/ja/man1/skkinput.1.gz share/man/man1/skkinput.1.gz
> 
>  PORTDOCS=    *.jis ChangeLog skkinputlisp.doc dot.skkinput
> 
>  
> 
> -OPTIONS_DEFINE=    DOCS
> 
> -OPTIONS_RADIO=    SKKSERVER
> 
> -OPTIONS_RADIO_SKKSERVER=DBSKKD RSKKSERV
> 
> -SKKSERVER_DESC=    Skkserver selection
> 
> -DBSKKD_DESC=    Use ja-dbskkd-cdb as skkserver
> 
> -RSKKSERV_DESC=    Use ja-rskkserv as skkserver
> 
> +OPTIONS_DEFINE=            DOCS
> 
> +OPTIONS_DEFAULT=        SKK9
> 
> +OPTIONS_RADIO=            SKKSERVER
> 
> +OPTIONS_RADIO_SKKSERVER=    DBSKKD SKK9
> 
> +DBSKKD_DESC=            Use ja-dbskkd-cdb as skkserver
> 
> +SKK9_DESC=            Use ja-skkserv as skkserver
> 
> +SKKSERVER_DESC=            Skkserver selection
> 
>  
> 
> -.include <bsd.port.options.mk> [http://bsd.port.options.mk>];
> 
> +DBSKKD_RUN_DEPENDS=        ${LOCALBASE}/libexec/dbskkd-cdb:japanese/dbskkd-cdb
> 
> +SKK9_RUN_DEPENDS=        ${LOCALBASE}/sbin/skkserv:japanese/skkserv
> 
>  
> 
> -.if ${PORT_OPTIONS:MDBSKKD}
> 
> -RUN_DEPENDS=    ${LOCALBASE}/libexec/dbskkd-cdb:japanese/dbskkd-cdb
> 
> -.elif ${PORT_OPTIONS:MRSKKSERV}
> 
> -RUN_DEPENDS=    ${LOCALBASE}/libexec/rskkserv:japanese/rskkserv
> 
> -.else
> 
> -RUN_DEPENDS=    ${LOCALBASE}/sbin/skkserv:japanese/skkserv
> 
> -.endif
> 
> -
> 
> -post-install:
> 
> +post-install-DOCS-on:
> 
>      @${MKDIR} ${STAGEDIR}${DOCSDIR}
> 
>  # One of the docfiles lives in its own subdirectory; link it relative to
> 
>  # ${WRKSRC} to simplify installation routine (install all files at once)

Hi,

Please use a better describing short commit message as a lot more is
changed than just removing an option. This is also true to the other
skkinput port.

Best regards,

Daniel