svn commit: r355768 - head/japanese/kinput2
Hiroki Sato
hrs at FreeBSD.org
Fri May 30 02:16:35 UTC 2014
Author: hrs
Date: Fri May 30 02:16:34 2014
New Revision: 355768
URL: http://svnweb.freebsd.org/changeset/ports/355768
QAT: https://qat.redports.org/buildarchive/r355768/
Log:
- Fix build when only CANNA is defined in PORT_OPTIONS.
- Simplify PORT_OPTIONS handling.
PR: ports/190396
Deleted:
head/japanese/kinput2/pkg-plist
Modified:
head/japanese/kinput2/Makefile
Modified: head/japanese/kinput2/Makefile
==============================================================================
--- head/japanese/kinput2/Makefile Fri May 30 02:14:04 2014 (r355767)
+++ head/japanese/kinput2/Makefile Fri May 30 02:16:34 2014 (r355768)
@@ -16,51 +16,57 @@ MAKE_JOBS_UNSAFE= yes
USES= imake
USE_XORG= ice sm x11 xaw xext xmu xpm xt
SUB_FILES= Kinput2.conf
-PLIST_FILES= ${PLIST_ALL}
+PLIST_FILES= bin/kinput2 lib/X11/app-defaults/Kinput2 man/man1/kinput2.1.gz
OPTIONS_DEFINE= CANNA FREEWNN WNN6 WNN7 SJ3 TCP
OPTIONS_DEFAULT=CANNA FREEWNN SJ3
-CANNA_DESC= Canna support
-FREEWNN_DESC= FreeWnn support
-WNN6_DESC= Wnn6 support
-WNN7_DESC= Wnn7 support
-SJ3_DESC= SJ3 support
-TCP_DESC= TCP transport support (not needed for most cases)
+TCP_DESC= TCP transport support (not needed for most cases)
+CANNA_DESC= Canna support
CANNA_LIB_DEPENDS= libcanna16.so:${PORTSDIR}/japanese/canna-lib
-CONF.CANNA= '\#define UseCanna' \
+CANNA_CONF= '\#define UseCanna' \
CANNASRC=${LOCALBASE}/include \
CANNALIB="-L${LOCALBASE}/lib -lcanna16"
+WNN6_DESC= Wnn6 support
WNN6_LIB_DEPENDS= libwnn6.so:${PORTSDIR}/japanese/Wnn6-lib
-CONF.WNN6= '\#define UseWnn' \
+WNN6_CONF= '\#define UseWnn' \
'\#define UseWnn6' \
WNNINCDIR=$(LOCALBASE)/include/wnn6/wnn \
WNNLIB="-L$(LOCALBASE)/lib -lwnn6 -lcrypt"
+WNN6_PLIST_FILES= ${WNN_PLIST_FILES}
+WNN6_PLIST_DIRS= ${WNN_PLIST_DIRS}
+WNN7_DESC= Wnn7 support
WNN7_LIB_DEPENDS= libwnn7.so:${PORTSDIR}/japanese/Wnn7-lib
-CONF.WNN7= '\#define UseWnn' \
+WNN7_CONF= '\#define UseWnn' \
'\#define UseWnn6' \
WNNINCDIR=$(LOCALBASE)/include/wnn7/wnn \
WNNLIB="-L$(LOCALBASE)/lib -lwnn7 -lcrypt"
+WNN7_PLIST_FILES= ${WNN_PLIST_FILES}
+WNN7_PLIST_DIRS= ${WNN_PLIST_DIRS}
+FREEWNN_DESC= FreeWnn support
FREEWNN_LIB_DEPENDS= libwnn.so:${PORTSDIR}/japanese/FreeWnn-lib
-CONF.FREEWNN+= '\#define UseWnn' \
+FREEWNN_CONF= '\#define UseWnn' \
WNNINCDIR=$(LOCALBASE)/include/wnn \
WNNLIB="-L$(LOCALBASE)/lib -lwnn -lcrypt"
+FREEWNN_PLIST_FILES= ${WNN_PLIST_FILES}
+FREEWNN_PLIST_DIRS= ${WNN_PLIST_DIRS}
+SJ3_DESC= SJ3 support
SJ3_LIB_DEPENDS= libsj3lib.so:${PORTSDIR}/japanese/sj3-lib
-CONF.SJ3+= '\#define UseSj3' \
+SJ3_CONF= '\#define UseSj3' \
SJ3SRC=${LOCALBASE}/include \
SJ3LIB="-L${LOCALBASE}/lib -lsj3lib" \
SJ3DEF_DIR=\$${LIBDIR}/ccdef
-PLIST.SJ3= lib/X11/ccdef/sjhk \
+SJ3_PLIST_FILES= lib/X11/ccdef/sjhk \
lib/X11/ccdef/sjrc \
lib/X11/ccdef/sjrk \
lib/X11/ccdef/sjsb \
lib/X11/ccdef/sjzh
-PLIST.WNN= lib/X11/ccdef/ccdef.kinput2 \
+WNN_PLIST_FILES= lib/X11/ccdef/ccdef.kinput2 \
lib/X11/ccdef/rule.eggfunc \
lib/X11/ccdef/rule.func \
lib/X11/ccdef/rule.greek \
@@ -73,24 +79,17 @@ PLIST.WNN= lib/X11/ccdef/ccdef.kinput2
lib/X11/ccdef/rule.hiragana.egg \
lib/X11/ccdef/rule.katakana.egg \
lib/X11/ccdef/rule.kigou.egg
+WNN_PLIST_DIRS= lib/X11/ccdef
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MFREEWNN} || \
- ${PORT_OPTIONS:MWNN6} || \
- ${PORT_OPTIONS:MWNN7}
-PLIST_ALL+= ${PLIST.WNN}
-.endif
-
.for I in ${OPTIONS_DEFINE:NTCP}
.if ${PORT_OPTIONS:M${I}}
-CONF+= ${CONF.${I}}
-PLIST_ALL+= ${PLIST.${I}}
+CONF+= ${${I}_CONF}
.endif
.endfor
-
.if !${PORT_OPTIONS:MTCP}
-CONF+= TRANSPORTDEFS="-DNO_TCP_TRANSPORT"
+CONF+= TRANSPORTDEFS="-DNO_TCP_TRANSPORT"
.endif
pre-configure: apply-slist
More information about the svn-ports-all
mailing list