From owner-svn-ports-head@FreeBSD.ORG Sat Aug 31 11:17:08 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4DA15776; Sat, 31 Aug 2013 11:17:08 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2CCCB2A1A; Sat, 31 Aug 2013 11:17:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7VBH8dp004497; Sat, 31 Aug 2013 11:17:08 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7VBH7f5004495; Sat, 31 Aug 2013 11:17:07 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201308311117.r7VBH7f5004495@svn.freebsd.org> From: Alexey Dokuchaev Date: Sat, 31 Aug 2013 11:17:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325792 - head/japanese/skkinput3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Aug 2013 11:17:08 -0000 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 .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 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%%