From owner-svn-ports-all@FreeBSD.ORG Fri Feb 28 10:15:18 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 71E811B2; Fri, 28 Feb 2014 10:15:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 52414191D; Fri, 28 Feb 2014 10:15:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1SAFISQ019527; Fri, 28 Feb 2014 10:15:18 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1SAFHDR019522; Fri, 28 Feb 2014 10:15:17 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201402281015.s1SAFHDR019522@svn.freebsd.org> From: Pietro Cerutti Date: Fri, 28 Feb 2014 10:15:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346482 - in head/lang/expect: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2014 10:15:18 -0000 Author: gahr Date: Fri Feb 28 10:15:16 2014 New Revision: 346482 URL: http://svnweb.freebsd.org/changeset/ports/346482 QAT: https://qat.redports.org/buildarchive/r346482/ Log: - Update to 5.45 Please note that expectk is no longer included in the distribution. Please use ${WISH} with [package require Expect] instead. Added: head/lang/expect/files/patch-Makefile.in (contents, props changed) head/lang/expect/files/patch-configure (contents, props changed) Deleted: head/lang/expect/files/patch-aa head/lang/expect/files/patch-ac Modified: head/lang/expect/Makefile head/lang/expect/distinfo head/lang/expect/pkg-plist Modified: head/lang/expect/Makefile ============================================================================== --- head/lang/expect/Makefile Fri Feb 28 10:13:30 2014 (r346481) +++ head/lang/expect/Makefile Fri Feb 28 10:15:16 2014 (r346482) @@ -2,73 +2,37 @@ # $FreeBSD$ PORTNAME= expect -PORTVERSION= 5.43.0 -PORTREVISION= 4 +PORTVERSION= 5.45 CATEGORIES= lang tcl tk -MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ +MASTER_SITES= SF/expect/Expect/${PORTVERSION} +DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= tcltk@FreeBSD.org -COMMENT= A sophisticated scripter based on tcl/tk +COMMENT= Sophisticated scripter based on Tcl/Tk -CONFLICTS= expect-5.44* weather-[0-9]* +CONFLICTS= weather-[0-9]* -PORTSCOUT= skipv:5.44.0,5.44.1 # These were recalled by NIST +LIBEXPECT_VER= ${PORTVERSION:S/.//} -EXPECT_VER= 5.43 -LIBEXPECT_VER= 543 +WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} -WRKSRC= ${WRKDIR}/expect-${EXPECT_VER} +USES= tcl USE_LDCONFIG= yes GNU_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes - -PLIST_SUB+= EXPECT_VER="${EXPECT_VER}" -PLIST_SUB+= LIBEXPECT_VER="${LIBEXPECT_VER}" - -OPTIONS_DEFINE= X11 -OPTIONS_DEFAULT= X11 - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MX11} -LIB_DEPENDS?= tk84.1:${PORTSDIR}/x11-toolkits/tk84 -.else -LIB_DEPENDS?= tcl84.1:${PORTSDIR}/lang/tcl84 -.endif - -.if ${PORT_OPTIONS:MX11} -TK_CONFIG_ARGS= --with-tkconfig=${LOCALBASE}/lib/tk8.4 \ - --with-tkinclude=${LOCALBASE}/include/tk8.4 -PLIST_SUB+= XFILES="" -.else -TK_CONFIG_ARGS= -PLIST_SUB+= XFILES="@comment " -.endif - -CONFIGURE_ARGS?=--enable-shared \ - --with-tclconfig=${LOCALBASE}/lib/tcl8.4 \ - --with-tclinclude=${LOCALBASE}/include/tcl8.4 \ - ${TK_CONFIG_ARGS} - -.if !defined(NO_MAN_INSTALL) -MAN1= autoexpect.1 cryptdir.1 decryptdir.1 dislocate.1 \ - expect.1 kibitz.1 mkpasswd.1 multixterm.1 passmass.1 \ - tknewsbiff.1 unbuffer.1 xkibitz.1 -.if ${PORT_OPTIONS:MX11} -MAN1+= expectk.1 -.endif -MAN3= libexpect.3 -.endif - -post-patch: - ${REINPLACE_CMD} -e \ - 's|@TCLHDIRDASHI@|& -I${LOCALBASE}/include/tcl8.4/unix|' \ - ${WRKSRC}/Makefile.in ${WRKSRC}/DbgMkfl.in - ${TOUCH} ${WRKSRC}/configure +CONFIGURE_ARGS= --enable-shared \ + --exec-prefix=${PREFIX} \ + --with-tclconfig=${TCL_LIBDIR} \ + --with-tclinclude=${TCL_INCLUDEDIR} +PLIST_SUB+= EXPECT_VER=${PORTVERSION} \ + LIBEXPECT_VER=${LIBEXPECT_VER} post-install: - ${LN} -sf libexpect${LIBEXPECT_VER}.so.1 \ - ${PREFIX}/lib/libexpect${LIBEXPECT_VER}.so + ${LN} -sf expect${PORTVERSION}/libexpect${LIBEXPECT_VER}.so \ + ${STAGEDIR}${PREFIX}/lib/libexpect.so.1 + ${LN} -sf libexpect.so.1 \ + ${STAGEDIR}${PREFIX}/lib/libexpect.so + +regression-test: build + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test .include Modified: head/lang/expect/distinfo ============================================================================== --- head/lang/expect/distinfo Fri Feb 28 10:13:30 2014 (r346481) +++ head/lang/expect/distinfo Fri Feb 28 10:15:16 2014 (r346482) @@ -1,2 +1,2 @@ -SHA256 (expect-5.43.0.tar.gz) = 4c9decec3c5541806f1758706fe649193d5c8afa2913a79361d9fa5f2c993ba1 -SIZE (expect-5.43.0.tar.gz) = 525572 +SHA256 (expect5.45.tar.gz) = b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040 +SIZE (expect5.45.tar.gz) = 628808 Added: head/lang/expect/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/expect/files/patch-Makefile.in Fri Feb 28 10:15:16 2014 (r346482) @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2014-02-21 14:51:15.000000000 +0100 ++++ Makefile.in 2014-02-21 14:55:44.000000000 +0100 +@@ -239,7 +239,7 @@ + @mkdir -p $(DESTDIR)$(prefix)/bin + -for i in $(SCRIPT_LIST) ; do \ + if [ -f $$i ] ; then \ +- $(INSTALL_PROGRAM) $$i $(DESTDIR)$(prefix)/bin/$$i ; \ ++ $(INSTALL_SCRIPT) $$i $(DESTDIR)$(prefix)/bin/$$i ; \ + rm -f $$i ; \ + else true; fi ; \ + done Added: head/lang/expect/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/expect/files/patch-configure Fri Feb 28 10:15:16 2014 (r346482) @@ -0,0 +1,45 @@ +--- configure.orig 2010-09-16 22:46:47.000000000 +0200 ++++ configure 2014-02-21 14:43:41.000000000 +0100 +@@ -8103,7 +8103,7 @@ + # This configuration from FreeBSD Ports. + SHLIB_CFLAGS="-fPIC" + SHLIB_LD="${CC} -shared" +- TCL_SHLIB_LD_EXTRAS="-soname \$@" ++ TCL_SHLIB_LD_EXTRAS="-Wl,-soname=\$@" + SHLIB_SUFFIX=".so" + LDFLAGS="" + if test $doRpath = yes; then +@@ -8123,7 +8123,7 @@ + # Version numbers are dot-stripped by system policy. + TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots + ;; + Darwin-*) +@@ -16349,9 +16349,9 @@ + if test x"${TK_BIN_DIR}" != x ; then + SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\"" + fi +- eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${SHARED_LIB_SUFFIX}" ++ eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${EXP_LIB_VERSION}${SHARED_LIB_SUFFIX}" + else +- eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}" ++ eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${EXP_LIB_VERSION}${UNSHARED_LIB_SUFFIX}" + fi + # Some packages build their own stubs libraries + eval eval "PKG_STUB_LIB_FILE=${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}" +@@ -16368,10 +16368,10 @@ + if test x"${TK_BIN_DIR}" != x ; then + SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}" + fi +- eval eval "PKG_LIB_FILE=lib${PACKAGE_NAME}${SHARED_LIB_SUFFIX}" ++ eval eval "PKG_LIB_FILE=lib${PACKAGE_NAME}${EXP_LIB_VERSION}${SHARED_LIB_SUFFIX}" + RANLIB=: + else +- eval eval "PKG_LIB_FILE=lib${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}" ++ eval eval "PKG_LIB_FILE=lib${PACKAGE_NAME}${EXP_LIB_VERSION}${UNSHARED_LIB_SUFFIX}" + fi + # Some packages build their own stubs libraries + eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}" Modified: head/lang/expect/pkg-plist ============================================================================== --- head/lang/expect/pkg-plist Fri Feb 28 10:13:30 2014 (r346481) +++ head/lang/expect/pkg-plist Fri Feb 28 10:15:16 2014 (r346482) @@ -4,7 +4,6 @@ bin/cryptdir bin/decryptdir bin/dislocate bin/expect -%%XFILES%%bin/expectk bin/ftp-rfc bin/kibitz bin/lpunlock @@ -25,9 +24,21 @@ include/expect.h include/expect_comm.h include/expect_tcl.h include/tcldbg.h +man/man1/autoexpect.1.gz +man/man1/cryptdir.1.gz +man/man1/decryptdir.1.gz +man/man1/dislocate.1.gz +man/man1/expect.1.gz +man/man1/kibitz.1.gz +man/man1/mkpasswd.1.gz +man/man1/multixterm.1.gz +man/man1/passmass.1.gz +man/man1/tknewsbiff.1.gz +man/man1/unbuffer.1.gz +man/man1/xkibitz.1.gz +man/man3/libexpect.3.gz lib/expect%%EXPECT_VER%%/pkgIndex.tcl -lib/expect%%EXPECT_VER%%/libexpect%%LIBEXPECT_VER%%.a -lib/libexpect%%LIBEXPECT_VER%%.a -lib/libexpect%%LIBEXPECT_VER%%.so -lib/libexpect%%LIBEXPECT_VER%%.so.1 +lib/expect%%EXPECT_VER%%/libexpect%%LIBEXPECT_VER%%.so +lib/libexpect.so.1 +lib/libexpect.so @dirrm lib/expect%%EXPECT_VER%%