diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile index 8731c9d0fd1..d5c118e1634 100644 --- a/chinese/libchewing/Makefile +++ b/chinese/libchewing/Makefile @@ -1,24 +1,35 @@ -# $OpenBSD: Makefile,v 1.9 2016/03/11 19:59:12 naddy Exp $ +# $OpenBSD: Makefile,v 1.10 2017/11/13 13:21:35 kevlo Exp $ -COMMENT= intelligent phonetic input method library +COMMENT = intelligent phonetic input method library -V = 0.3.3 -DISTNAME= libchewing-$V -PKGNAME= zh-libchewing-$V -REVISION = 2 +V = 0.5.1 +DISTNAME = libchewing-$V +PKGNAME = zh-libchewing-$V -SHARED_LIBS= chewing 0.0 # .3.1 +SHARED_LIBS = chewing 0.1 # .3.3 -CATEGORIES= chinese inputmethods +CATEGORIES = chinese inputmethods -HOMEPAGE= http://chewing.im/ +HOMEPAGE = http://chewing.im/ + +MAINTAINER = Kevin Lo # LGPLv2.1 only PERMIT_PACKAGE_CDROM= Yes +WANTLIB += m pthread sqlite3 + MASTER_SITES = https://github.com/chewing/libchewing/releases/download/v$V/ + EXTRACT_SUFX= .tar.bz2 -CONFIGURE_STYLE=gnu +BUILD_DEPENDS = print/texinfo +LIB_DEPENDS = databases/sqlite3 + +MAKE_FLAGS = MAKEINFO=${LOCALBASE}/bin/gmakeinfo + +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .include diff --git a/chinese/libchewing/distinfo b/chinese/libchewing/distinfo index fa204a6d9bd..43c1ab25422 100644 --- a/chinese/libchewing/distinfo +++ b/chinese/libchewing/distinfo @@ -1,2 +1,2 @@ -SHA256 (libchewing-0.3.3.tar.bz2) = cqDeErhsTV9kaKaNiMc2In/xb6epFfhZX/5aMcrpXq4= -SIZE (libchewing-0.3.3.tar.bz2) = 1798134 +SHA256 (libchewing-0.5.1.tar.bz2) = lwjGNBX6YDRDXA84EA59MNDhuskn9nvsbf6z/vAWFys= +SIZE (libchewing-0.5.1.tar.bz2) = 3141084 diff --git a/chinese/libchewing/patches/patch-configure b/chinese/libchewing/patches/patch-configure new file mode 100644 index 00000000000..00c8a31132e --- /dev/null +++ b/chinese/libchewing/patches/patch-configure @@ -0,0 +1,14 @@ +$OpenBSD: patch-configure,v 1.4 2017/11/13 13:21:35 kevlo Exp $ + +Index: configure +--- configure.orig ++++ configure +@@ -15425,7 +15425,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_undefined" >&5 + $as_echo "$ac_cv_no_undefined" >&6; } + if test x$ac_cv_no_undefined = "xyes"; then : +- NO_UNDEFINED_LDFLAGS="-Wl,--no-undefined" ++ NO_UNDEFINED_LDFLAGS="" + fi + + diff --git a/chinese/libchewing/patches/patch-src_hash_c b/chinese/libchewing/patches/patch-src_hash_c deleted file mode 100644 index cb1edc33a16..00000000000 --- a/chinese/libchewing/patches/patch-src_hash_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_hash_c,v 1.1 2011/05/02 06:55:07 kevlo Exp $ ---- src/hash.c.orig Mon May 2 12:34:53 2011 -+++ src/hash.c Mon May 2 13:05:53 2011 -@@ -524,7 +524,7 @@ int InitHash( const char *path ) - } else { - sprintf( hashfilename, "%s" PLAT_SEPARATOR "%s", path, HASH_FILE ); - } -- memset( hashtable, (int) NULL, HASH_TABLE_SIZE ); -+ memset( hashtable, 0, HASH_TABLE_SIZE ); - - open_hash_file: - dump = _load_hash_file( hashfilename, &fsize ); diff --git a/chinese/libchewing/pkg/PLIST b/chinese/libchewing/pkg/PLIST index 97fba60c22c..695031e31e5 100644 --- a/chinese/libchewing/pkg/PLIST +++ b/chinese/libchewing/pkg/PLIST @@ -1,20 +1,18 @@ -@comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:37 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.4 2017/11/13 13:21:35 kevlo Exp $ include/chewing/ +include/chewing/chewing-compat.h include/chewing/chewing.h include/chewing/chewingio.h include/chewing/global.h include/chewing/mod_aux.h +@info info/libchewing.info lib/libchewing.a lib/libchewing.la @lib lib/libchewing.so.${LIBchewing_VERSION} lib/pkgconfig/chewing.pc -share/chewing/ -share/chewing/ch_index_begin.dat -share/chewing/ch_index_phone.dat -share/chewing/dict.dat -share/chewing/fonetree.dat -share/chewing/ph_index.dat -share/chewing/pinyin.tab -share/chewing/swkb.dat -share/chewing/symbols.dat -share/chewing/us_freq.dat +share/libchewing/ +share/libchewing/dictionary.dat +share/libchewing/index_tree.dat +share/libchewing/pinyin.tab +share/libchewing/swkb.dat +share/libchewing/symbols.dat diff --git a/inputmethods/scim-chewing/Makefile b/inputmethods/scim-chewing/Makefile index 241aa6de703..52f57206acb 100644 --- a/inputmethods/scim-chewing/Makefile +++ b/inputmethods/scim-chewing/Makefile @@ -1,32 +1,31 @@ -# $OpenBSD: Makefile,v 1.23 2017/10/23 17:10:51 sthen Exp $ +# $OpenBSD: Makefile,v 1.24 2017/11/13 13:21:35 kevlo Exp $ COMMENT= scim input method module for chewing -DISTNAME= scim-chewing-0.3.4 -REVISION= 6 +GH_ACCOUNT= chewing +GH_PROJECT= scim-chewing +GH_TAGNAME= v0.5.1 CATEGORIES= inputmethods chinese -HOMEPAGE= http://chewing.csie.net/ +HOMEPAGE= http://chewing.im/ # GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB+= GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi -WANTLIB+= Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo chewing drm -WANTLIB+= expat ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 -WANTLIB+= gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 -WANTLIB+= gtk-x11-2.0 harfbuzz m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB+= pcre pixman-1 png pthread scim-1.0 -WANTLIB+= scim-gtkutils-1.0 scim-x11utils-1.0 ${COMPILER_LIBCXX} xcb xcb-render -WANTLIB+= xcb-shm z +WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext +WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo chewing +WANTLIB += expat ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 +WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 +WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz m pango-1.0 pangocairo-1.0 +WANTLIB += pangoft2-1.0 pcre pixman-1 png scim-1.0 scim-gtkutils-1.0 +WANTLIB += scim-x11utils-1.0 sqlite3 xcb xcb-render xcb-shm z MODULES= devel/gettext \ textproc/intltool - -MASTER_SITES= http://chewing.csie.net/download/scim/ -EXTRACT_SUFX= .tar.bz2 - +BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \ + ${MODGNU_AUTOMAKE_DEPENDS} \ + devel/libtool LIB_DEPENDS= x11/gtk+2 \ chinese/libchewing \ inputmethods/scim @@ -34,8 +33,15 @@ LIB_DEPENDS= x11/gtk+2 \ LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= --disable-static +CONFIGURE_ARGS= --disable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +AUTOCONF_VERSION= 2.69 +AUTOMAKE_VERSION= 1.15 + +post-patch: + @cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \ + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh + .include diff --git a/inputmethods/scim-chewing/distinfo b/inputmethods/scim-chewing/distinfo index 738a2fa0ee8..b0f3f517f0c 100644 --- a/inputmethods/scim-chewing/distinfo +++ b/inputmethods/scim-chewing/distinfo @@ -1,2 +1,2 @@ -SHA256 (scim-chewing-0.3.4.tar.bz2) = tpGl/9IOnN7N6ZhuId7tPup4nTYcbtwVTLOZddrpB3Q= -SIZE (scim-chewing-0.3.4.tar.bz2) = 374182 +SHA256 (scim-chewing-0.5.1.tar.gz) = SRsSd4T6OHNPMGL9V+pX5U9fRNN7VRqyWqsQxWXPbrs= +SIZE (scim-chewing-0.5.1.tar.gz) = 62938