Date: Mon, 6 Oct 2008 04:15:46 +0200 (CEST) From: Nikola Lecic <nikola.lecic@anthesphoria.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/127895: [Patch] devel/m17n-lib (and -docs, -db) to 1.5.2, some fixes and adoption Message-ID: <200810060215.m962Fkux089193@anthesphoria.net> Resent-Message-ID: <200810060230.m962U2S9053015@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 127895 >Category: ports >Synopsis: [Patch] devel/m17n-lib (and -docs, -db) to 1.5.2, some fixes and adoption >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 06 02:30:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Nikola Lecic >Release: FreeBSD 7.1-PRERELEASE i386 >Organization: >Environment: System: FreeBSD black 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #1: Thu Sep 11 15:05:17 CEST 2008 nikola@black:/usr/obj/usr/src/sys/GENERIC i386 >Description: NOTE: This is no. 4 of 4 PRs related to m17n ports: 2 new ports and 4 upgrades/adoptions. I wasn't aware of ports/126799 at the time I was preparing this 6-port PR group. However, it still differs from ports/126799 since it contains several fixes that doesn't exist there, so I hope that my submission is worth considering to be adopted instead. Additionally, I offer to adopt all 4 unmaintained m17n-related ports at once (together with adding two new ones). Fixes included in three patches attached here are: m17n-docs: * now all files necessary for correct HTML look are installed; m17n-lib: * IMHO much simpler solution for the patch-examples__Makefile.in problem than it was offered in ports/126799. P.S. This patch leaves files/patch-examples__Makefile.in empty. >How-To-Repeat: >Fix: --- m17n-db-1.5.2.patch begins here --- diff -ruN m17n-db.orig/Makefile m17n-db/Makefile --- m17n-db.orig/Makefile 2008-06-06 15:21:31.000000000 +0200 +++ m17n-db/Makefile 2008-10-06 03:01:43.000000000 +0200 @@ -6,17 +6,17 @@ # PORTNAME= m17n-db -PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTVERSION= 1.5.2 CATEGORIES= devel MASTER_SITES= http://www.m17n.org/m17n-lib-download/:m17n \ + http://anthesphoria.net/FreeBSD/ports/distfiles/:m17n \ ${MASTER_SITE_GNU:S/$/:glibc/} MASTER_SITE_SUBDIR= glibc/:glibc DISTFILES= ${M17N_DISTFILE}:m17n \ ${GLIBC_DISTFILE}:glibc EXTRACT_ONLY= ${M17N_DISTFILE} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nikola.lecic@anthesphoria.net COMMENT= Data files for the m17n library USE_GNOME= gnometarget pkgconfig diff -ruN m17n-db.orig/distinfo m17n-db/distinfo --- m17n-db.orig/distinfo 2008-02-28 10:19:42.000000000 +0100 +++ m17n-db/distinfo 2008-10-06 03:06:52.000000000 +0200 @@ -1,6 +1,6 @@ -MD5 (m17n-db-1.5.1.tar.gz) = 1627c9d8808115567412192a595a434b -SHA256 (m17n-db-1.5.1.tar.gz) = ca67cab22cebe6a4279fb8944d471d964cb711a223de788e78890091a23510e7 -SIZE (m17n-db-1.5.1.tar.gz) = 1280954 +MD5 (m17n-db-1.5.2.tar.gz) = 1d23fdcd8395acdb662de28e8bad4dc5 +SHA256 (m17n-db-1.5.2.tar.gz) = d05ecb11faafffbb7f07c6620a75d612bf27009e06da0e71a2163b2292bdd448 +SIZE (m17n-db-1.5.2.tar.gz) = 1284002 MD5 (glibc-2.3.6.tar.bz2) = bfdce99f82d6dbcb64b7f11c05d6bc96 SHA256 (glibc-2.3.6.tar.bz2) = e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e SIZE (glibc-2.3.6.tar.bz2) = 14014977 diff -ruN m17n-db.orig/pkg-descr m17n-db/pkg-descr --- m17n-db.orig/pkg-descr 2004-05-29 19:13:44.000000000 +0200 +++ m17n-db/pkg-descr 2008-10-06 02:21:44.000000000 +0200 @@ -1,3 +1,5 @@ -This package contains the data files for the m17n library. +This package contains the data files for the m17n library. m17n-lib +currently supports input of more than 60 languages with more than 70 +language specific input methods. WWW: http://www.m17n.org/m17n-lib/ diff -ruN m17n-db.orig/pkg-plist m17n-db/pkg-plist --- m17n-db.orig/pkg-plist 2008-02-28 10:19:42.000000000 +0100 +++ m17n-db/pkg-plist 2008-10-05 19:29:44.000000000 +0200 @@ -1,7 +1,7 @@ -bin/m17n-db -libdata/pkgconfig/m17n-db.pc %%NLS%%share/locale/ja/LC_MESSAGES/m17n-db.mo %%NLS%%share/locale/vi/LC_MESSAGES/m17n-db.mo +bin/m17n-db +libdata/pkgconfig/m17n-db.pc share/m17n/8859-10.map share/m17n/8859-11.map share/m17n/8859-13.map @@ -422,5 +422,5 @@ share/m17n/zh.lnm share/m17n/zh_Hans.lnm share/m17n/zh_Hant.lnm -@dirrm share/m17n/icons -@dirrm share/m17n +@dirrmtry share/m17n/icons +@dirrmtry share/m17n --- m17n-db-1.5.2.patch ends here --- --- m17n-lib-1.5.2.patch begins here --- diff -ruN m17n-lib.orig/Makefile m17n-lib/Makefile --- m17n-lib.orig/Makefile 2008-08-20 02:56:37.000000000 +0200 +++ m17n-lib/Makefile 2008-10-06 03:13:13.000000000 +0200 @@ -6,12 +6,12 @@ # PORTNAME= m17n-lib -PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTVERSION= 1.5.2 CATEGORIES= devel -MASTER_SITES= http://www.m17n.org/m17n-lib-download/ +MASTER_SITES= http://www.m17n.org/m17n-lib-download/ \ + http://anthesphoria.net/FreeBSD/ports/distfiles/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nikola.lecic@anthesphoria.net COMMENT= A library for the multilingual text handling BUILD_DEPENDS= m17n-db>=1.5.1:${PORTSDIR}/devel/m17n-db @@ -22,9 +22,9 @@ USE_XORG= xaw xft xt USE_GNOME= gnometarget libxml2 pkgconfig -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib -lintl" USE_LDCONFIG= yes OPTIONS= ANTHY "With Anthy support" off \ diff -ruN m17n-lib.orig/distinfo m17n-lib/distinfo --- m17n-lib.orig/distinfo 2008-02-28 10:21:34.000000000 +0100 +++ m17n-lib/distinfo 2008-10-06 03:08:31.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (m17n-lib-1.5.1.tar.gz) = 1fc48e2e2f42a6bb966026b61834d089 -SHA256 (m17n-lib-1.5.1.tar.gz) = e06ba9e2b39553c50c903667e164b4cc2e3a44dea5a20b75c8b5799141f435f5 -SIZE (m17n-lib-1.5.1.tar.gz) = 990729 +MD5 (m17n-lib-1.5.2.tar.gz) = d4d51ff3866e702b97eb173f35eee1e3 +SHA256 (m17n-lib-1.5.2.tar.gz) = 389cc05194e9a1f9e58b186c3fcd60d7fee2a6f627c3ea8f9c944d69983721f1 +SIZE (m17n-lib-1.5.2.tar.gz) = 997592 diff -ruN m17n-lib.orig/files/patch-examples__Makefile.in m17n-lib/files/patch-examples__Makefile.in --- m17n-lib.orig/files/patch-examples__Makefile.in 2008-02-28 10:21:35.000000000 +0100 +++ m17n-lib/files/patch-examples__Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- example/Makefile.in.orig Fri Dec 28 10:11:44 2007 -+++ example/Makefile.in Sun Dec 30 22:34:16 2007 -@@ -328,7 +328,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - BASICPROGS = m17n-conv --common_ldflags = ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la -+common_ldflags = ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la $(INTLLIBS) - common_ldflags_gui = ${common_ldflags} ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la - AM_CPPFLAGS = @CONFIG_FLAGS@ - m17n_date_SOURCES = mdate.c --- m17n-lib-1.5.2.patch ends here --- --- m17n-docs-1.5.2.patch begins here --- diff -ruN m17n-docs.orig/Makefile m17n-docs/Makefile --- m17n-docs.orig/Makefile 2008-08-23 01:54:46.000000000 +0200 +++ m17n-docs/Makefile 2008-10-06 03:01:11.000000000 +0200 @@ -6,18 +6,21 @@ # PORTNAME= m17n-docs -PORTVERSION= 1.5.0 +PORTVERSION= 1.5.2 CATEGORIES= devel -MASTER_SITES= http://www.m17n.org/m17n-lib-download/ +MASTER_SITES= http://www.m17n.org/m17n-lib-download/ \ + http://anthesphoria.net/FreeBSD/ports/distfiles/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nikola.lecic@anthesphoria.net COMMENT= The m17n library documentation USE_GNOME= gnometarget GNU_CONFIGURE= yes MAN1= m17n-config.1 m17n-db.1 -MAN3= m17nCharacter.3m17n \ +MAN3= M17NObjectHead.3m17n \ + MDrawMetric.3m17n \ + m17nCharacter.3m17n \ m17nCharset.3m17n \ m17nChartable.3m17n \ m17nConv.3m17n \ @@ -271,8 +274,9 @@ DOCSDIR= ${PREFIX}/share/doc/m17n post-patch: -.for file in configure Makefile.in - @${REINPLACE_CMD} -e 's|/m17n/docs|/doc/m17n|g' ${WRKSRC}/${file} -.endfor + @${REINPLACE_CMD} -e 's|/m17n/docs|/doc/m17n|g' \ + ${WRKSRC}/configure ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|for f in \*.html \*.png; do|for f in \*; do|' \ + ${WRKSRC}/Makefile.in .include <bsd.port.mk> diff -ruN m17n-docs.orig/distinfo m17n-docs/distinfo --- m17n-docs.orig/distinfo 2008-02-28 10:20:21.000000000 +0100 +++ m17n-docs/distinfo 2008-10-06 03:06:22.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (m17n-docs-1.5.0.tar.gz) = fd050874138dcd2c529a13a6df79e7b6 -SHA256 (m17n-docs-1.5.0.tar.gz) = 4f1eb27d2dcf003ec298b26c77a48eb8d0a8c0fa30bdc432eea48101dfcccda0 -SIZE (m17n-docs-1.5.0.tar.gz) = 2325655 +MD5 (m17n-docs-1.5.2.tar.gz) = 4fc8a4a60fbeafa0340e011a9bed0800 +SHA256 (m17n-docs-1.5.2.tar.gz) = 3fb9ab259dab57caf4dc5827ce788c981d97548137886fbb9d138c63d0b5cb6d +SIZE (m17n-docs-1.5.2.tar.gz) = 2289798 diff -ruN m17n-docs.orig/pkg-plist m17n-docs/pkg-plist --- m17n-docs.orig/pkg-plist 2008-08-23 01:54:46.000000000 +0200 +++ m17n-docs/pkg-plist 2008-10-05 17:27:13.000000000 +0200 @@ -2,69 +2,12 @@ %%DOCSDIR%%/html/annotated.html %%DOCSDIR%%/html/bopo-kbd.png %%DOCSDIR%%/html/classes.html +%%DOCSDIR%%/html/doxygen.css %%DOCSDIR%%/html/doxygen.png %%DOCSDIR%%/html/el-kbd.png %%DOCSDIR%%/html/functions.html %%DOCSDIR%%/html/functions_enum.html -%%DOCSDIR%%/html/functions_eval.html %%DOCSDIR%%/html/functions_vars.html -%%DOCSDIR%%/html/globals.html -%%DOCSDIR%%/html/globals_0x61.html -%%DOCSDIR%%/html/globals_0x62.html -%%DOCSDIR%%/html/globals_0x63.html -%%DOCSDIR%%/html/globals_0x64.html -%%DOCSDIR%%/html/globals_0x65.html -%%DOCSDIR%%/html/globals_0x66.html -%%DOCSDIR%%/html/globals_0x67.html -%%DOCSDIR%%/html/globals_0x68.html -%%DOCSDIR%%/html/globals_0x69.html -%%DOCSDIR%%/html/globals_0x6c.html -%%DOCSDIR%%/html/globals_0x6d.html -%%DOCSDIR%%/html/globals_0x6e.html -%%DOCSDIR%%/html/globals_0x6f.html -%%DOCSDIR%%/html/globals_0x70.html -%%DOCSDIR%%/html/globals_0x72.html -%%DOCSDIR%%/html/globals_0x73.html -%%DOCSDIR%%/html/globals_0x74.html -%%DOCSDIR%%/html/globals_0x75.html -%%DOCSDIR%%/html/globals_0x76.html -%%DOCSDIR%%/html/globals_0x77.html -%%DOCSDIR%%/html/globals_0x78.html -%%DOCSDIR%%/html/globals_defs.html -%%DOCSDIR%%/html/globals_enum.html -%%DOCSDIR%%/html/globals_eval.html -%%DOCSDIR%%/html/globals_func.html -%%DOCSDIR%%/html/globals_func_0x63.html -%%DOCSDIR%%/html/globals_func_0x64.html -%%DOCSDIR%%/html/globals_func_0x66.html -%%DOCSDIR%%/html/globals_func_0x69.html -%%DOCSDIR%%/html/globals_func_0x6c.html -%%DOCSDIR%%/html/globals_func_0x70.html -%%DOCSDIR%%/html/globals_func_0x73.html -%%DOCSDIR%%/html/globals_func_0x74.html -%%DOCSDIR%%/html/globals_type.html -%%DOCSDIR%%/html/globals_vars.html -%%DOCSDIR%%/html/globals_vars_0x61.html -%%DOCSDIR%%/html/globals_vars_0x62.html -%%DOCSDIR%%/html/globals_vars_0x63.html -%%DOCSDIR%%/html/globals_vars_0x64.html -%%DOCSDIR%%/html/globals_vars_0x65.html -%%DOCSDIR%%/html/globals_vars_0x66.html -%%DOCSDIR%%/html/globals_vars_0x67.html -%%DOCSDIR%%/html/globals_vars_0x68.html -%%DOCSDIR%%/html/globals_vars_0x69.html -%%DOCSDIR%%/html/globals_vars_0x6c.html -%%DOCSDIR%%/html/globals_vars_0x6d.html -%%DOCSDIR%%/html/globals_vars_0x6e.html -%%DOCSDIR%%/html/globals_vars_0x6f.html -%%DOCSDIR%%/html/globals_vars_0x70.html -%%DOCSDIR%%/html/globals_vars_0x72.html -%%DOCSDIR%%/html/globals_vars_0x73.html -%%DOCSDIR%%/html/globals_vars_0x74.html -%%DOCSDIR%%/html/globals_vars_0x75.html -%%DOCSDIR%%/html/globals_vars_0x76.html -%%DOCSDIR%%/html/globals_vars_0x77.html -%%DOCSDIR%%/html/globals_vars_0x78.html %%DOCSDIR%%/html/group__m17nCharacter.html %%DOCSDIR%%/html/group__m17nCharset.html %%DOCSDIR%%/html/group__m17nChartable.html @@ -100,6 +43,7 @@ %%DOCSDIR%%/html/icon-bn-itrans.png %%DOCSDIR%%/html/icon-bn-unijoy.png %%DOCSDIR%%/html/icon-bo-wylie.png +%%DOCSDIR%%/html/icon-cmc-kbd.png %%DOCSDIR%%/html/icon-dv-phonetic.png %%DOCSDIR%%/html/icon-el-kbd.png %%DOCSDIR%%/html/icon-en-ispell.png @@ -145,6 +89,7 @@ %%DOCSDIR%%/html/icon-th-tis820-2.png %%DOCSDIR%%/html/icon-th-tis820.png %%DOCSDIR%%/html/icon-unicode.png +%%DOCSDIR%%/html/icon-vi-tcvn.png %%DOCSDIR%%/html/icon-vi-telex.png %%DOCSDIR%%/html/icon-vi-viqr.png %%DOCSDIR%%/html/icon-vi-vni.png @@ -171,6 +116,7 @@ %%DOCSDIR%%/html/m17nExProg.html %%DOCSDIR%%/html/modules.html %%DOCSDIR%%/html/pages.html +%%DOCSDIR%%/html/parrot.png %%DOCSDIR%%/html/ru-kbd.png %%DOCSDIR%%/html/ru-phonetic.png %%DOCSDIR%%/html/ru-yawerty.png @@ -187,7 +133,6 @@ %%DOCSDIR%%/html/structMDrawGlyphInfo.html %%DOCSDIR%%/html/structMDrawMetric.html %%DOCSDIR%%/html/structMDrawTextItem.html -%%DOCSDIR%%/html/structMFLTFont.html %%DOCSDIR%%/html/structMFLTGlyph.html %%DOCSDIR%%/html/structMFLTGlyphAdjustment.html %%DOCSDIR%%/html/structMFLTGlyphString.html @@ -200,6 +145,11 @@ %%DOCSDIR%%/html/structMInputMethod.html %%DOCSDIR%%/html/structMInputXIMArgIC.html %%DOCSDIR%%/html/structMInputXIMArgIM.html +%%DOCSDIR%%/html/struct__MFLTFont.html +%%DOCSDIR%%/html/tab_b.gif +%%DOCSDIR%%/html/tab_l.gif +%%DOCSDIR%%/html/tab_r.gif +%%DOCSDIR%%/html/tabs.css %%DOCSDIR%%/m17n-lib.dvi %%DOCSDIR%%/m17n-lib.ps @dirrm %%DOCSDIR%%/html --- m17n-docs-1.5.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810060215.m962Fkux089193>