Date: Sat, 31 Aug 2013 11:17:07 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325792 - head/japanese/skkinput3 Message-ID: <201308311117.r7VBH7f5004495@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Aug 31 11:17:07 2013 New Revision: 325792 URL: http://svnweb.freebsd.org/changeset/ports/325792 Log: - Make it fetchable again by using SFJP macro instead of hand-made URL - Utilize PORTDOCS variable and thus offload pkg-plist - Perform some miscellaneous Makefile cleanups while I am here Modified: head/japanese/skkinput3/Makefile head/japanese/skkinput3/pkg-plist Modified: head/japanese/skkinput3/Makefile ============================================================================== --- head/japanese/skkinput3/Makefile Sat Aug 31 11:14:41 2013 (r325791) +++ head/japanese/skkinput3/Makefile Sat Aug 31 11:17:07 2013 (r325792) @@ -5,35 +5,34 @@ PORTNAME= skkinput3 PORTVERSION= 3.0.6 PORTREVISION= 2 CATEGORIES= japanese x11 -MASTER_SITES= http://downloads.sourceforge.jp/skkinput3/2222/ +MASTER_SITES= SFJP/skkinput3/2222 DISTNAME= skkinput-${PORTVERSION} MAINTAINER= koma2@lovepeers.org COMMENT= SKK-like Japanese input method for X11 -BROKEN= fails to fetch/checksum - USES= imake USE_GCC= any +USE_CSTD= gnu89 USE_XORG= ice sm x11 xext xmu xt +PORTDOCS= *.jis dot.skkinput ChangeLog + OPTIONS_DEFINE= SKK10 OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= DBSKKD RSKKSERV -RG1_DESC= Skkserver Selection + +RG1_DESC= Skkserver selection DBSKKD_DESC= Use ja-dbskkd-cdb as skkserver RSKKSERV_DESC= Use ja-rskkserv as skkserver -SKK10_DESC= Use SKK10 elisps -USE_CSTD= gnu89 - -NO_INSTALL_MANPAGES= yes +SKK10_DESC= Install SKK10 elisp files .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSKK10} -PLIST_SUB= SKK8="@comment " SKK10="" +PLIST_SUB= SKK8="@comment " SKK10="" .else -PLIST_SUB= SKK8="" SKK10="@comment " +PLIST_SUB= SKK8="" SKK10="@comment " .endif .if ${PORT_OPTIONS:MDBSKKD} @@ -44,19 +43,17 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/rskkse RUN_DEPENDS= ${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skkserv .endif -DOCS= *.jis dot.skkinput ChangeLog - -.if ${PORT_OPTIONS:MSKK10} post-patch: - ${REINPLACE_CMD} -e '/\(#define.*UseSkk8\)/ s/^/XCOMM /' \ - -e '/XCOMM.*#define.*UseSkk10/ s/XCOMM[[:space:]]*//' \ - ${WRKSRC}/Skkinput.conf +.if ${PORT_OPTIONS:MSKK10} + @${REINPLACE_CMD} -e '/\(#define.*UseSkk8\)/ s/^/XCOMM /' \ + -e '/XCOMM.*#define.*UseSkk10/ s/XCOMM[[:space:]]*//' \ + ${WRKSRC}/Skkinput.conf .endif -.if ${PORT_OPTIONS:MDOCS} post-install: - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/japanese/skkinput3/pkg-plist ============================================================================== --- head/japanese/skkinput3/pkg-plist Sat Aug 31 11:14:41 2013 (r325791) +++ head/japanese/skkinput3/pkg-plist Sat Aug 31 11:17:07 2013 (r325792) @@ -13,8 +13,3 @@ lib/X11/skkinput3/skk-startup.el %%SKK10%%lib/X11/skkinput3/skk-server.el %%SKK10%%lib/X11/skkinput3/skk-vars.el @dirrm lib/X11/skkinput3 -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README-lisp.jis -%%PORTDOCS%%%%DOCSDIR%%/README.jis -%%PORTDOCS%%%%DOCSDIR%%/dot.skkinput -%%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308311117.r7VBH7f5004495>