From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 30 00:20:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 ESMTPS id A1728C59 for ; Fri, 30 May 2014 00:20:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D6B1276A for ; Fri, 30 May 2014 00:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4U0K0Gn032867 for ; Fri, 30 May 2014 00:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4U0K0iF032866; Fri, 30 May 2014 00:20:00 GMT (envelope-from gnats) Resent-Date: Fri, 30 May 2014 00:20:00 GMT Resent-Message-Id: <201405300020.s4U0K0iF032866@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yasuhito FUTATSUKI Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 208AEBEC for ; Fri, 30 May 2014 00:18:18 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0D4142760 for ; Fri, 30 May 2014 00:18:18 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4U0IGm9031317 for ; Fri, 30 May 2014 00:18:16 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4U0IGxx031313; Fri, 30 May 2014 00:18:16 GMT (envelope-from nobody) Message-Id: <201405300018.s4U0IGxx031313@cgiserv.freebsd.org> Date: Fri, 30 May 2014 00:18:16 GMT From: Yasuhito FUTATSUKI To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190396: [patch] japanese/kinput2 install failed if only CANNA option set X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 May 2014 00:20:00 -0000 >Number: 190396 >Category: ports >Synopsis: [patch] japanese/kinput2 install failed if only CANNA option set >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri May 30 00:20:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Yasuhito FUTATSUKI >Release: FreeBSD 10.0-RELEASE-p3 >Organization: DEBUG, a users group of *BSD, in Japan >Environment: FreeBSD example.example.jp 10.0-RELEASE-p3 FreeBSD 10.0-RELEASE-p3 #0 r266615: Sun May 25 12:32:03 JST 2014 root@:/usr/obj/usr/src/sys/GENERIC amd64 >Description: make install failed if CANNA option set and any of SJ3, FREEWNN, WNN6, WNN7 options don't set due to ${LOCALBASE}/lib/X11/ccdef handling in pkg-plist. >How-To-Repeat: Do make config, and set CANNA option, unset FREEWNN, WNN6, WNN7, SJ3 options. Then make install. >Fix: Apply the patch attached below. Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (revision 355534) +++ Makefile (working copy) @@ -89,6 +89,15 @@ .endif .endfor +.if ${PORT_OPTIONS:MSJ3} || \ + ${PORT_OPTIONS:MFREEWNN} || \ + ${PORT_OPTIONS:MWNN6} || \ + ${PORT_OPTIONS:MWNN7} +PLIST_SUB+= CCDEF="" +.else +PLIST_SUB+= CCDEF="@comment " +.endif + .if !${PORT_OPTIONS:MTCP} CONF+= TRANSPORTDEFS="-DNO_TCP_TRANSPORT" .endif Index: pkg-plist =================================================================== --- pkg-plist (revision 355534) +++ pkg-plist (working copy) @@ -1,4 +1,4 @@ bin/kinput2 lib/X11/app-defaults/Kinput2 -@dirrmtry lib/X11/ccdef +%%CCDEF%%@dirrmtry lib/X11/ccdef man/man1/kinput2.1.gz >Release-Note: >Audit-Trail: >Unformatted: