Re: UPDATE: chinese/libchewing 0.6.0
Ping
On Sun, Jan 28, 2024 at 11:20:13PM +0800, Kevin Lo wrote:
>
> Hi,
>
> This is an update for libchewing to 0.6.0.
> Tested with fcitx-chewing on amd64.
>
> OK? Comments?
>
> Index: chinese/libchewing/Makefile
> ===
> RCS file: /cvs/ports/chinese/libchewing/Makefile,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 Makefile
> --- chinese/libchewing/Makefile 20 Sep 2023 06:33:31 - 1.14
> +++ chinese/libchewing/Makefile 28 Jan 2024 15:03:10 -
> @@ -1,11 +1,10 @@
> COMMENT =intelligent phonetic input method library
>
> -V = 0.5.1
> +V = 0.6.0
> DISTNAME = libchewing-$V
> PKGNAME =zh-libchewing-$V
> -REVISION = 0
>
> -SHARED_LIBS =chewing 0.1 # .3.3
> +SHARED_LIBS =chewing 0.2 # .3.3.1
>
> CATEGORIES = chinese inputmethods
>
> @@ -16,19 +15,16 @@ MAINTAINER = Kevin Lo # LGPLv2.1 only
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += m pthread sqlite3 z
> +WANTLIB += c sqlite3
>
> SITES =
> https://github.com/chewing/libchewing/releases/download/v$V/
>
> -EXTRACT_SUFX=.tar.bz2
> +EXTRACT_SUFX = .tar.xz
>
> -BUILD_DEPENDS = print/texinfo
> +MODULES =devel/cmake
> LIB_DEPENDS =databases/sqlite3
>
> -MAKE_FLAGS = MAKEINFO=${LOCALBASE}/bin/gmakeinfo
> -
> -CONFIGURE_STYLE =gnu
> -CONFIGURE_ARGS = CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib"
> +CFLAGS +=-I${LOCALBASE}/include
> +MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib -lc
>
> .include
> Index: chinese/libchewing/distinfo
> ===
> RCS file: /cvs/ports/chinese/libchewing/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- chinese/libchewing/distinfo 13 Nov 2017 13:21:35 - 1.5
> +++ chinese/libchewing/distinfo 28 Jan 2024 15:03:10 -
> @@ -1,2 +1,2 @@
> -SHA256 (libchewing-0.5.1.tar.bz2) =
> lwjGNBX6YDRDXA84EA59MNDhuskn9nvsbf6z/vAWFys=
> -SIZE (libchewing-0.5.1.tar.bz2) = 3141084
> +SHA256 (libchewing-0.6.0.tar.xz) =
> wpE77VW3/bJZQralgywlS8m8ucNl08r6ClabS3y9jwA=
> +SIZE (libchewing-0.6.0.tar.xz) = 3473564
> Index: chinese/libchewing/patches/patch-CMakeLists_txt
> ===
> RCS file: chinese/libchewing/patches/patch-CMakeLists_txt
> diff -N chinese/libchewing/patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ chinese/libchewing/patches/patch-CMakeLists_txt 28 Jan 2024 15:03:10
> -
> @@ -0,0 +1,19 @@
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> CMakeLists.txt
> +@@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
> + enable_testing()
> +
> + if(UNIX)
> +-set(CMAKE_C_FLAGS "-g -O2 -Wall -fPIC ${CMAKE_C_FLAGS}")
> ++set(CMAKE_C_FLAGS "-Wall -fPIC ${CMAKE_C_FLAGS}")
> + add_compile_definitions(UNDER_POSIX PIC)
> + endif()
> +
> +@@ -338,4 +338,4 @@ set(CPACK_PACKAGE_CHECKSUM SHA256)
> + set(CPACK_SOURCE_IGNORE_FILES "/out" "/..*")
> + set(CPACK_SOURCE_GENERATOR TXZ)
> + set(CPACK_SOURCE_PACKAGE_FILE_NAME libchewing-${CMAKE_PROJECT_VERSION})
> +-include(CPack)
> +\ No newline at end of file
> ++include(CPack)
> Index: chinese/libchewing/patches/patch-configure
> ===
> RCS file: chinese/libchewing/patches/patch-configure
> diff -N chinese/libchewing/patches/patch-configure
> --- chinese/libchewing/patches/patch-configure11 Mar 2022 18:25:21
> - 1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -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
> -
> -
> Index: chinese/libchewing/pkg/PLIST
> ===
> RCS file: /cvs/ports/chinese/libchewing/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 PLIST
> --- chinese/libchewing/pkg/PLIST 11 Mar 2022 18:25:21 - 1.5
> +++ chinese/libchewing/pkg/PLIST 28 Jan 2024 15:03:10 -
> @@ -4,9 +4,6 @@ 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/libchewing/
>
UPDATE: chinese/libchewing 0.6.0
Hi,
This is an update for libchewing to 0.6.0.
Tested with fcitx-chewing on amd64.
OK? Comments?
Index: chinese/libchewing/Makefile
===
RCS file: /cvs/ports/chinese/libchewing/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- chinese/libchewing/Makefile 20 Sep 2023 06:33:31 - 1.14
+++ chinese/libchewing/Makefile 28 Jan 2024 15:03:10 -
@@ -1,11 +1,10 @@
COMMENT = intelligent phonetic input method library
-V =0.5.1
+V =0.6.0
DISTNAME = libchewing-$V
PKGNAME = zh-libchewing-$V
-REVISION = 0
-SHARED_LIBS = chewing 0.1 # .3.3
+SHARED_LIBS = chewing 0.2 # .3.3.1
CATEGORIES = chinese inputmethods
@@ -16,19 +15,16 @@ MAINTAINER =Kevin Lo https://github.com/chewing/libchewing/releases/download/v$V/
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX = .tar.xz
-BUILD_DEPENDS =print/texinfo
+MODULES = devel/cmake
LIB_DEPENDS = databases/sqlite3
-MAKE_FLAGS = MAKEINFO=${LOCALBASE}/bin/gmakeinfo
-
-CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS = CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CFLAGS += -I${LOCALBASE}/include
+MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib -lc
.include
Index: chinese/libchewing/distinfo
===
RCS file: /cvs/ports/chinese/libchewing/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- chinese/libchewing/distinfo 13 Nov 2017 13:21:35 - 1.5
+++ chinese/libchewing/distinfo 28 Jan 2024 15:03:10 -
@@ -1,2 +1,2 @@
-SHA256 (libchewing-0.5.1.tar.bz2) =
lwjGNBX6YDRDXA84EA59MNDhuskn9nvsbf6z/vAWFys=
-SIZE (libchewing-0.5.1.tar.bz2) = 3141084
+SHA256 (libchewing-0.6.0.tar.xz) = wpE77VW3/bJZQralgywlS8m8ucNl08r6ClabS3y9jwA=
+SIZE (libchewing-0.6.0.tar.xz) = 3473564
Index: chinese/libchewing/patches/patch-CMakeLists_txt
===
RCS file: chinese/libchewing/patches/patch-CMakeLists_txt
diff -N chinese/libchewing/patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ chinese/libchewing/patches/patch-CMakeLists_txt 28 Jan 2024 15:03:10
-
@@ -0,0 +1,19 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+ enable_testing()
+
+ if(UNIX)
+-set(CMAKE_C_FLAGS "-g -O2 -Wall -fPIC ${CMAKE_C_FLAGS}")
++set(CMAKE_C_FLAGS "-Wall -fPIC ${CMAKE_C_FLAGS}")
+ add_compile_definitions(UNDER_POSIX PIC)
+ endif()
+
+@@ -338,4 +338,4 @@ set(CPACK_PACKAGE_CHECKSUM SHA256)
+ set(CPACK_SOURCE_IGNORE_FILES "/out" "/..*")
+ set(CPACK_SOURCE_GENERATOR TXZ)
+ set(CPACK_SOURCE_PACKAGE_FILE_NAME libchewing-${CMAKE_PROJECT_VERSION})
+-include(CPack)
+\ No newline at end of file
++include(CPack)
Index: chinese/libchewing/patches/patch-configure
===
RCS file: chinese/libchewing/patches/patch-configure
diff -N chinese/libchewing/patches/patch-configure
--- chinese/libchewing/patches/patch-configure 11 Mar 2022 18:25:21 -
1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-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
-
-
Index: chinese/libchewing/pkg/PLIST
===
RCS file: /cvs/ports/chinese/libchewing/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- chinese/libchewing/pkg/PLIST11 Mar 2022 18:25:21 - 1.5
+++ chinese/libchewing/pkg/PLIST28 Jan 2024 15:03:10 -
@@ -4,9 +4,6 @@ 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/libchewing/
Re: UPDATE: chinese/libchewing & inputmethods/scim-chewing
On Sat, Nov 11, 2017 at 03:18:18PM +, Stuart Henderson wrote:
>
> On 2017/11/10 11:28, Kevin Lo wrote:
> > On Thu, Nov 09, 2017 at 04:13:44PM +0800, Kevin Lo wrote:
> > >
> > > Hi,
> > >
> > > Update both libchewing and scim-chewing to 0.5.1.
> > > Tested scim and uim on amd64.
> > >
> > > While here, I would like to take over maintainership of the libchewing.
> > >
> > > Comments? OK?
> >
> > Here's the revised diff that removes unneeded MAKE_ENV in
> > libchewing's Makefile.
> >
> > Index: chinese/libchewing/Makefile
> > ===
> > RCS file: /cvs/ports/chinese/libchewing/Makefile,v
> > retrieving revision 1.9
> > diff -u -p -u -p -r1.9 Makefile
> > --- chinese/libchewing/Makefile 11 Mar 2016 19:59:12 - 1.9
> > +++ chinese/libchewing/Makefile 10 Nov 2017 03:22:07 -
> > @@ -1,24 +1,34 @@
> > # $OpenBSD: Makefile,v 1.9 2016/03/11 19:59:12 naddy 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
> > +PKGNAME = zh-${GH_PROJECT}-${V}
> >
> > -SHARED_LIBS= chewing 0.0 # .3.1
> > +GH_ACCOUNT = chewing
> > +GH_PROJECT = libchewing
> > +GH_TAGNAME = v${V}
>
> They still have a proper uploaded tarball (rather than just the
> auto generated ones) in https://github.com/chewing/libchewing/releases ..
> Generally it is better to use these because it insulates the port
> from any changes in github's infrastructure or from upstream commits
> on the tag. (Also the auto-generated files often miss some files
> which are included in the proper release tarball - probably not so
> important here with the cmake build - but the changelog and autoconf
> files aren't included).
Thanks for reviewing my diff. Ok, I use a proper uploaded tarball instead.
> > +CONFIGURE_ARGS =-DMAKEINFO=${LOCALBASE}/bin/gmakeinfo \
> > + -DCMAKE_SHARED_LINKER_FLAGS="-lc"
>
> Having to specify -lc seems very odd.. Any idea what's going on here?
Fixed. That was my fault since we don't use "-Wl,--no-undefined" when linking.
> > -CONFIGURE_STYLE=gnu
> > +CFLAGS += -I${LOCALBASE}/include -fno-stack-protector
>
> Is that (-fno-stack-protector) really needed? Tests pass without it..
No, it's not needed. Here's an updated diff:
Index: chinese/libchewing/Makefile
===
RCS file: /cvs/ports/chinese/libchewing/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- chinese/libchewing/Makefile 11 Mar 2016 19:59:12 - 1.9
+++ chinese/libchewing/Makefile 13 Nov 2017 03:26:57 -
@@ -1,24 +1,35 @@
# $OpenBSD: Makefile,v 1.9 2016/03/11 19:59:12 naddy 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
Index: chinese/libchewing/distinfo
===
RCS file: /cvs/ports/chinese/libchewing/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- chinese/libchewing/distinfo 18 Jan 2015 03:12:54 - 1.4
+++ chinese/libchewing/distinfo 13 Nov 2017 03:26:57 -
@@ -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
Index: chinese/libchewing/patches/patch-configure
===
RCS file: chinese/libchewing/patches/patch-configure
diff -N chinese/libchewing/patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ chinese/libchewing/patches/patch-configure 13 Nov 2017 03:26:57 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: configure
+--- configure.orig
configure
+@@ -15425,7 +1
Re: UPDATE: chinese/libchewing & inputmethods/scim-chewing
On 2017/11/10 11:28, Kevin Lo wrote:
> On Thu, Nov 09, 2017 at 04:13:44PM +0800, Kevin Lo wrote:
> >
> > Hi,
> >
> > Update both libchewing and scim-chewing to 0.5.1.
> > Tested scim and uim on amd64.
> >
> > While here, I would like to take over maintainership of the libchewing.
> >
> > Comments? OK?
>
> Here's the revised diff that removes unneeded MAKE_ENV in
> libchewing's Makefile.
>
> Index: chinese/libchewing/Makefile
> ===
> RCS file: /cvs/ports/chinese/libchewing/Makefile,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 Makefile
> --- chinese/libchewing/Makefile 11 Mar 2016 19:59:12 - 1.9
> +++ chinese/libchewing/Makefile 10 Nov 2017 03:22:07 -
> @@ -1,24 +1,34 @@
> # $OpenBSD: Makefile,v 1.9 2016/03/11 19:59:12 naddy 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
> +PKGNAME =zh-${GH_PROJECT}-${V}
>
> -SHARED_LIBS= chewing 0.0 # .3.1
> +GH_ACCOUNT = chewing
> +GH_PROJECT = libchewing
> +GH_TAGNAME = v${V}
They still have a proper uploaded tarball (rather than just the
auto generated ones) in https://github.com/chewing/libchewing/releases ..
Generally it is better to use these because it insulates the port
from any changes in github's infrastructure or from upstream commits
on the tag. (Also the auto-generated files often miss some files
which are included in the proper release tarball - probably not so
important here with the cmake build - but the changelog and autoconf
files aren't included).
> +CONFIGURE_ARGS =-DMAKEINFO=${LOCALBASE}/bin/gmakeinfo \
> + -DCMAKE_SHARED_LINKER_FLAGS="-lc"
Having to specify -lc seems very odd.. Any idea what's going on here?
> -CONFIGURE_STYLE=gnu
> +CFLAGS +=-I${LOCALBASE}/include -fno-stack-protector
Is that (-fno-stack-protector) really needed? Tests pass without it..
Re: UPDATE: chinese/libchewing & inputmethods/scim-chewing
On Thu, Nov 09, 2017 at 04:13:44PM +0800, Kevin Lo wrote:
>
> Hi,
>
> Update both libchewing and scim-chewing to 0.5.1.
> Tested scim and uim on amd64.
>
> While here, I would like to take over maintainership of the libchewing.
>
> Comments? OK?
Here's the revised diff that removes unneeded MAKE_ENV in
libchewing's Makefile.
Index: chinese/libchewing/Makefile
===
RCS file: /cvs/ports/chinese/libchewing/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- chinese/libchewing/Makefile 11 Mar 2016 19:59:12 - 1.9
+++ chinese/libchewing/Makefile 10 Nov 2017 03:22:07 -
@@ -1,24 +1,34 @@
# $OpenBSD: Makefile,v 1.9 2016/03/11 19:59:12 naddy 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
+PKGNAME = zh-${GH_PROJECT}-${V}
-SHARED_LIBS= chewing 0.0 # .3.1
+GH_ACCOUNT = chewing
+GH_PROJECT = libchewing
+GH_TAGNAME = v${V}
-CATEGORIES=chinese inputmethods
+SHARED_LIBS = chewing 0.1 # .3.3
-HOMEPAGE= http://chewing.im/
+CATEGORIES = chinese inputmethods
+
+HOMEPAGE = http://chewing.im/
+
+MAINTAINER = Kevin Lo
# LGPLv2.1 only
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES = https://github.com/chewing/libchewing/releases/download/v$V/
-EXTRACT_SUFX= .tar.bz2
+WANTLIB += c sqlite3
+
+MODULES = devel/cmake
+BUILD_DEPENDS =print/texinfo
+LIB_DEPENDS = databases/sqlite3
+
+CONFIGURE_ARGS =-DMAKEINFO=${LOCALBASE}/bin/gmakeinfo \
+ -DCMAKE_SHARED_LINKER_FLAGS="-lc"
-CONFIGURE_STYLE=gnu
+CFLAGS += -I${LOCALBASE}/include -fno-stack-protector
.include
Index: chinese/libchewing/distinfo
===
RCS file: /cvs/ports/chinese/libchewing/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- chinese/libchewing/distinfo 18 Jan 2015 03:12:54 - 1.4
+++ chinese/libchewing/distinfo 10 Nov 2017 03:22:07 -
@@ -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.gz) = swqAkSO2ujYoN2W5M3qY1pWiktNhvW9rx08DrE9Xcvg=
+SIZE (libchewing-0.5.1.tar.gz) = 3380799
Index: chinese/libchewing/patches/patch-CMakeLists_txt
===
RCS file: chinese/libchewing/patches/patch-CMakeLists_txt
diff -N chinese/libchewing/patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ chinese/libchewing/patches/patch-CMakeLists_txt 10 Nov 2017 03:22:07
-
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -9,7 +9,7 @@ set(LIBCHEWING_BINARY_VERSION 1.0.0)
+ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
+ if(UNIX)
+-set(CMAKE_C_FLAGS "-g -O2 -Wall -fPIC ${CMAKE_C_FLAGS}")
++set(CMAKE_C_FLAGS "-Wall -fPIC ${CMAKE_C_FLAGS}")
+ add_definitions(-DUNDER_POSIX -DPIC)
+ endif()
+
+@@ -153,6 +153,10 @@ include_directories(
+ ${PROJECT_SOURCE_DIR}/include/internal
+ ${PROJECT_SOURCE_DIR}/src
+ ${PROJECT_SOURCE_DIR}/src/porting_layer/include
++)
++
++set(CMAKE_INSTALL_INFODIR
++${CMAKE_INSTALL_PREFIX}/info
+ )
+
+ set(ALL_DATA
Index: chinese/libchewing/patches/patch-src_hash_c
===
RCS file: chinese/libchewing/patches/patch-src_hash_c
diff -N chinese/libchewing/patches/patch-src_hash_c
--- chinese/libchewing/patches/patch-src_hash_c 2 May 2011 06:55:07 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_hash_c,v 1.1 2011/05/02 06:55:07 kevlo Exp $
src/hash.c.origMon 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 );
Index: chinese/libchewing/pkg/PLIST
===
RCS file: /cvs/ports/chinese/libchewing/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- chinese/libchewing/pkg/PLIST16 Mar 2015 18:07:37 - 1.3
+++ chinese/libchewing/pkg/PLIST10 Nov 2017 03:22:07 -
@@ -1,20 +1,17 @@
@comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:37 naddy 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/libchew
UPDATE: chinese/libchewing & inputmethods/scim-chewing
Hi,
Update both libchewing and scim-chewing to 0.5.1.
Tested scim and uim on amd64.
While here, I would like to take over maintainership of the libchewing.
Comments? OK?
Index: chinese/libchewing/Makefile
===
RCS file: /cvs/ports/chinese/libchewing/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- chinese/libchewing/Makefile 11 Mar 2016 19:59:12 - 1.9
+++ chinese/libchewing/Makefile 9 Nov 2017 08:09:25 -
@@ -1,24 +1,36 @@
# $OpenBSD: Makefile,v 1.9 2016/03/11 19:59:12 naddy 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
+PKGNAME = zh-${GH_PROJECT}-${V}
-SHARED_LIBS= chewing 0.0 # .3.1
+GH_ACCOUNT = chewing
+GH_PROJECT = libchewing
+GH_TAGNAME = v${V}
-CATEGORIES=chinese inputmethods
+SHARED_LIBS = chewing 0.1 # .3.3
-HOMEPAGE= http://chewing.im/
+CATEGORIES = chinese inputmethods
+
+HOMEPAGE = http://chewing.im/
+
+MAINTAINER = Kevin Lo
# LGPLv2.1 only
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES = https://github.com/chewing/libchewing/releases/download/v$V/
-EXTRACT_SUFX= .tar.bz2
+WANTLIB += c sqlite3
+
+MODULES = devel/cmake
+BUILD_DEPENDS =print/texinfo
+LIB_DEPENDS = databases/sqlite3
+
+MAKE_ENV= LDFLAGS="${LDFLAGS}"
+
+CONFIGURE_ARGS =-DMAKEINFO=${LOCALBASE}/bin/gmakeinfo \
+ -DCMAKE_SHARED_LINKER_FLAGS="-lc"
-CONFIGURE_STYLE=gnu
+CFLAGS += -I${LOCALBASE}/include -fno-stack-protector
.include
Index: chinese/libchewing/distinfo
===
RCS file: /cvs/ports/chinese/libchewing/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- chinese/libchewing/distinfo 18 Jan 2015 03:12:54 - 1.4
+++ chinese/libchewing/distinfo 9 Nov 2017 08:09:25 -
@@ -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.gz) = swqAkSO2ujYoN2W5M3qY1pWiktNhvW9rx08DrE9Xcvg=
+SIZE (libchewing-0.5.1.tar.gz) = 3380799
Index: chinese/libchewing/patches/patch-CMakeLists_txt
===
RCS file: chinese/libchewing/patches/patch-CMakeLists_txt
diff -N chinese/libchewing/patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ chinese/libchewing/patches/patch-CMakeLists_txt 9 Nov 2017 08:09:25
-
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -9,7 +9,7 @@ set(LIBCHEWING_BINARY_VERSION 1.0.0)
+ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
+ if(UNIX)
+-set(CMAKE_C_FLAGS "-g -O2 -Wall -fPIC ${CMAKE_C_FLAGS}")
++set(CMAKE_C_FLAGS "-Wall -fPIC ${CMAKE_C_FLAGS}")
+ add_definitions(-DUNDER_POSIX -DPIC)
+ endif()
+
+@@ -153,6 +153,10 @@ include_directories(
+ ${PROJECT_SOURCE_DIR}/include/internal
+ ${PROJECT_SOURCE_DIR}/src
+ ${PROJECT_SOURCE_DIR}/src/porting_layer/include
++)
++
++set(CMAKE_INSTALL_INFODIR
++${CMAKE_INSTALL_PREFIX}/info
+ )
+
+ set(ALL_DATA
Index: chinese/libchewing/patches/patch-src_hash_c
===
RCS file: chinese/libchewing/patches/patch-src_hash_c
diff -N chinese/libchewing/patches/patch-src_hash_c
--- chinese/libchewing/patches/patch-src_hash_c 2 May 2011 06:55:07 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_hash_c,v 1.1 2011/05/02 06:55:07 kevlo Exp $
src/hash.c.origMon 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 );
Index: chinese/libchewing/pkg/PLIST
===
RCS file: /cvs/ports/chinese/libchewing/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- chinese/libchewing/pkg/PLIST16 Mar 2015 18:07:37 - 1.3
+++ chinese/libchewing/pkg/PLIST9 Nov 2017 08:09:25 -
@@ -1,20 +1,17 @@
@comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:37 naddy 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_begi
UPDATE: chinese/libchewing
Here's an update to libchewing 0.3.3.
Tested on amd64 with updated inputmethods/{scim-chewing,uim-chewing}.
Comments? ok?
Index: Makefile
===
RCS file: /cvs/ports/chinese/libchewing/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile9 Jan 2009 07:33:51 - 1.2
+++ Makefile2 May 2011 05:54:25 -
@@ -2,7 +2,7 @@
COMMENT= intelligent phonetic input method library
-DISTNAME= libchewing-0.3.2
+DISTNAME= libchewing-0.3.3
PKGNAME= zh-${DISTNAME}
SHARED_LIBS= chewing 0.0 # .3.1
Index: distinfo
===
RCS file: /cvs/ports/chinese/libchewing/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo9 Jan 2009 07:33:51 - 1.2
+++ distinfo2 May 2011 05:54:25 -
@@ -1,5 +1,5 @@
-MD5 (libchewing-0.3.2.tar.bz2) = 73B0X/3xmaoX5TNCfGNJnw==
-RMD160 (libchewing-0.3.2.tar.bz2) = LKEYA/pPFj+QQyBIXShRQpZ6cGQ=
-SHA1 (libchewing-0.3.2.tar.bz2) = I+sJqxfEMs77jPQsdYEGtxtQ1V8=
-SHA256 (libchewing-0.3.2.tar.bz2) =
BWMn9WK0zCuV98W7QJOYwN/ljztbaGG8bSdod24XDxU=
-SIZE (libchewing-0.3.2.tar.bz2) = 1802842
+MD5 (libchewing-0.3.3.tar.bz2) = jx/2zNwXw2pc5saGTzDzwg==
+RMD160 (libchewing-0.3.3.tar.bz2) = s2wf2ZfjIjQj/7ESSYNiBaH/W64=
+SHA1 (libchewing-0.3.3.tar.bz2) = JK3nu7Aoj3FYi7RYMdf8nVE3pMs=
+SHA256 (libchewing-0.3.3.tar.bz2) =
cqDeErhsTV9kaKaNiMc2In/xb6epFfhZX/5aMcrpXq4=
+SIZE (libchewing-0.3.3.tar.bz2) = 1798134
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 9 Jan 2009 07:33:51 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,63 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2009/01/09 07:33:51 kevlo Exp $
configure.orig Sat Dec 13 18:12:31 2008
-+++ configure Sat Dec 13 18:15:09 2008
-@@ -12622,48 +12622,7 @@ echo "${ECHO_T}no" >&6; }
- fi
-
- pkg_failed=no
--{ echo "$as_me:$LINENO: checking for CHECK" >&5
--echo $ECHO_N "checking for CHECK... $ECHO_C" >&6; }
-
--if test -n "$PKG_CONFIG"; then
--if test -n "$CHECK_CFLAGS"; then
--pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
--else
--if test -n "$PKG_CONFIG" && \
--{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"check >= \$CHECK_REQUIRED_VERSION\"") >&5
-- ($PKG_CONFIG --exists --print-errors "check >=
$CHECK_REQUIRED_VERSION") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >=
$CHECK_REQUIRED_VERSION" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
--fi
--else
-- pkg_failed=untried
--fi
--if test -n "$PKG_CONFIG"; then
--if test -n "$CHECK_LIBS"; then
--pkg_cv_CHECK_LIBS="$CHECK_LIBS"
--else
--if test -n "$PKG_CONFIG" && \
--{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"check >= \$CHECK_REQUIRED_VERSION\"") >&5
-- ($PKG_CONFIG --exists --print-errors "check >=
$CHECK_REQUIRED_VERSION") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >=
$CHECK_REQUIRED_VERSION" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
--fi
--else
-- pkg_failed=untried
--fi
--
--
--
- if test $pkg_failed = yes; then
-
- if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-@@ -12687,9 +12646,7 @@ elif test $pkg_failed = untried; then
- else
- CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
- CHECK_LIBS=$pkg_cv_CHECK_LIBS
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-- enable_check=yes
-+ enable_check=no
- fi
- if test x$enable_check = "xyes"; then
- ENABLE_UNIT_TEST_TRUE=
Index: patches/patch-src_hash_c
===
RCS file: patches/patch-src_hash_c
diff -N patches/patch-src_hash_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_hash_c2 May 2011 05:54:25 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/hash.c.origMon 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 );
