On 04/13/2017 08:28 PM, Jeremie Courreges-Anglas wrote:
Nils Reuße <n.reu...@hxgn.net> writes:

In an attempt to write some hangul on OpenBSD, i updated some ports ;)
Here is an update for libhangul.  Included is an upstream patch [1],
which i found while checking the freebsd port.

Alongside goes a new port ibus-hangul (please see my other mail).
I bumped the major lib version to 1, because that's what ibus-hangul
expects.

Any comments?

Your diff was mangled (tab->spaces + some line wraps); don't copy/paste
diffs, better "include" them if your MUA supports that, or send them as
attachments.

Note that the shared lib version should be have a major bump because
several symbols have been removed, not because that's what ibus-hangul
expects.  See

  https://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs

Here's a reworked diff with the following changes:
- work around the tarball naming using DISTFILES
- don't use the gettext module (which should probably be marked as
  deprecated)



Hi Jeremie,

thanks for looking into it! I had never heard of DISTFILES before, the Makefile looks much better now ;) And thanks for your explanations, they're much appreciated.

Nils


Index: Makefile
===================================================================
RCS file: /d/cvs/ports/korean/libhangul/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile    9 Apr 2016 20:14:48 -0000       1.8
+++ Makefile    13 Apr 2017 18:10:29 -0000
@@ -2,26 +2,25 @@

 COMMENT=       hangul input library

-DISTNAME=      libhangul-0.0.10
-REVISION =     1
+DISTNAME=      libhangul-0.1.0
+DISTFILES=     3442-${DISTNAME}${EXTRACT_SUFX}

-SHARED_LIBS=   hangul  0.1     # .1.0
+SHARED_LIBS=   hangul  1.0     # .1.0

 CATEGORIES=    korean inputmethods

-HOMEPAGE=      http://kldp.net/projects/hangul/
+HOMEPAGE=      http://kldp.net/hangul/

 # LGPLv2.1+
 PERMIT_PACKAGE_CDROM=  Yes

-WANTLIB=       iconv
+WANTLIB += c iconv intl

-LIB_DEPENDS=   converters/libiconv
+LIB_DEPENDS=   converters/libiconv \
+               devel/gettext

-MASTER_SITES=  http://kldp.net/frs/download.php/5417/
+MASTER_SITES=  http://kldp.net/hangul/release/

 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
-               LDFLAGS="-L${LOCALBASE}/lib -liconv"

 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /d/cvs/ports/korean/libhangul/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo    18 Jan 2015 03:14:18 -0000      1.3
+++ distinfo    13 Apr 2017 16:59:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (libhangul-0.0.10.tar.gz) = rwciASYyqyr8IBaqZkO9aXnhQPrMVqkRpaRfl/5h1MU=
-SIZE (libhangul-0.0.10.tar.gz) = 2828525
+SHA256 (3442-libhangul-0.1.0.tar.gz) = 
WQWqXFV9jUbhkP7Br911ur87wIbvKGtCAHVycDZYKVo=
+SIZE (3442-libhangul-0.1.0.tar.gz) = 2899845
Index: patches/patch-hangul_hangulctype_c
===================================================================
RCS file: patches/patch-hangul_hangulctype_c
diff -N patches/patch-hangul_hangulctype_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-hangul_hangulctype_c  13 Apr 2017 18:02:40 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+  
https://github.com/choehwanjin/libhangul/commit/3e59c64a985a1355d116319d69973b29d0d8ec66
+
+--- hangul/hangulctype.c.orig  Sun Aug 28 16:06:23 2011
++++ hangul/hangulctype.c       Thu Apr 13 20:02:34 2017
+@@ -518,6 +518,10 @@ hangul_jamo_to_cjamo(ucschar c)
+       0x0000,     /* 0xd7c4 */
+       0x0000,     /* 0xd7c5 */
+       0x0000,     /* 0xd7c6 */
++      0x0000,     /* 0xd7c7 */
++      0x0000,     /* 0xd7c8 */
++      0x0000,     /* 0xd7c9 */
++      0x0000,     /* 0xd7ca */
+       0x0000,     /* 0xd7cb */
+       0x0000,     /* 0xd7cc */
+       0x3138,     /* 0xd7cd */
Index: pkg/PLIST
===================================================================
RCS file: /d/cvs/ports/korean/libhangul/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   16 Mar 2015 18:07:49 -0000      1.3
+++ pkg/PLIST   13 Apr 2017 16:59:21 -0000
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:49 naddy Exp $
+@bin bin/hangul
 include/hangul-1.0/
 include/hangul-1.0/hangul.h
 lib/libhangul.a
@@ -8,3 +9,4 @@ lib/pkgconfig/libhangul.pc
 share/libhangul/
 share/libhangul/hanja/
 share/libhangul/hanja/hanja.txt
+share/locale/ko/LC_MESSAGES/libhangul.mo


Reply via email to