Date: Thu, 6 Mar 2014 08:51:18 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347172 - head/japanese/kinput2 Message-ID: <201403060851.s268pI2B091124@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Thu Mar 6 08:51:18 2014 New Revision: 347172 URL: http://svnweb.freebsd.org/changeset/ports/347172 QAT: https://qat.redports.org/buildarchive/r347172/ Log: - STAGEDIR support. - Use new syntax for LIB_DEPENDS. Modified: head/japanese/kinput2/Makefile head/japanese/kinput2/pkg-plist (contents, props changed) Modified: head/japanese/kinput2/Makefile ============================================================================== --- head/japanese/kinput2/Makefile Thu Mar 6 08:22:38 2014 (r347171) +++ head/japanese/kinput2/Makefile Thu Mar 6 08:51:18 2014 (r347172) @@ -18,8 +18,6 @@ USE_XORG= ice sm x11 xaw xext xmu xpm xt SUB_FILES= Kinput2.conf PLIST_FILES= ${PLIST_ALL} -MAN1= kinput2.1 - OPTIONS_DEFINE= CANNA FREEWNN WNN6 WNN7 SJ3 TCP OPTIONS_DEFAULT=CANNA FREEWNN SJ3 CANNA_DESC= Canna support @@ -29,29 +27,29 @@ WNN7_DESC= Wnn7 support SJ3_DESC= SJ3 support TCP_DESC= TCP transport support (not needed for most cases) -LIB_DEPENDS.CANNA= canna16.1:${PORTSDIR}/japanese/canna-lib +CANNA_LIB_DEPENDS= libcanna16.so:${PORTSDIR}/japanese/canna-lib CONF.CANNA= '\#define UseCanna' \ CANNASRC=${LOCALBASE}/include \ CANNALIB="-L${LOCALBASE}/lib -lcanna16" -LIB_DEPENDS.WNN6= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib +WNN6_LIB_DEPENDS= libwnn6.so:${PORTSDIR}/japanese/Wnn6-lib CONF.WNN6= '\#define UseWnn' \ '\#define UseWnn6' \ WNNINCDIR=$(LOCALBASE)/include/wnn6/wnn \ WNNLIB="-L$(LOCALBASE)/lib -lwnn6 -lcrypt" -LIB_DEPENDS.WNN7= wnn7.1:${PORTSDIR}/japanese/Wnn7-lib +WNN7_LIB_DEPENDS= libwnn7.so:${PORTSDIR}/japanese/Wnn7-lib CONF.WNN7= '\#define UseWnn' \ '\#define UseWnn6' \ WNNINCDIR=$(LOCALBASE)/include/wnn7/wnn \ WNNLIB="-L$(LOCALBASE)/lib -lwnn7 -lcrypt" -LIB_DEPENDS.FREEWNN= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib +FREEWNN_LIB_DEPENDS= libwnn.so:${PORTSDIR}/japanese/FreeWnn-lib CONF.FREEWNN+= '\#define UseWnn' \ WNNINCDIR=$(LOCALBASE)/include/wnn \ WNNLIB="-L$(LOCALBASE)/lib -lwnn -lcrypt" -LIB_DEPENDS.SJ3= sj3lib.1:${PORTSDIR}/japanese/sj3-lib +SJ3_LIB_DEPENDS= libsj3lib.so:${PORTSDIR}/japanese/sj3-lib CONF.SJ3+= '\#define UseSj3' \ SJ3SRC=${LOCALBASE}/include \ SJ3LIB="-L${LOCALBASE}/lib -lsj3lib" \ @@ -76,7 +74,6 @@ PLIST.WNN= lib/X11/ccdef/ccdef.kinput2 lib/X11/ccdef/rule.katakana.egg \ lib/X11/ccdef/rule.kigou.egg -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MFREEWNN} || \ @@ -87,8 +84,6 @@ PLIST_ALL+= ${PLIST.WNN} .for I in ${OPTIONS_DEFINE:NTCP} .if ${PORT_OPTIONS:M${I}} -LIB_DEPENDS+= ${LIB_DEPENDS.${I}} -BUILD_DEPENDS+= ${BUILD_DEPENDS.${I}} CONF+= ${CONF.${I}} PLIST_ALL+= ${PLIST.${I}} .endif @@ -102,7 +97,4 @@ pre-configure: apply-slist ${INSTALL_DATA} ${WRKDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf ${PRINTF} "%s\n" ${CONF} > ${WRKSRC}/Kinput2_im.conf -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.mk> Modified: head/japanese/kinput2/pkg-plist ============================================================================== --- head/japanese/kinput2/pkg-plist Thu Mar 6 08:22:38 2014 (r347171) +++ head/japanese/kinput2/pkg-plist Thu Mar 6 08:51:18 2014 (r347172) @@ -1,3 +1,5 @@ +@comment $FreeBSD$ bin/kinput2 lib/X11/app-defaults/Kinput2 @dirrmtry lib/X11/ccdef +man/man1/kinput2.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403060851.s268pI2B091124>