Date: Wed, 13 Oct 2004 15:38:53 +0800 (CST) From: Kuang-che Wu <kcwu@csie.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/72621: [MAINTAINER] chinese/le-newpy: update to r12.0.1 Message-ID: <200410130738.i9D7crHX075124@kcwu.homeip.net> Resent-Message-ID: <200410130740.i9D7eWxw065420@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72621
>Category: ports
>Synopsis: [MAINTAINER] chinese/le-newpy: 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 07:40:32 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
Added file(s):
- files/patch-leif_configure.ac
Removed file(s):
- files/patch-leif_newpy_PYIM.h
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- iiimf-le-newpy-r12.0.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/chinese/iiimf-le-newpy/Makefile /files/home/kcwu/work/ports/x/chinese/iiimf-le-newpy/Makefile
--- /usr/ports/chinese/iiimf-le-newpy/Makefile Wed Feb 4 13:18:54 2004
+++ /files/home/kcwu/work/ports/x/chinese/iiimf-le-newpy/Makefile Wed Oct 13 13:19:39 2004
@@ -5,52 +5,59 @@
# $FreeBSD: ports/chinese/iiimf-le-newpy/Makefile,v 1.2 2004/02/04 05:18:54 marcus Exp $
#
-PORTNAME= iiimf-le-newpy
-PORTVERSION= ${IIIMF_VER:S/_/./:C/-.*//}
-PORTREVISION= 1
+PORTNAME= le-newpy
+PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
CATEGORIES= chinese 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@csie.org
-COMMENT= Internet/Intranet Input Method Framework language engine newpy
+COMMENT= IIIMF New PinYin input method engine
-IIIMF_VER= r11_4-1467
+RUN_DEPENDS= ${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
+
+IIIMF_VER= r12_0_1-svn1891
WRKSRC= ${WRKDIR}/${DISTNAME}-${IIIMF_VER}/leif
BUILD_WRKSRC= ${WRKSRC}/newpy
INSTALL_WRKSRC= ${WRKSRC}/newpy
-USE_BZIP2= yes
-USE_GMAKE= yes
-INSTALLS_SHLIB= yes
USE_REINPLACE= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX}
-.if defined(WANT_XAUX)
+USE_AUTOCONF_VER= 259
+USE_AUTOHEADER_VER= 259
+USE_AUTOMAKE_VER= 19
+USE_LIBTOOL_VER= 15
+AUTOMAKE_ARGS+= --add-missing --copy --gnu
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+.if !defined(WITHOUT_XAUX)
USE_MOTIF= yes
PLIST_SUB+= WANT_XAUX=""
+RUN_DEPENDS+= ${LOCALBASE}/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
.else
CONFIGURE_ARGS+=--without-x
PLIST_SUB+= WANT_XAUX="@comment "
.endif
post-patch:
- ${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" \
- ${WRKSRC}/configure
${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
+ ${WRKSRC}/../acfiles/im_common.m4 \
+ ${WRKSRC}/configure.ac \
${WRKSRC}/newpy/NewPY.c \
${WRKSRC}/newpy/xaux/aux_so.c \
${WRKSRC}/newpy/xaux/aux_win.c
-.if defined(WANT_XAUX)
+pre-configure:
+ cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../acfiles
+ ${TOUCH} ${WRKSRC}/config.h.in
+ cd ${WRKSRC} && ${LIBTOOLIZE} --copy --force --automake
+
+.if !defined(WITHOUT_XAUX)
post-build:
- cd ${BUILD_WRKSRC}/xaux && ${GMAKE} all
+ cd ${BUILD_WRKSRC}/xaux && ${MAKE} all
post-install:
- cd ${INSTALL_WRKSRC}/xaux && ${GMAKE} install
+ cd ${INSTALL_WRKSRC}/xaux && ${MAKE} install
.endif
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/chinese/iiimf-le-newpy/distinfo /files/home/kcwu/work/ports/x/chinese/iiimf-le-newpy/distinfo
--- /usr/ports/chinese/iiimf-le-newpy/distinfo Wed Mar 31 11:06:24 2004
+++ /files/home/kcwu/work/ports/x/chinese/iiimf-le-newpy/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/chinese/iiimf-le-newpy/files/patch-leif_configure.ac /files/home/kcwu/work/ports/x/chinese/iiimf-le-newpy/files/patch-leif_configure.ac
--- /usr/ports/chinese/iiimf-le-newpy/files/patch-leif_configure.ac Thu Jan 1 08:00:00 1970
+++ /files/home/kcwu/work/ports/x/chinese/iiimf-le-newpy/files/patch-leif_configure.ac Wed Oct 13 13:19:39 2004
@@ -0,0 +1,10 @@
+--- configure.ac.orig Wed Sep 8 00:00:58 2004
++++ configure.ac Wed Sep 8 00:02:34 2004
+@@ -10,6 +10,7 @@
+ dnl common initialization
+ dnl AC_CONFIG_AUX_DIR(../acfiles)
+ IM_INIT(..)
++m4_pattern_allow([AM_ET])
+
+ AM_INIT_AUTOMAKE(im-sdk, 11.0)
+ AM_CONFIG_HEADER(config.h)
diff -ruN --exclude=CVS /usr/ports/chinese/iiimf-le-newpy/files/patch-leif_newpy_PYIM.h /files/home/kcwu/work/ports/x/chinese/iiimf-le-newpy/files/patch-leif_newpy_PYIM.h
--- /usr/ports/chinese/iiimf-le-newpy/files/patch-leif_newpy_PYIM.h Sun Dec 28 19:41:14 2003
+++ /files/home/kcwu/work/ports/x/chinese/iiimf-le-newpy/files/patch-leif_newpy_PYIM.h Thu Jan 1 08:00:00 1970
@@ -1,10 +0,0 @@
---- newpy/PYIM.h.orig Sat Dec 6 02:51:17 2003
-+++ newpy/PYIM.h Sat Dec 6 02:51:23 2003
-@@ -47,7 +47,6 @@
-
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include <string.h>
- /*
- #include <sys/types.h>
diff -ruN --exclude=CVS /usr/ports/chinese/iiimf-le-newpy/pkg-plist /files/home/kcwu/work/ports/x/chinese/iiimf-le-newpy/pkg-plist
--- /usr/ports/chinese/iiimf-le-newpy/pkg-plist Sun Dec 28 19:41:14 2003
+++ /files/home/kcwu/work/ports/x/chinese/iiimf-le-newpy/pkg-plist Wed Oct 13 13:19:39 2004
@@ -4,8 +4,6 @@
lib/im/locale/zh_CN/newpy/newpy_obj.jar
%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/aux.so.0
%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/aux.so
-%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/aux.la
-%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/aux.a
%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/aux_win
%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/full.gif
%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/gb.gif
@@ -14,7 +12,6 @@
%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/help.gif
@dirrm lib/im/locale/zh_CN/newpy/data
@dirrm lib/im/locale/zh_CN/newpy
-@dirrm lib/im/locale/zh_CN
-@dirrm lib/im/locale
-@dirrm lib/im/leif
-@unexec rmdir %D/lib/im 2>/dev/null || true
+@unexec rmdir %D/lib/im/locale/zh_CN 2>/dev/null || true
+@unexec rmdir %D/lib/im/locale 2>/dev/null || true
+@unexec rmdir %D/lib/im/leif 2>/dev/null || true
--- iiimf-le-newpy-r12.0.1.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?200410130738.i9D7crHX075124>