Attachment 114260 Details for Bug 155898 – ports-devel-libthai-0.1.15_1.patch.txt

ports-devel-libthai-0.1.15_1.patch.txt

ports-devel-libthai-0.1.15_1.patch.txt (text/plain), 8.67 KB, created by Hatuka*nezumi - IKEDA Soji on 2011-06-05 02:10:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hatuka*nezumi - IKEDA Soji

Created: 2011-06-05 02:10:30 UTC

Size: 8.67 KB

patch

obsolete

>? files/patch-Makefile.am
>? files/patch-datrie-Makefile.am
>? files/patch-libthai.pc.in
>? files/patch-src-Makefile.am
>? files/patch-src-thbrk-Makefile.am
>? files/patch-tests-Makefile.am
>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/devel/libthai/Makefile,v
>retrieving revision 1.17
>diff -u -r1.17 Makefile
>--- Makefile	22 Dec 2010 20:05:42 -0000	1.17
>+++ Makefile	5 Jun 2011 01:01:55 -0000
>@@ -6,10 +6,13 @@
> #
> 
> PORTNAME=	libthai
>-PORTVERSION=	0.1.5
>-PORTREVISION=	4
>+PORTVERSION=	0.1.15
>+PORTREVISION=	1
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.usablelabs.com/download/
>+MASTER_SITES=	ftp://linux.thai.net/pub/thailinux/software/libthai/
>+DATRIE_VERSION=	0.2.4
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>+		libdatrie-${DATRIE_VERSION}${EXTRACT_SUFX}
> 
> MAINTAINER=	piyawat@usablelabs.com
> COMMENT=	Thai language support library
>@@ -18,21 +21,29 @@
> GNU_CONFIGURE=	yes
> USE_GMAKE=	yes
> USE_AUTOTOOLS=	automake autoconf libtool
>-AUTOTOOLSFILES=	autogen.sh
> MAKE_JOBS_UNSAFE=	yes
>+BUILD_DEPENDS=	${PREFIX}/lib/libiconv.so:devel/libiconv \
>+		${PREFIX}/bin/doxygen:devel/doxygen
>+CONFIGURE_ENV=	PATH="${WRKDIR}/libdatrie/tools:$(PATH)" \
>+		DATRIE_CFLAGS="-I${WRKDIR}/libdatrie" \
>+		DATRIE_LIBS="${WRKDIR}/libdatrie/datrie/libdatrie.la"
>+MAKE_ENV=	PATH="${WRKDIR}/libdatrie/tools:$(PATH)"
>+
>+NO_INSTALL_MANPAGES=	yes
> 
> ALL_TARGET=	all check
> 
>-MAN3=	libthai.3 thctype.3 wtt.3
>+post-extract:
>+	@cd ${WRKDIR} && ln -s libdatrie-${DATRIE_VERSION} libdatrie
> 
> post-patch:
>-	@${REINPLACE_CMD} -E 's,^(pkgconfigdir = ).*$$,\1$$(prefix)/libdata/pkgconfig,' \
>-		${WRKSRC}/Makefile.am
>-	@${REINPLACE_CMD} -e 's,15,-%%AUTOMAKE_VERSION%%,' -e 's,259,-%%AUTOCONF_VERSION%%,' \
>-		${WRKSRC}/autogen.sh
>+	@cd ${WRKDIR}/libdatrie && mkdir m4 && autoreconf --install --force
>+	@cd ${WRKSRC} && autoreconf --install --force
> 
> pre-configure:
>-	@cd ${WRKSRC} && ${SH} autogen.sh
>+	@cd ${WRKDIR}/libdatrie && \
>+	./configure CFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib && \
>+	${GMAKE}
> 
> .include <bsd.port.pre.mk>
> 
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/devel/libthai/distinfo,v
>retrieving revision 1.1
>diff -u -r1.1 distinfo
>--- distinfo	28 Mar 2006 11:14:15 -0000	1.1
>+++ distinfo	5 Jun 2011 01:01:55 -0000
>@@ -1,3 +1,6 @@
>-MD5 (libthai-0.1.5.tar.gz) = 707d3de8e84f0fdff94adb537a8a5b71
>-SHA256 (libthai-0.1.5.tar.gz) = a968896a8b15aa360bd98d5d94832d317c570accc5abf1375178394115d479da
>-SIZE (libthai-0.1.5.tar.gz) = 915209
>+MD5 (libthai-0.1.15.tar.gz) = 3bc6d925eae36317aac8676be49a5741
>+SHA256 (libthai-0.1.15.tar.gz) = e23eebe92b806b58ab92ddb1bf263253f1b9c4c36d1df04416fe1647dd31c4ed
>+SIZE (libthai-0.1.15.tar.gz) = 509691
>+MD5 (libdatrie-0.2.4.tar.gz) = 7f7d592114f98db9e4c7171c3f2befc5
>+SHA256 (libdatrie-0.2.4.tar.gz) = b2acfbfd9df07780f91352bc1bb16e4d8a32772dc9194bbc35ae600e0591dfa2
>+SIZE (libdatrie-0.2.4.tar.gz) = 359658
>Index: pkg-descr
>===================================================================
>RCS file: /home/ncvs/ports/devel/libthai/pkg-descr,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-descr
>--- pkg-descr	28 Mar 2006 11:14:15 -0000	1.1
>+++ pkg-descr	5 Jun 2011 01:01:55 -0000
>@@ -16,4 +16,4 @@
> * Thai input method
> * Thai output method
> 
>-WWW: http://linux.thai.net/plone/TLWG/libthai/
>+WWW: http://linux.thai.net/projects/libthai/
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/devel/libthai/pkg-plist,v
>retrieving revision 1.4
>diff -u -r1.4 pkg-plist
>--- pkg-plist	23 Jun 2006 02:17:44 -0000	1.4
>+++ pkg-plist	5 Jun 2011 01:01:55 -0000
>@@ -1,4 +1,3 @@
>-bin/cttex
> include/thai/thailib.h
> include/thai/thbrk.h
> include/thai/thcell.h
>@@ -19,6 +18,54 @@
> lib/libthai.a
> lib/libthai.la
> lib/libthai.so
>-lib/libthai.so.0
>+lib/libthai.so.1
> libdata/pkgconfig/libthai.pc
>+share/doc/libthai/html/annotated.html
>+share/doc/libthai/html/bc_s.png
>+share/doc/libthai/html/classes.html
>+share/doc/libthai/html/closed.png
>+share/doc/libthai/html/doxygen.css
>+share/doc/libthai/html/doxygen.png
>+share/doc/libthai/html/files.html
>+share/doc/libthai/html/functions.html
>+share/doc/libthai/html/functions_vars.html
>+share/doc/libthai/html/globals.html
>+share/doc/libthai/html/globals_defs.html
>+share/doc/libthai/html/globals_enum.html
>+share/doc/libthai/html/globals_eval.html
>+share/doc/libthai/html/globals_func.html
>+share/doc/libthai/html/globals_type.html
>+share/doc/libthai/html/index.html
>+share/doc/libthai/html/nav_f.png
>+share/doc/libthai/html/nav_h.png
>+share/doc/libthai/html/open.png
>+share/doc/libthai/html/structBestBrk.html
>+share/doc/libthai/html/structRecovHist.html
>+share/doc/libthai/html/struct__BrkShot.html
>+share/doc/libthai/html/structthcell__t.html
>+share/doc/libthai/html/structthinpconv__t.html
>+share/doc/libthai/html/tab_a.png
>+share/doc/libthai/html/tab_b.png
>+share/doc/libthai/html/tab_h.png
>+share/doc/libthai/html/tab_s.png
>+share/doc/libthai/html/tabs.css
>+share/doc/libthai/html/thailib_8h.html
>+share/doc/libthai/html/thbrk_8h.html
>+share/doc/libthai/html/thcell_8h.html
>+share/doc/libthai/html/thcoll_8h.html
>+share/doc/libthai/html/thctype_8h.html
>+share/doc/libthai/html/thinp_8h.html
>+share/doc/libthai/html/thrend_8h.html
>+share/doc/libthai/html/thstr_8h.html
>+share/doc/libthai/html/thwbrk_8h.html
>+share/doc/libthai/html/thwchar_8h.html
>+share/doc/libthai/html/thwcoll_8h.html
>+share/doc/libthai/html/thwctype_8h.html
>+share/doc/libthai/html/thwstr_8h.html
>+share/doc/libthai/html/tis_8h.html
>+share/doc/libthai/html/wtt_8h.html
>+share/libthai/thbrk.tri
> @dirrm include/thai
>+@dirrm share/libthai
>+@dirrm share/doc/libthai/html
>+@dirrm share/doc/libthai
>--- /dev/null	2011-04-28 00:01:29.169372001 +0900
>+++ files/patch-Makefile.am	2011-03-23 21:26:20.000000000 +0900
>@@ -0,0 +1,10 @@
>+--- Makefile.am.orig	2010-02-24 19:13:59.000000000 +0900
>++++ Makefile.am	2011-03-22 21:19:01.000000000 +0900
>+@@ -2,6 +2,6 @@
>+ 
>+ MAINTAINERCLEANFILES = Makefile.in
>+ 
>+-pkgconfigdir = $(libdir)/pkgconfig
>++pkgconfigdir = $(prefix)/libdata/pkgconfig
>+ pkgconfig_DATA = libthai.pc
>+ 
>--- /dev/null	2011-04-28 00:01:29.169372001 +0900
>+++ files/patch-datrie-Makefile.am	2011-03-23 22:14:17.000000000 +0900
>@@ -0,0 +1,11 @@
>+--- ../libdatrie/datrie/Makefile.am.orig	2010-05-21 13:53:57.000000000 +0900
>++++ ../libdatrie/datrie/Makefile.am	2011-03-22 19:12:23.000000000 +0900
>+@@ -10,7 +10,7 @@
>+ 
>+ INCLUDES = -I$(top_srcdir)
>+ 
>+-lib_LTLIBRARIES = libdatrie.la
>++noinst_LTLIBRARIES = libdatrie.la
>+ 
>+ libdatrie_la_SOURCES =	\
>+ 	typedefs.h	\
>--- /dev/null	2011-04-28 00:01:29.169372001 +0900
>+++ files/patch-libthai.pc.in	2011-03-22 20:28:04.000000000 +0900
>@@ -0,0 +1,9 @@
>+--- libthai.pc.in.orig	2006-08-31 18:01:59.000000000 +0900
>++++ libthai.pc.in	2011-03-22 19:12:23.000000000 +0900
>+@@ -6,6 +6,5 @@
>+ Name: libthai
>+ Description: Thai support library
>+ Version: @VERSION@
>+-Requires.private: datrie-0.2
>+ Libs: -L${libdir} -lthai
>+ Cflags: -I${includedir}
>--- /dev/null	2011-04-28 00:01:29.169372001 +0900
>+++ files/patch-src-Makefile.am	2011-03-22 20:30:53.000000000 +0900
>@@ -0,0 +1,12 @@
>+--- src/Makefile.am.orig	2010-02-24 19:12:59.000000000 +0900
>++++ src/Makefile.am	2011-03-22 20:29:47.000000000 +0900
>+@@ -18,7 +18,8 @@
>+ 	$(top_builddir)/src/thwchar/libthwchar.la \
>+ 	$(top_builddir)/src/thwctype/libthwctype.la \
>+ 	$(top_builddir)/src/thwstr/libthwstr.la \
>+-	$(top_builddir)/src/thwbrk/libthwbrk.la 
>++	$(top_builddir)/src/thwbrk/libthwbrk.la \
>++	$(DATRIE_LIBS)
>+ 
>+ if LD_HAS_VERSION_SCRIPT
>+ EXPORTS_FLAGS = -Wl,-version-script -Wl,$(srcdir)/libthai.map
>--- /dev/null	2011-04-28 00:01:29.169372001 +0900
>+++ files/patch-src-thbrk-Makefile.am	2011-03-22 19:15:28.000000000 +0900
>@@ -0,0 +1,8 @@
>+--- src/thbrk/Makefile.am.orig	2007-06-11 14:13:55.000000000 +0900
>++++ src/thbrk/Makefile.am	2011-03-22 19:12:23.000000000 +0900
>+@@ -15,5 +15,4 @@
>+ 	brk-maximal.c	\
>+ 	brk-maximal.h
>+ 
>+-libthbrk_la_LIBADD = $(DATRIE_LIBS)
>+ 
>--- /dev/null	2011-04-28 00:01:29.169372001 +0900
>+++ files/patch-tests-Makefile.am	2011-03-23 21:58:43.000000000 +0900
>@@ -0,0 +1,20 @@
>+--- tests/Makefile.am.orig	2010-02-24 19:14:30.000000000 +0900
>++++ tests/Makefile.am	2011-03-23 21:58:08.000000000 +0900
>+@@ -68,7 +68,8 @@
>+ 	$(top_builddir)/src/thbrk/libthbrk.la \
>+ 	$(top_builddir)/src/thwchar/libthwchar.la \
>+ 	$(top_builddir)/src/thstr/libthstr.la \
>+-	$(top_builddir)/src/thctype/libthctype.la
>++	$(top_builddir)/src/thctype/libthctype.la \
>++	$(DATRIE_LIBS)
>+ 
>+ test_thwchar_SOURCES = test_thwchar.c
>+ test_thwchar_LDADD = $(top_builddir)/src/thwchar/libthwchar.la
>+@@ -80,5 +81,6 @@
>+ 	$(top_builddir)/src/thbrk/libthbrk.la \
>+ 	$(top_builddir)/src/thwchar/libthwchar.la \
>+ 	$(top_builddir)/src/thstr/libthstr.la \
>+-	$(top_builddir)/src/thctype/libthctype.la
>++	$(top_builddir)/src/thctype/libthctype.la \
>++	$(DATRIE_LIBS)
>+

Actions: View

Attachments on bug 155898: 114259 | 114260 | 114261