From 40a684ff1e8608bde986585a735e66d9a456e675 Mon Sep 17 00:00:00 2001 From: Daichi GOTO Date: Tue, 24 May 2005 12:37:50 +0000 Subject: IIIMF-related ports: - drop maintainership - update to r12.2 - some bug fixes PR: 81184 Submitted by: Masanori OZAWA Approved by: maintainer --- korean/iiimf-le-hangul/Makefile | 57 ++++++++------------ korean/iiimf-le-hangul/distinfo | 4 +- korean/iiimf-le-hangul/files/patch-Makefile | 60 ++++++++++++++++------ .../iiimf-le-hangul/files/patch-leif_Makefile.am | 8 +++ .../iiimf-le-hangul/files/patch-leif_configure.ac | 55 ++++++-------------- korean/iiimf-le-hangul/pkg-plist | 13 +++-- 6 files changed, 95 insertions(+), 102 deletions(-) create mode 100644 korean/iiimf-le-hangul/files/patch-leif_Makefile.am (limited to 'korean') diff --git a/korean/iiimf-le-hangul/Makefile b/korean/iiimf-le-hangul/Makefile index c544ebb2a999..8b79dd91986a 100644 --- a/korean/iiimf-le-hangul/Makefile +++ b/korean/iiimf-le-hangul/Makefile @@ -6,67 +6,50 @@ # PORTNAME= le-hangul -PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} -PORTREVISION= 1 +PORTVERSION= 12.2 CATEGORIES= korean textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- -DISTNAME= im-sdk-src-${IIIMF_VER} +DISTNAME= iiimf-src-${PORTVERSION} +EXTRACT_SUFX= .tar.bz2 -MAINTAINER= daichi@FreeBSD.org +MAINTAINER= ozawa@ongs.co.jp COMMENT= IIIMF Hangul input method engine -RUN_DEPENDS= ${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server +RUN_DEPENDS= iiimd:${PORTSDIR}/textproc/iiimf-server + +ONLY_FOR_ARCHS= i386 -IIIMF_VER= r12_1-svn2002 USE_BZIP2= yes USE_REINPLACE= yes USE_GMAKE= yes USE_XLIB= yes -USE_AUTOCONF_VER= 259 -USE_AUTOHEADER_VER= 259 -USE_AUTOMAKE_VER= 19 +WANT_AUTOCONF_VER= 259 +WANT_AUTOHEADER_VER= 259 +WANT_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 -AUTOMAKE_ARGS+= --add-missing -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} - -WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif -PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} +WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} +BUILDDIR= ${WRKSRC}/leif .include .if ${OSVERSION} < 503000 -IGNORE= "It is supported on FreeBSD 5.3 and later" -.endif - -.if ${ARCH} != "i386" -IGNORE= "${ARCH} is not support." +IGNORE= It is supported on FreeBSD 5.3 and later. .endif CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \ - AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \ - LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ - ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" +CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" post-patch: - ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ - ${WRKSRC}/../acfiles/im_common.m4 \ - ${WRKSRC}/../lib/CSConv/csconv.h + ${REINPLACE_CMD} \ + -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ + -e "s,%%PREFIX%%,${PREFIX},g" \ + ${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am pre-configure: - @cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles - @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy - @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ - -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} - @cd ${WRKSRC} && ${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} - @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig + @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config .include diff --git a/korean/iiimf-le-hangul/distinfo b/korean/iiimf-le-hangul/distinfo index 440e49d16220..4416cce728d0 100644 --- a/korean/iiimf-le-hangul/distinfo +++ b/korean/iiimf-le-hangul/distinfo @@ -1,2 +1,2 @@ -MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a -SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292 +MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c +SIZE (iiimf-src-12.2.tar.bz2) = 11452670 diff --git a/korean/iiimf-le-hangul/files/patch-Makefile b/korean/iiimf-le-hangul/files/patch-Makefile index bcc2cb24a1c8..c13173f534a8 100644 --- a/korean/iiimf-le-hangul/files/patch-Makefile +++ b/korean/iiimf-le-hangul/files/patch-Makefile @@ -1,19 +1,47 @@ ---- 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 +--- Makefile.orig Mon May 9 15:32:45 2005 ++++ Makefile Mon May 9 15:35:03 2005 +@@ -1,29 +1,31 @@ + ## deprecated in favour of AUTORECONF +-#ACLOCAL = aclocal +-#AUTOMAKE = automake --add-missing --copy +-#LIBTOOLIZE = libtoolize --force --copy +-#AUTOHEADER = autoheader +-#AUTOCONF = autoconf ++ACLOCAL = aclocal19 ++AUTOMAKE = automake19 --add-missing --copy ++LIBTOOLIZE = libtoolize15 --force --copy ++AUTOHEADER = autoheader259 ++AUTOCONF = autoconf259 + #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ + # $(LIBTOOLIZE) && \ + # $(AUTOHEADER) && \ + # $(AUTOMAKE) && \ + # $(AUTOCONF) - CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ - $(AUTOHEADER) && \ -@@ -21,7 +22,7 @@ +-AUTORECONF = autoreconf ++AUTORECONF = autoreconf259 + BOOTSTRAP = $(AUTORECONF) --install --force + INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake - update-acfiles: - cd acfiles && \ -- $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ - rm -f Makefile.in aclocal.m4 +-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var ++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var + +-INTLDIRS = iiimgcf gnome-im-switcher ++#INTLDIRS = iiimgcf gnome-im-switcher + +-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \ +- iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \ +- iiimxcf/xiiimp.so iiimxcf/htt_xbe \ +- iiimgcf gnome-im-switcher doc ++BUILDDIRS = leif ++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \ ++# iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \ ++# iiimxcf/xiiimp.so iiimxcf/htt_xbe \ ++# iiimgcf gnome-im-switcher doc + +-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun ++CONFIGDIRS = $(BUILDDIRS) ++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun + + all: compile - config: diff --git a/korean/iiimf-le-hangul/files/patch-leif_Makefile.am b/korean/iiimf-le-hangul/files/patch-leif_Makefile.am new file mode 100644 index 000000000000..710a4d8844f9 --- /dev/null +++ b/korean/iiimf-le-hangul/files/patch-leif_Makefile.am @@ -0,0 +1,8 @@ +--- leif/Makefile.am.orig Fri May 13 15:45:41 2005 ++++ leif/Makefile.am Fri May 13 15:46:03 2005 +@@ -1,4 +1,4 @@ + AUTOMAKE_OPTIONS = foreign + SUBDIRS = $(LE_TARGETS) + +-ACLOCAL_AMFLAGS = -I ../acfiles ++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles diff --git a/korean/iiimf-le-hangul/files/patch-leif_configure.ac b/korean/iiimf-le-hangul/files/patch-leif_configure.ac index 8ff937c6020d..e9eeed725ade 100644 --- a/korean/iiimf-le-hangul/files/patch-leif_configure.ac +++ b/korean/iiimf-le-hangul/files/patch-leif_configure.ac @@ -1,53 +1,28 @@ ---- leif/configure.ac.orig Wed Oct 6 23:00:36 2004 -+++ leif/configure.ac Thu Mar 24 18:06:01 2005 -@@ -44,15 +44,15 @@ +--- leif/configure.ac.orig Wed May 11 13:01:08 2005 ++++ leif/configure.ac Wed May 11 13:02:22 2005 +@@ -75,16 +75,16 @@ - IM_CHECK_SYSTEM - IM_CHECK_DLOPEN --IM_CHECK_CANNA --IM_CHECK_FREEWNN -+dnl IM_CHECK_CANNA -+dnl IM_CHECK_FREEWNN + LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}" - IM_CHECK_X --IM_CHECK_GTK --IM_CHECK_MOTIF --PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0) --AC_SUBST(GTK2_CFLAGS) --AC_SUBST(GTK2_LIBS) -+dnl IM_CHECK_GTK -+dnl IM_CHECK_MOTIF -+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0) -+dnl AC_SUBST(GTK2_CFLAGS) -+dnl AC_SUBST(GTK2_LIBS) - - dnl -------------------------------------------------------------------------------- - dnl Section 5: compilation options -@@ -63,23 +63,15 @@ - - CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \ - ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \ -- ${THREAD_COMMON_CXX_CFLAGS}" -+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}" - - CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \ - ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \ -- ${THREAD_COMMON_CXX_CFLAGS}" -+ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}" - --LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}" -+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}" +-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test" ++LE_TARGETS="hangul" --LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing" -- -IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna) -IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn) +-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing) -IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common) -IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk) -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux) -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux) -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif) -+LE_TARGETS="hangul" ++#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna) ++#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn) ++#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing) ++#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common) ++#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk) ++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux) ++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux) ++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif) dnl -------------------------------------------------------------------------------- dnl Section 6: compilation test diff --git a/korean/iiimf-le-hangul/pkg-plist b/korean/iiimf-le-hangul/pkg-plist index e3a4870503c9..242686ebf17e 100644 --- a/korean/iiimf-le-hangul/pkg-plist +++ b/korean/iiimf-le-hangul/pkg-plist @@ -1,7 +1,6 @@ -lib/im/leif/hangul.so -lib/im/locale/ko_KR/hangul.conf -lib/im/locale/ko_KR/tables/candidate.txt -@dirrm lib/im/locale/ko_KR/tables -@dirrm lib/im/locale/ko_KR -@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 || true -@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 || true +lib/iiim/le/hangul/hangul.so +lib/iiim/le/hangul/hangul.conf +lib/iiim/le/hangul/tables/candidate.txt +@dirrm lib/iiim/le/hangul/tables +@dirrm lib/iiim/le/hangul +@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true -- cgit v1.2.3