Attachment 251801 Details for Bug 279386 – + some tweaks

[patch] + some tweaks

skkinput3.diff (text/plain), 3.18 KB, created by Vladimir Druzenko on 2024-06-30 15:49:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2024-06-30 15:49:42 UTC

Size: 3.18 KB

patch

obsolete

>diff --git a/japanese/skkinput3/Makefile b/japanese/skkinput3/Makefile
>index 8329e0b9318a..cc3d01c19f87 100644
>--- a/japanese/skkinput3/Makefile
>+++ b/japanese/skkinput3/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	skkinput3
> PORTVERSION=	3.0.6
>-PORTREVISION=	10
>+PORTREVISION=	11
> CATEGORIES=	japanese x11
> MASTER_SITES=	OSDN/${PORTNAME}
> DISTNAME=	skkinput-${PORTVERSION}
>@@ -9,37 +9,37 @@ MAINTAINER=	koma2@lovepeers.org
> COMMENT=	SKK-like Japanese input method for X11
> WWW=		https://sourceforge.jp/projects/skkinput3/
> 
>+LICENSE=	GPLv2+
>+LICENSE_FILE=	${WRKSRC}/GPL
>+
> USES=		imake xorg
>-USE_GCC=	yes
> USE_CSTD=	gnu89
>+USE_GCC=	yes
> USE_XORG=	ice sm x11 xext xmu xt
> MAKE_JOBS_UNSAFE=	yes
> 
> PORTDOCS=	*.jis dot.skkinput ChangeLog
> 
>-OPTIONS_DEFINE=	SKK10 DOCS
>-OPTIONS_RADIO=	SKKSERVER
>-OPTIONS_RADIO_SKKSERVER=	DBSKKD RSKKSERV
>+OPTIONS_DEFINE=		DOCS SKK10
>+OPTIONS_DEFAULT=	SKK9
>+OPTIONS_RADIO=		SKKSERVER
>+OPTIONS_RADIO_SKKSERVER=	DBSKKD SKK9
>+OPTIONS_SUB=		yes
> 
>-SKKSERVER_DESC=	Skkserver selection
> DBSKKD_DESC=	Use ja-dbskkd-cdb as skkserver
>-RSKKSERV_DESC=	Use ja-rskkserv as skkserver
> SKK10_DESC=	Install SKK10 elisp files
>+SKK9_DESC=	Use ja-skkserv as skkserver
>+SKKSERVER_DESC=	Skkserver selection
>+
>+DBSKKD_RUN_DEPENDS=	${LOCALBASE}/libexec/dbskkd-cdb:japanese/dbskkd-cdb
>+SKK9_RUN_DEPENDS=	${LOCALBASE}/sbin/skkserv:japanese/skkserv
> 
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MSKK10}
>-PLIST_SUB+=	SKK8="@comment " SKK10=""
>-.else
>-PLIST_SUB+=	SKK8="" SKK10="@comment "
>-.endif
>-
>-.if ${PORT_OPTIONS:MDBSKKD}
>-RUN_DEPENDS=	${LOCALBASE}/libexec/dbskkd-cdb:japanese/dbskkd-cdb
>-.elif ${PORT_OPTIONS:MRSKKSERV}
>-RUN_DEPENDS=	${LOCALBASE}/libexec/rskkserv:japanese/rskkserv
>+PLIST_SUB+=	SKK8="@comment "
> .else
>-RUN_DEPENDS=	${LOCALBASE}/sbin/skkserv:japanese/skkserv
>+PLIST_SUB+=	SKK8=""
> .endif
> 
> post-patch:
>@@ -49,7 +49,7 @@ post-patch:
> 			${WRKSRC}/Skkinput.conf
> .endif
> 
>-post-install:
>+post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
> 
>diff --git a/japanese/skkinput3/files/patch-Imakefile b/japanese/skkinput3/files/patch-Imakefile
>index 311153b2e29a..02e5235f483a 100644
>--- a/japanese/skkinput3/files/patch-Imakefile
>+++ b/japanese/skkinput3/files/patch-Imakefile
>@@ -1,6 +1,6 @@
>---- Imakefile.orig	Sun Jul 21 02:47:26 2002
>-+++ Imakefile	Wed Aug 14 15:48:59 2002
>-@@ -23,8 +23,8 @@
>+--- Imakefile.orig	2002-12-06 16:48:21 UTC
>++++ Imakefile
>+@@ -37,8 +37,8 @@ OBJS            = main.o
>  SRCS            = main.c
>  OBJS            = main.o
>  
>diff --git a/japanese/skkinput3/files/patch-Skkinput.conf b/japanese/skkinput3/files/patch-Skkinput.conf
>index 92dfc41f3f06..5634f584f569 100644
>--- a/japanese/skkinput3/files/patch-Skkinput.conf
>+++ b/japanese/skkinput3/files/patch-Skkinput.conf
>@@ -1,5 +1,5 @@
>---- Skkinput.conf.orig	Fri Jan 10 23:57:00 2003
>-+++ Skkinput.conf	Tue Jan 21 21:06:51 2003
>+--- Skkinput.conf.orig	2003-01-30 16:38:00 UTC
>++++ Skkinput.conf
> @@ -1,6 +1,6 @@
>  /*	skk.el, init.el install directory
>   */
>@@ -8,7 +8,7 @@
>  
>  /*	If you want skk10.62a compatible mode, 
>   *	uncomment UseSkk10 and comment UseSkk8.
>-@@ -10,7 +10,7 @@
>+@@ -10,7 +10,7 @@ XCOMM #define UseSkk10	YES
>  
>  /*	 Skkinput3 Window uses these fonts. 
>   */

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 279386: 251069 | 251801