diff options
Diffstat (limited to 'textproc/iiimf-protocol-lib')
8 files changed, 186 insertions, 54 deletions
diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile index 848070740b90..edf273495e99 100644 --- a/textproc/iiimf-protocol-lib/Makefile +++ b/textproc/iiimf-protocol-lib/Makefile @@ -10,31 +10,49 @@ PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- -DISTNAME= im-sdk -DISTFILES= ${DISTNAME}-src-${IIIMF_VER}.tgz +DISTNAME= im-sdk-src-${IIIMF_VER} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= kcwu@csie.org COMMENT= Internet/Intranet Input Method Framework protocol library -IIIMF_VER= r12_0_1-svn1891 -WRKSRC= ${WRKDIR}/${DISTNAME}-${IIIMF_VER}/lib/iiimp +IIIMF_VER= r12_1-svn2002 INSTALLS_SHLIB= yes -USE_REINPLACE= yes -USE_OPENSSL= yes -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_ARGS= --includedir=${PREFIX}/include/iiimf/iiimp +USE_REINPLACE= yes +USE_GMAKE= yes +USE_GNOME= intltool +WANT_AUTOCONF_VER=253 +WANT_AUTOHEADER_VER=253 +WANT_AUTOMAKE_VER=15 +WANT_LIBTOOL_VER=15 + +WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimp +PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 503000 +IGNORE= "It is supported on FreeBSD 5.3 and later" +.endif + +.if ${ARCH} != "i386" +IGNORE= "${ARCH} is not support." +.endif + +MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX" +UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \ + AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \ + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} post-patch: ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ - ${WRKSRC}/../../acfiles/im_common.m4 \ - ${WRKSRC}/configure.ac + ${WRKSRC}/../../acfiles/im_common.m4 pre-configure: - cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../../acfiles - ${TOUCH} ${WRKSRC}/config.h.in + (cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles) + (cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig) + +do-configure: + (cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX}) -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/textproc/iiimf-protocol-lib/distinfo b/textproc/iiimf-protocol-lib/distinfo index 29d049a782bc..440e49d16220 100644 --- a/textproc/iiimf-protocol-lib/distinfo +++ b/textproc/iiimf-protocol-lib/distinfo @@ -1,2 +1,2 @@ -MD5 (im-sdk-src-r12_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe -SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118 +MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a +SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292 diff --git a/textproc/iiimf-protocol-lib/files/patch-Makefile b/textproc/iiimf-protocol-lib/files/patch-Makefile new file mode 100644 index 000000000000..85df0e345035 --- /dev/null +++ b/textproc/iiimf-protocol-lib/files/patch-Makefile @@ -0,0 +1,19 @@ +--- Makefile Thu Apr 8 03:28:00 2004 ++++ Makefile Wed Feb 16 14:09:34 2005 +@@ -2,6 +2,7 @@ + AUTOMAKE = automake + AUTOHEADER = autoheader + AUTOCONF = autoconf ++LIBTOOLIZE = libtoolize + + CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ + $(AUTOHEADER) && \ +@@ -21,7 +22,7 @@ + + update-acfiles: + cd acfiles && \ +- $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ ++ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ + rm -f Makefile.in aclocal.m4 + + config: diff --git a/textproc/iiimf-protocol-lib/files/patch-lib-iiimp-data-iiimp-dataP.h b/textproc/iiimf-protocol-lib/files/patch-lib-iiimp-data-iiimp-dataP.h deleted file mode 100644 index d530110adcc2..000000000000 --- a/textproc/iiimf-protocol-lib/files/patch-lib-iiimp-data-iiimp-dataP.h +++ /dev/null @@ -1,26 +0,0 @@ ---- data/iiimp-dataP.h.orig Tue Aug 24 13:38:12 2004 -+++ data/iiimp-dataP.h Wed Sep 8 23:04:47 2004 -@@ -14,8 +14,13 @@ - extern "C" { - #endif - -+#if defined(BIG_ENDIAN) && defined(BYTE_ORDER) && (BIG_ENDIAN==BYTE_ORDER) -+#define _IT_IS_BIG_ENDIAN_LALALA_ -+#elif defined(_BIG_ENDIAN) && defined(_BYTE_ORDER) && (_BIG_ENDIAN==_BYTE_ORDER) -+#define _IT_IS_BIG_ENDIAN_LALALA_ -+#endif - --#if defined(_BIG_ENDIAN) || defined(WORDS_BIGENDIAN) -+#if defined(_IT_IS_BIG_ENDIAN_LALALA_) - - #define GETU16(n, r, p, b) (((n) = ((0 == (b)) ? \ - (((*((uchar_t *)(p + 0))) << 8) + \ -@@ -113,7 +118,7 @@ - - #else /* !(_BIG_ENDIAN || WORDS_BIGENDIAN) */ - --#define GET_SCOPE_FOR_HOTKEY(n, p, b) \ -+#define GET_SCOPE_FOR_HOTKEY(n, p, b) \ - if (0 == (b)) { \ - if ((*((uchar_t *)(p + 1)) & 0x80)) \ - (n) = 1; \ diff --git a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_autogen.sh b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_autogen.sh new file mode 100644 index 000000000000..fdb9cf2669cd --- /dev/null +++ b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_autogen.sh @@ -0,0 +1,72 @@ +--- lib/iiimp/autogen.sh Wed Mar 24 05:43:35 2004 ++++ lib/iiimp/autogen.sh Wed Feb 16 15:03:52 2005 +@@ -12,7 +12,14 @@ + + DIE=0 + +-(libtool --version) < /dev/null > /dev/null 2>&1 || { ++LIBTOOL=libtool15 ++INTLTOOLIZE=intltoolize15 ++ACLOCAL=aclocal15 ++AUTOHEADER=autoheader253 ++AUTOMAKE=automake15 ++AUTOCONF=autoconf253 ++ ++(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have libtool installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," +@@ -30,7 +37,7 @@ + } + + (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && { +- (intltoolize --version) < /dev/null > /dev/null 2>&1 || { ++ (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME." + echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz" +@@ -39,7 +46,7 @@ + } + } + +-(autoconf --version) < /dev/null > /dev/null 2>&1 || { ++(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $PROJECT." + echo "libtool the appropriate package for your distribution," +@@ -48,8 +55,8 @@ + } + + have_automake=false +-if automake --version < /dev/null > /dev/null 2>&1 ; then +- automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'` ++if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then ++ automake_version=`${AUTOMAKE} --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'` + case $automake_version in + 1.2*|1.3*|1.4) + ;; +@@ -96,19 +103,19 @@ + fi + if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then + echo "Running intltoolize..." +- intltoolize --copy --force --automake ++ ${INTLTOOLIZE} --copy --force --automake + fi + + # intentionally we don't call "libtoolize --force" + # to avoid overriding ../../acfiles/ltmain.h, which we don't want to happen! + +-aclocal -I ../../acfiles $ACLOCAL_FLAGS ++${ACLOCAL} -I ../../acfiles $ACLOCAL_FLAGS + + # optionally feature autoheader +-(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader ++(${AUTOHEADER} --version) < /dev/null > /dev/null 2>&1 && ${AUTOHEADER} + +-automake -a $am_opt +-autoconf ++${AUTOMAKE} -a $am_opt ++${AUTOCONF} + cd $ORIGDIR + + if test -z "$AUTOGEN_SUBDIR_MODE"; then diff --git a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c new file mode 100644 index 000000000000..60d0a2d3fede --- /dev/null +++ b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c @@ -0,0 +1,29 @@ +--- lib/iiimp/data/comp-string.c Fri Nov 1 14:32:45 2002 ++++ lib/iiimp/data/comp-string.c Wed Feb 16 22:48:21 2005 +@@ -63,9 +63,12 @@ + #if defined(lint) && defined(HAVE_NOTE_H) + NOTE(ARGUNUSED(data_s)) + #endif /* lint && HAVE_NOTE_H */ +- if (NULL == str) return; +- free(str->ptr); +- free(str); ++ if (str) { ++ if (str->ptr) ++ free(str->ptr); ++ str->ptr = NULL; ++ free(str); ++ } + return; + } + +@@ -79,7 +82,9 @@ + IIIMP_string * str_next; + for (; NULL != str; str = str_next) { + str_next = str->next; +- free(str->ptr); ++ if (str->ptr) ++ free(str->ptr); ++ str->ptr = NULL; + free(str); + } + return; diff --git a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c new file mode 100644 index 000000000000..0896e8dc8236 --- /dev/null +++ b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c @@ -0,0 +1,22 @@ +--- lib/iiimp/data/im-connect.c Fri Jun 20 12:06:33 2003 ++++ lib/iiimp/data/im-connect.c Wed Feb 16 22:43:17 2005 +@@ -41,10 +41,15 @@ + void + iiimp_connect_delete(IIIMP_data_s * data_s, IIIMP_message * m) + { +- if (NULL == m) return; +- iiimp_string_delete(data_s, m->v.connect.user_name); +- iiimp_string_list_delete(data_s, m->v.connect.auth); +- free(m); ++ if (m) { ++ if (m->v.connect.user_name) ++ iiimp_string_delete(data_s, m->v.connect.user_name); ++ m->v.connect.user_name = NULL; ++ if (m->v.connect.auth) ++ iiimp_string_list_delete(data_s, m->v.connect.auth); ++ m->v.connect.auth = NULL; ++ free(m); ++ } + return; + } + diff --git a/textproc/iiimf-protocol-lib/pkg-plist b/textproc/iiimf-protocol-lib/pkg-plist index dd8f11c828b6..f8b7a5549ad1 100644 --- a/textproc/iiimf-protocol-lib/pkg-plist +++ b/textproc/iiimf-protocol-lib/pkg-plist @@ -1,10 +1,8 @@ -include/iiimf/iiimp/iiimp.h -include/iiimf/iiimp/iiimp-opcode.h -include/iiimf/iiimp/iiimp-keycode.h -include/iiimf/iiimp/iiimp-data.h -include/iiimf/iiimp/iiimp-character-subsets.h -lib/libiiimp.so.0 -lib/libiiimp.so lib/libiiimp.a -@dirrm include/iiimf/iiimp -@unexec rmdir %D/include/iiimf 2>/dev/null || true +lib/libiiimp.so +lib/libiiimp.so.0 +include/iiimp-character-subsets.h +include/iiimp-data.h +include/iiimp-keycode.h +include/iiimp-opcode.h +include/iiimp.h |