ports/190396: [patch] japanese/kinput2 install failed if only CANNA option set

[Yasuhito FUTATSUKI]

>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
- at dirrmtry lib/X11/ccdef
+%%CCDEF%%@dirrmtry lib/X11/ccdef
 man/man1/kinput2.1.gz


>Release-Note:
>Audit-Trail:
>Unformatted: