ports/72645: [MAINTAINER] textproc/iiimf-client-lib: update to r12.0.1
Kuang-che Wu
kcwu at csie.org
Wed Oct 13 15:40:26 UTC 2004
>Number: 72645
>Category: ports
>Synopsis: [MAINTAINER] textproc/iiimf-client-lib: update to r12.0.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Oct 13 15:40:25 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Kuang-che Wu
>Release: FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD kcwu.homeip.net 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Sat Sep 4 05:33:38 CST
>Description:
- Update to r12.0.1
- Respected to ${PREFIX}
- Please use this patch instead of PR ports/72612
Added file(s):
- files/patch-acfiles_check_sys.m4
- files/patch-lib-iiimcf-Makefile.am
- files/patch-lib-iiimcf-test-check-Makefile.am
- files/patch-lib_EIMIL_test_Makefile.am
Removed file(s):
- files/patch-lib_EIMIL_test_Makefile.in
- files/patch-lib_iiimcf_Makefile.in
- files/patch-lib_iiimcf_test_check_Makefile.in
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- iiimf-client-lib-r12.0.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-client-lib/Makefile /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/Makefile
--- /usr/ports/textproc/iiimf-client-lib/Makefile Tue May 11 15:17:15 2004
+++ /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/Makefile Wed Oct 13 23:33:50 2004
@@ -5,40 +5,66 @@
# $FreeBSD: ports/textproc/iiimf-client-lib/Makefile,v 1.4 2004/05/11 07:17:15 vs Exp $
#
-PORTNAME= iiimf-client-lib
-PORTVERSION= ${IIIMF_VER:S/_/./:C/-.*//}
-PORTREVISION= 1
+PORTNAME= client-lib
+PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
CATEGORIES= textproc
-MASTER_SITES= http://www.openi18n.org/download/docs/im-sdk/
+MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
+PKGNAMEPREFIX= iiimf-
DISTNAME= im-sdk
-DISTFILES= ${DISTNAME}.${IIIMF_VER:S/-/./}${EXTRACT_SUFX}
+DISTFILES= ${DISTNAME}-src-${IIIMF_VER}.tgz
MAINTAINER= kcwu at csie.org
COMMENT= Internet/Intranet Input Method Client Framework
LIB_DEPENDS= iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib
-IIIMF_VER= r11_4-1467
+IIIMF_VER= r12_0_1-svn1891
WRKSRC= ${WRKDIR}/${DISTNAME}-${IIIMF_VER}
INSTALL_WRKSRC= ${WRKSRC}/lib/iiimcf
-USE_BZIP2= yes
-USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_FLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
-CONFIGURE_ARGS= --prefix=${PREFIX} \
- --includedir=${PREFIX}/include/iiimf
+USE_AUTOCONF_VER= 259
+USE_AUTOHEADER_VER= 259
+USE_AUTOMAKE_VER= 19
+USE_LIBTOOL_VER= 15
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \
+ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS= --includedir=${PREFIX}/include/iiimf
DIRS= lib/EIMIL lib/iiimcf
post-patch:
.for DIR in ${DIRS}
- ${REINPLACE_CMD} -e "s,-lpthread,-pthread,g" \
- -e "s,-D_POSIX_C_SOURCE=199506L,,g" \
- -e "s,has_xiccallback=no,has_xiccallback=yes,g" \
- -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
- -e "s,-I\$$(IM_INCLUDEDIR),-I${LOCALBASE}/include/iiimf,g" \
- ${WRKSRC}/${DIR}/configure
+ ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
+ ${WRKSRC}/${DIR}/configure.ac
+.endfor
+ ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
+ ${WRKSRC}/acfiles/im_common.m4
+
+pre-configure:
+.for DIR in ${DIRS}
+ cd ${WRKSRC}/${DIR} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../../acfiles
+ ${TOUCH} ${WRKSRC}/${DIR}/config.h.in
+.endfor
+
+# XXX following are dup what bsd.*.mk do. how to deal this neatly?
+run-autotools:
+.for DIR in ${DIRS}
+ @(cd ${WRKSRC}/${DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
+ ${AUTOMAKE_ARGS})
+ @(cd ${WRKSRC}/${DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
+ ${AUTOCONF_ARGS})
+ @(cd ${WRKSRC}/${DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
+ ${AUTOHEADER_ARGS})
+.endfor
+
+patch-autotools:
+.for DIR in ${DIRS}
+ cd ${WRKSRC}/${DIR} && ${REINPLACE_CMD} -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
+ -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
+ -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
+ ${LIBTOOLFILES}
.endfor
do-configure:
@@ -48,7 +74,7 @@
do-build:
.for DIR in ${DIRS}
- cd ${WRKSRC}/${DIR} && ${GMAKE} all
+ cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
.endfor
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-client-lib/distinfo /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/distinfo
--- /usr/ports/textproc/iiimf-client-lib/distinfo Wed Mar 31 11:11:42 2004
+++ /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/distinfo Wed Oct 13 13:19:39 2004
@@ -1,2 +1,2 @@
-MD5 (im-sdk.r11_4.1467.tar.bz2) = ca6b6ac7c41641db6eaa0fa395748f90
-SIZE (im-sdk.r11_4.1467.tar.bz2) = 7253894
+MD5 (im-sdk-src-r12_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe
+SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118
diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
--- /usr/ports/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 Thu Jan 1 08:00:00 1970
+++ /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 Wed Oct 13 13:19:39 2004
@@ -0,0 +1,36 @@
+--- acfiles/check_sys.m4.orig Thu Aug 12 18:01:23 2004
++++ acfiles/check_sys.m4 Wed Sep 8 16:15:39 2004
+@@ -74,6 +74,11 @@
+ ## Checks for thread library.
+ AC_CHECK_LIB(pthread, pthread_create, [ HAVE_LIBPTHREAD="yes" ])
+ AC_CHECK_LIB(thread, thr_create, [ HAVE_LIBUITHREAD="yes" ])
++
++ case "${target}" in
++ *freebsd*) HAVE_LIBPTHREAD="yes";;
++ esac
++
+ if test "X${HAVE_LIBPTHREAD}" = "Xyes" ; then
+ HAVE_THREAD="pthread"
+ elif test "X${HAVE_LIBUITHREAD}" = "Xyes" ; then
+@@ -210,8 +215,6 @@
+ COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
+ ;;
+ *freebsd*)
+- THREAD_LDFLAGS="-pthread"
+- PTHREAD_LIBS=""
+ ;;
+ esac
+
+@@ -249,9 +252,9 @@
+ THREAD_CXX_CFLAGS="-mt"
+ HAVE_THREAD="uithread"
+ ;;
+- *freebsd*@gcc:*)
+- THREAD_LDFLAGS="-pthread"
+- THREAD_LIBS=""
++ *freebsd*)
++ THREAD_CXX_CFLAGS="${PTHREAD_CFLAGS}"
++ THREAD_LIBS="${PTHREAD_LIBS}"
+ HAVE_THREAD="freebsd-pthread"
+ ;;
+ *linux*)
diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am
--- /usr/ports/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am Thu Jan 1 08:00:00 1970
+++ /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am Wed Oct 13 23:09:53 2004
@@ -0,0 +1,11 @@
+--- lib/iiimcf/Makefile.am.orig Wed Aug 25 08:46:38 2004
++++ lib/iiimcf/Makefile.am Sun Sep 5 02:30:16 2004
+@@ -2,7 +2,7 @@
+ SUBDIRS = . test
+ #libdir = /usr/local/lib
+ libiiimcf_la_LDFLAGS = -version-info $(LIBIIIMCF_MAJOR_VERSION):$(LIBIIIMCF_MINOR_VERSION) \
+- -export-dynamic -export-symbols libiiimcf.sym ../iiimp/libiiimp.la
++ -export-dynamic -export-symbols libiiimcf.sym -L$(LOCALBASE)/lib -liiimp
+ libiiimcf_la_CFLAGS = -DDEBUG
+ libiiimcf_la_SOURCES = iiimcf.c input-method.c attr.c commit.c context.c event.c \
+ lookup_choice.c message.c preedit.c status.c trigger.c \
diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am
--- /usr/ports/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am Thu Jan 1 08:00:00 1970
+++ /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am Wed Oct 13 23:09:58 2004
@@ -0,0 +1,20 @@
+--- lib/iiimcf/test/check/Makefile.am.orig Wed Mar 26 02:24:03 2003
++++ lib/iiimcf/test/check/Makefile.am Wed Sep 8 17:16:00 2004
+@@ -1,13 +1,13 @@
+ IIIMCF_DIR = ../..
+ TEST_LIBS = -L$(IIIMCF_DIR) -liiimcf \
+- -L$(IIIMCF_DIR)/../iiimp -liiimp
++ -L$(LOCALBASE)/lib -liiimp
+ TEST_LIBPATH = $(IIIMCF_DIR)/.libs:$(IIIMCF_DIR)/../EIMIL/.libs:$(IIIMCF_DIR)/../iiimp/.libs
+ basic_SOURCES = basic.c common.c
+-basic_LDADD = $(TEST_LIBS)
++basic_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
+ sendkey1_SOURCES = sendkey1.c common.c
+-sendkey1_LDADD = $(TEST_LIBS)
++sendkey1_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
+ sendkey2_SOURCES = sendkey2.c common.c
+-sendkey2_LDADD = $(TEST_LIBS)
++sendkey2_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
+ noinst_PROGRAMS = basic sendkey1 sendkey2
+
+ TEST_SETLDPATH = env LD_LIBRARY_PATH=$(TEST_LIBPATH):$$LD_LIBRARY_PATH
diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am
--- /usr/ports/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am Thu Jan 1 08:00:00 1970
+++ /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am Wed Oct 13 13:19:39 2004
@@ -0,0 +1,23 @@
+--- lib/EIMIL/test/Makefile.am.orig Wed Sep 8 22:08:11 2004
++++ lib/EIMIL/test/Makefile.am Wed Sep 8 22:09:19 2004
+@@ -1,14 +1,14 @@
+ TEST_CFLAGS = -ggdb -DDEBUG
+ EIMILLIB = -L.. -lEIMIL
+-parsertest_CFLAGS = $(TEST_CFLAGS)
++parsertest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
+ parsertest_SOURCES = parsertest.c
+-parsertest_LDADD = $(EIMILLIB)
+-arithtest_CFLAGS = $(TEST_CFLAGS)
++parsertest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
++arithtest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
+ arithtest_SOURCES = arithtest.c
+-arithtest_LDADD = $(EIMILLIB)
+-flowtest_CFLAGS = $(TEST_CFLAGS)
++arithtest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
++flowtest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
+ flowtest_SOURCES = flowtest.c
+-flowtest_LDADD = $(EIMILLIB)
++flowtest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
+ bin_PROGRAMS = parsertest arithtest flowtest
+
+ test: parsertest arithtest flowtest
diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.in /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.in
--- /usr/ports/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.in Tue May 11 15:17:15 2004
+++ /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.in Thu Jan 1 08:00:00 1970
@@ -1,17 +0,0 @@
---- lib/EIMIL/test/Makefile.in.orig Tue May 11 08:33:21 2004
-+++ lib/EIMIL/test/Makefile.in Tue May 11 08:33:59 2004
-@@ -162,12 +162,12 @@
- @AMDEP_TRUE@ ./$(DEPDIR)/flowtest-flowtest.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/parsertest-parsertest.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(THREAD_CXX_FLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+ $(AM_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) -o $@
- DIST_SOURCES = $(arithtest_SOURCES) $(flowtest_SOURCES) \
- $(parsertest_SOURCES)
- DIST_COMMON = Makefile.am Makefile.in
diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.in /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.in
--- /usr/ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.in Sun Dec 28 19:30:39 2003
+++ /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.in Thu Jan 1 08:00:00 1970
@@ -1,11 +0,0 @@
---- lib/iiimcf/Makefile.in.orig Sun Dec 7 17:37:15 2003
-+++ lib/iiimcf/Makefile.in Sun Dec 7 17:37:41 2003
-@@ -124,7 +124,7 @@
- SUBDIRS = . test
- #libdir = /usr/local/lib
- libiiimcf_la_LDFLAGS = -module -version-info $(LIBIIIMCF_MAJOR_VERSION):$(LIBIIIMCF_MINOR_VERSION) \
-- -export-dynamic -export-symbols libiiimcf.sym -L../iiimp -liiimp
-+ -export-dynamic -export-symbols libiiimcf.sym -L$(prefix)/lib -liiimp
-
- libiiimcf_la_CFLAGS = -DDEBUG
- libiiimcf_la_SOURCES = iiimcf.c attr.c commit.c context.c event.c \
diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_test_check_Makefile.in /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-lib_iiimcf_test_check_Makefile.in
--- /usr/ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_test_check_Makefile.in Sun Dec 28 19:30:39 2003
+++ /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/files/patch-lib_iiimcf_test_check_Makefile.in Thu Jan 1 08:00:00 1970
@@ -1,11 +0,0 @@
---- lib/iiimcf/test/check/Makefile.in.orig Sat Dec 6 05:07:37 2003
-+++ lib/iiimcf/test/check/Makefile.in Sat Dec 6 05:08:00 2003
-@@ -96,7 +96,7 @@
- IM_LOCALEDIR = @IM_LOCALEDIR@
- IM_TOPDIR = @IM_TOPDIR@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ $(THREAD_LDFLAGS)
- LIBIIIMCF_MAJOR_VERSION = @LIBIIIMCF_MAJOR_VERSION@
- LIBIIIMCF_MINOR_VERSION = @LIBIIIMCF_MINOR_VERSION@
- LIBIIIMCF_VERSION = @LIBIIIMCF_VERSION@
diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-client-lib/pkg-plist /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/pkg-plist
--- /usr/ports/textproc/iiimf-client-lib/pkg-plist Sun Dec 28 19:30:39 2003
+++ /files/home/kcwu/work/ports/x/textproc/iiimf-client-lib/pkg-plist Wed Oct 13 13:19:39 2004
@@ -1,5 +1,4 @@
include/iiimf/iiimcf.h
lib/libiiimcf.so.2
lib/libiiimcf.so
-lib/libiiimcf.la
lib/libiiimcf.a
--- iiimf-client-lib-r12.0.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list