From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 13 07:01:28 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D893516A4DE for ; Wed, 13 Oct 2004 07:01:08 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B38F043D55 for ; Wed, 13 Oct 2004 07:00:54 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i9D70sVp059300 for ; Wed, 13 Oct 2004 07:00:54 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i9D70sMh059299; Wed, 13 Oct 2004 07:00:54 GMT (envelope-from gnats) Resent-Date: Wed, 13 Oct 2004 07:00:54 GMT Resent-Message-Id: <200410130700.i9D70sMh059299@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kuang-che Wu Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A44C716A4CE for ; Wed, 13 Oct 2004 06:59:12 +0000 (GMT) Received: from mail3out.giga.net.tw (mail3out.giga.net.tw [203.133.1.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id E670E43D53 for ; Wed, 13 Oct 2004 06:59:11 +0000 (GMT) (envelope-from kcwu@kcwu.homeip.net) Received: from kcwu.homeip.net (61-70-142-187.adsl.static.giga.net.tw [61.70.142.187]) by mail3out.giga.net.tw (Postfix) with ESMTP id 11F0A36138 for ; Wed, 13 Oct 2004 14:54:47 +0800 (CST) Received: from kcwu.homeip.net (kc@kcwu.homeip.net [127.0.0.1]) by kcwu.homeip.net (8.13.1/8.13.1) with ESMTP id i9D6xQY7062524 for ; Wed, 13 Oct 2004 14:59:26 +0800 (CST) (envelope-from kcwu@kcwu.homeip.net) Received: (from kcwu@localhost) by kcwu.homeip.net (8.13.1/8.13.1/Submit) id i9D6xQ3t062523; Wed, 13 Oct 2004 14:59:26 +0800 (CST) (envelope-from kcwu) Message-Id: <200410130659.i9D6xQ3t062523@kcwu.homeip.net> Date: Wed, 13 Oct 2004 14:59:26 +0800 (CST) From: Kuang-che Wu To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/72615: [MAINTAINER] textproc/server: update to r12.0.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2004 07:01:28 -0000 >Number: 72615 >Category: ports >Synopsis: [MAINTAINER] textproc/server: 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:00:54 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-acfiles_check_sys.m4 - files/patch-iiimsf-src-Makefile.am Removed file(s): - files/patch-iiimsf_src_Makefile.in - files/patch-iiimsf_src_iwrap.c Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- iiimf-server-r12.0.1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-server/Makefile /files/home/kcwu/work/ports/x/textproc/iiimf-server/Makefile --- /usr/ports/textproc/iiimf-server/Makefile Sun Sep 19 01:46:15 2004 +++ /files/home/kcwu/work/ports/x/textproc/iiimf-server/Makefile Wed Oct 13 13:19:40 2004 @@ -2,47 +2,44 @@ # Date created: 6 Dec 2003 # Whom: Kuang-che Wu # -# $FreeBSD: ports/textproc/iiimf-server/Makefile,v 1.4 2004/09/18 17:46:15 kris Exp $ +# $FreeBSD: ports/textproc/iiimf-server/Makefile,v 1.3 2004/02/04 05:09:13 marcus Exp $ # -PORTNAME= iiimf-server -PORTVERSION= ${IIIMF_VER:S/_/./:C/-.*//} -PORTREVISION= 1 +PORTNAME= server +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@csie.org COMMENT= Internet/Intranet Input Method Server Framework LIB_DEPENDS= iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib -BUILD_DEPENDS= ${LOCALBASE}/include/iiimf/iml/SunIM.h:${PORTSDIR}/textproc/iiimf-headers -IIIMF_VER= r11_4-1467 +IIIMF_VER= r12_0_1-svn1891 WRKSRC= ${WRKDIR}/${DISTNAME}-${IIIMF_VER}/iiimsf -USE_BZIP2= yes -USE_GMAKE= yes -INSTALLS_SHLIB= yes +PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}-${IIIMF_VER} +USE_OPENSSL= yes USE_REINPLACE= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} - -.include - -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif +USE_AUTOCONF_VER= 259 +USE_AUTOHEADER_VER= 259 +USE_AUTOMAKE_VER= 19 +USE_LIBTOOL_VER= 15 +LIBTOOLFILES= ${WRKSRC}/aclocal.m4 +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" 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" \ - -e "s,-I\$$(IM_INCLUDEDIR),-I${LOCALBASE}/include/iiimf,g" \ - ${WRKSRC}/configure ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ + ${WRKSRC}/../acfiles/im_common.m4 \ + ${WRKSRC}/configure.ac \ ${WRKSRC}/src/IMSvrCfg.cpp \ ${WRKSRC}/src/watchdog.c -.include +pre-configure: + cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../acfiles + ${TOUCH} ${WRKSRC}/config.h.in + +.include diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-server/distinfo /files/home/kcwu/work/ports/x/textproc/iiimf-server/distinfo --- /usr/ports/textproc/iiimf-server/distinfo Wed Mar 31 11:11:42 2004 +++ /files/home/kcwu/work/ports/x/textproc/iiimf-server/distinfo Wed Oct 13 13:19:40 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-server/files/patch-acfiles_check_sys.m4 /files/home/kcwu/work/ports/x/textproc/iiimf-server/files/patch-acfiles_check_sys.m4 --- /usr/ports/textproc/iiimf-server/files/patch-acfiles_check_sys.m4 Thu Jan 1 08:00:00 1970 +++ /files/home/kcwu/work/ports/x/textproc/iiimf-server/files/patch-acfiles_check_sys.m4 Wed Oct 13 13:19:40 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-server/files/patch-iiimsf-src-Makefile.am /files/home/kcwu/work/ports/x/textproc/iiimf-server/files/patch-iiimsf-src-Makefile.am --- /usr/ports/textproc/iiimf-server/files/patch-iiimsf-src-Makefile.am Thu Jan 1 08:00:00 1970 +++ /files/home/kcwu/work/ports/x/textproc/iiimf-server/files/patch-iiimsf-src-Makefile.am Wed Oct 13 14:56:08 2004 @@ -0,0 +1,9 @@ +--- iiimsf/src/Makefile.am.orig Sun Sep 5 04:47:50 2004 ++++ iiimsf/src/Makefile.am Sun Sep 5 04:48:50 2004 +@@ -29,5 +29,5 @@ + + htt_SOURCES = watchdog.c + +-htt_server_LDADD = $(LIB_DIR)/iml/libiml.la $(IM_LIBDIR)/iiimp/libiiimp.la $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS) $(TLS_LIBS) ++htt_server_LDADD = $(LIB_DIR)/iml/libiml.la -L$(LOCALBASE)/lib -liiimp $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS) $(TLS_LIBS) + bin_PROGRAMS = htt_server htt diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp /files/home/kcwu/work/ports/x/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp --- /usr/ports/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp Sun Dec 28 19:18:18 2003 +++ /files/home/kcwu/work/ports/x/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp Wed Oct 13 13:19:40 2004 @@ -1,5 +1,5 @@ ---- src/IMAuth.cpp.orig Sat Dec 6 02:39:41 2003 -+++ src/IMAuth.cpp Sat Dec 6 02:39:50 2003 +--- iiimsf/src/IMAuth.cpp.orig Sat Dec 6 02:39:41 2003 ++++ iiimsf/src/IMAuth.cpp Sat Dec 6 02:39:50 2003 @@ -47,7 +47,7 @@ #include #include diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.in /files/home/kcwu/work/ports/x/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.in --- /usr/ports/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.in Sun Dec 28 19:18:18 2003 +++ /files/home/kcwu/work/ports/x/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.in Thu Jan 1 08:00:00 1970 @@ -1,21 +0,0 @@ ---- src/Makefile.in.orig Sun Dec 7 18:11:19 2003 -+++ src/Makefile.in Sun Dec 7 18:12:23 2003 -@@ -154,7 +154,7 @@ - - htt_SOURCES = watchdog.c - --htt_server_LDADD = $(LIB_DIR)/iml/libiml.la $(IM_LIBDIR)/iiimp/libiiimp.la $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS) -+htt_server_LDADD = $(LIB_DIR)/iml/libiml.la -L$(prefix)/lib -liiimp $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS) - bin_PROGRAMS = htt_server htt - subdir = src - mkinstalldirs = $(SHELL) $(top_srcdir)/../acfiles/mkinstalldirs -@@ -180,8 +180,7 @@ - IIIMP_IMState.$(OBJEXT) IIIMP_ICState.$(OBJEXT) \ - IIIMPUtil.$(OBJEXT) IIIMPTrans.$(OBJEXT) - htt_server_OBJECTS = $(am_htt_server_OBJECTS) --htt_server_DEPENDENCIES = $(LIB_DIR)/iml/libiml.la \ -- $(IM_LIBDIR)/iiimp/libiiimp.la -+htt_server_DEPENDENCIES = $(LIB_DIR)/iml/libiml.la - htt_server_LDFLAGS = - - DEFS = @DEFS@ diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c /files/home/kcwu/work/ports/x/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c --- /usr/ports/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c Sun Dec 28 19:18:18 2003 +++ /files/home/kcwu/work/ports/x/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c Thu Jan 1 08:00:00 1970 @@ -1,10 +0,0 @@ ---- src/iwrap.c.orig Sat Dec 6 02:44:54 2003 -+++ src/iwrap.c Sat Dec 6 02:45:05 2003 -@@ -51,6 +51,7 @@ - #include - #endif - -+#include - #ifdef HAVE_PAM - #include - #endif diff -ruN --exclude=CVS /usr/ports/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c /files/home/kcwu/work/ports/x/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c --- /usr/ports/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c Sun Dec 28 19:18:18 2003 +++ /files/home/kcwu/work/ports/x/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c Wed Oct 13 13:19:40 2004 @@ -1,5 +1,5 @@ ---- src/watchdog.c.orig Sat Dec 6 02:47:06 2003 -+++ src/watchdog.c Sat Dec 6 02:47:34 2003 +--- iiimsf/src/watchdog.c.orig Sat Dec 6 02:47:06 2003 ++++ iiimsf/src/watchdog.c Sat Dec 6 02:47:34 2003 @@ -324,6 +324,8 @@ if ((pid_t)(-1) == pgrp) fprintf (stderr,"cannot set session id"); --- iiimf-server-r12.0.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: