Index: head/textproc/uim/Makefile =================================================================== --- head/textproc/uim/Makefile (revision 459233) +++ head/textproc/uim/Makefile (revision 459234) @@ -1,112 +1,112 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ PORTNAME= uim PORTVERSION= 1.8.6 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= textproc MASTER_SITES= https://github.com/uim/uim/releases/download/${PORTNAME}-${PORTVERSION}/ .if !defined(UIM_SLAVE) && defined(WITHOUT_X11) PKGNAMESUFFIX= -nox11 .endif MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Input method library BROKEN_aarch64= Fails to build: The collector has not been ported to this machine/OS combination USE_LDCONFIG= yes USE_GNOME+= glib20 intltool USES+= gettext gmake iconv libedit libtool pathfix pkgconfig perl5 tar:bzip2 USE_PERL5= build GNU_CONFIGURE= yes OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT= X11 .include .if ${PORT_OPTIONS:MX11} LIB_DEPENDS+= libXft.so:x11-fonts/libXft CONFIGURE_ARGS+= --with-x --with-xft .endif .if !defined(UIM_SLAVE) .if ${PORT_OPTIONS:MX11} USE_GNOME+= gtk20 CONFIGURE_ARGS+= --with-gtk2 .endif CONFIGURE_ARGS+= --enable-emacs --with-sj3 --with-canna --with-prime .endif CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include .if !defined(UIM_SLAVE) DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim DOCSDIR_SIGSCHEME= ${PREFIX}/share/doc/uim/sigscheme PLIST_SUB+= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" \ DOCSDIR_SIGSCHEME="${DOCSDIR_SIGSCHEME:S,^${PREFIX}/,,}" .endif .if empty(PORT_OPTIONS:MX11) PLIST_SUB+= X11="@comment " .else PLIST_SUB+= X11="" .endif .include .if ${ARCH} == "amd64" || ${ARCH} == "sparc64" CONFIGURE_ARGS+= --enable-storage=fatty .endif .for _x in x xft gtk2 qt anthy canna m17nlib prime scim dict .if ${CONFIGURE_ARGS:M--with-${_x}} == "" CONFIGURE_ARGS+=--without-${_x} .endif .endfor .for _x in gnome-applet kde-applet emacs pref .if ${CONFIGURE_ARGS:M--enable-${_x}} == "" CONFIGURE_ARGS+=--disable-${_x} .endif .endfor post-patch: ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/scm/skk-custom.scm do-build: .if !defined(UIM_SLAVE) .for d in replace sigscheme uim scm xim po fep emacs pixmaps tables cd ${WRKSRC}/${d} && ${MAKE_CMD} .endfor .if ${PORT_OPTIONS:MX11} cd ${WRKSRC}/gtk2/candwin && ${MAKE_CMD} .endif .endif do-install: .if !defined(UIM_SLAVE) cd ${WRKSRC} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-data-am .for d in sigscheme uim scm xim po fep emacs pixmaps tables cd ${WRKSRC}/${d} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install .endfor .if ${PORT_OPTIONS:MX11} cd ${WRKSRC}/gtk2/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install .endif .endif .if !defined(UIM_SLAVE) post-install: ${MKDIR} ${STAGEDIR}${DATADIR}/helperdata ${MKDIR} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${DOCSDIR_JA} ${INSTALL_DATA} ${WRKSRC}/doc/KEY ${STAGEDIR}${DOCSDIR}/KEY ${INSTALL_DATA} ${WRKSRC}/fep/README ${STAGEDIR}${DOCSDIR}/README.fep ${INSTALL_DATA} ${WRKSRC}/fep/README ${STAGEDIR}${DOCSDIR}/README.key ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.fep ${INSTALL_DATA} ${WRKSRC}/xim/README ${STAGEDIR}${DOCSDIR}/README.xim .endif .include Index: head/textproc/uim/files/patch-xim_main.cpp =================================================================== --- head/textproc/uim/files/patch-xim_main.cpp (nonexistent) +++ head/textproc/uim/files/patch-xim_main.cpp (revision 459234) @@ -0,0 +1,15 @@ +error: invalid suffix on literal; C++11 requires a space between literal and identifier + [-Wreserved-user-defined-literal] + #define VERSION_NAME "uim-xim under the way! Version "PACKAGE_VERSION"\n" + +--- xim/main.cpp.orig 2018-01-17 10:10:47 UTC ++++ xim/main.cpp +@@ -65,7 +65,7 @@ int g_option_mask; + int scr_width, scr_height; + int host_byte_order; + +-#define VERSION_NAME "uim-xim under the way! Version "PACKAGE_VERSION"\n" ++#define VERSION_NAME "uim-xim under the way! Version " PACKAGE_VERSION "\n" + const char *version_name=VERSION_NAME; + const char *usage= + "--help , --version :Show usage or version\n" Property changes on: head/textproc/uim/files/patch-xim_main.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property