svn commit: r346483 - in head: devel/pecl-expect misc/dejagnu misc/sshbuddy misc/sshbuddy/files net-mgmt/rancid net-mgmt/rancid-devel net/freenx
Pietro Cerutti
gahr at FreeBSD.org
Fri Feb 28 10:16:04 UTC 2014
Author: gahr
Date: Fri Feb 28 10:16:02 2014
New Revision: 346483
URL: http://svnweb.freebsd.org/changeset/ports/346483
QAT: https://qat.redports.org/buildarchive/r346483/
Log:
- Chase devel/expect update
Added:
head/misc/sshbuddy/files/
head/misc/sshbuddy/files/patch-sshbuddy.expk (contents, props changed)
Modified:
head/devel/pecl-expect/Makefile
head/misc/dejagnu/Makefile
head/misc/sshbuddy/Makefile
head/net-mgmt/rancid-devel/Makefile
head/net-mgmt/rancid/Makefile
head/net/freenx/Makefile
Modified: head/devel/pecl-expect/Makefile
==============================================================================
--- head/devel/pecl-expect/Makefile Fri Feb 28 10:15:16 2014 (r346482)
+++ head/devel/pecl-expect/Makefile Fri Feb 28 10:16:02 2014 (r346483)
@@ -12,7 +12,7 @@ DIST_SUBDIR= PECL
MAINTAINER= miwi at FreeBSD.org
COMMENT= A PHP extension for expect library
-LIB_DEPENDS= expect543:${PORTSDIR}/lang/expect
+LIB_DEPENDS= libexpect.so:${PORTSDIR}/lang/expect
LICENSE= PHP301
@@ -21,9 +21,4 @@ USE_PHPEXT= yes
CONFIGURE_ARGS+=--with-expect=${LOCALBASE}
-post-patch:
- @${REINPLACE_CMD} -e \
- 's/\(LIBRARY_WITH_PATH(\)expect/\1expect543/' \
- ${WRKSRC}/config.m4
-
.include <bsd.port.mk>
Modified: head/misc/dejagnu/Makefile
==============================================================================
--- head/misc/dejagnu/Makefile Fri Feb 28 10:15:16 2014 (r346482)
+++ head/misc/dejagnu/Makefile Fri Feb 28 10:16:02 2014 (r346483)
@@ -11,8 +11,7 @@ COMMENT= Automated program/system tester
LICENSE= GPLv3
-BUILD_DEPENDS= expect:${PORTSDIR}/lang/expect
-RUN_DEPENDS= expect:${PORTSDIR}/lang/expect
+LIB_DEPENDS= libexpect.so:${PORTSDIR}/lang/expect
USES+= gmake tcl
GNU_CONFIGURE= yes
Modified: head/misc/sshbuddy/Makefile
==============================================================================
--- head/misc/sshbuddy/Makefile Fri Feb 28 10:15:16 2014 (r346482)
+++ head/misc/sshbuddy/Makefile Fri Feb 28 10:16:02 2014 (r346483)
@@ -10,19 +10,17 @@ MASTER_SITES= http://linuxmafia.com/pub/
MAINTAINER= wrighrc at gmail.com
COMMENT= Simple and small GUI utility to manage ssh sessions
-RUN_DEPENDS= expectk:${PORTSDIR}/lang/expect
+RUN_DEPENDS= expect:${PORTSDIR}/lang/expect
-USES= shebangfix
-USE_XORG= x11
-SHEBANG_FILES= ${WRKSRC}/sshbuddy.expk
-SHEBANG_LANG= expectk
-expectk_OLD_CMD= /usr/bin/expectk
-expectk_CMD= ${LOCALBASE}/bin/expectk
+USES= tk
NO_BUILD= yes
PLIST_FILES= bin/sshbuddy
+post-patch:
+ ${REINPLACE_CMD} -e 's|%%WISH%%|${WISH}|' ${WRKSRC}/sshbuddy.expk
+
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/sshbuddy.expk ${STAGEDIR}${PREFIX}/bin/sshbuddy
+ ${INSTALL_SCRIPT} ${WRKSRC}/sshbuddy.expk ${STAGEDIR}${PREFIX}/bin/sshbuddy
.include <bsd.port.mk>
Added: head/misc/sshbuddy/files/patch-sshbuddy.expk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/sshbuddy/files/patch-sshbuddy.expk Fri Feb 28 10:16:02 2014 (r346483)
@@ -0,0 +1,17 @@
+--- sshbuddy.expk.orig 2014-02-28 10:41:40.000000000 +0100
++++ sshbuddy.expk 2014-02-28 10:41:58.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/expectk
++#!%%WISH%%
+ #
+ # EDIT THE ABOVE LINE TO POINT TO WHERE expectk LIVES
+ #
+@@ -10,6 +10,8 @@
+ #
+ # Version Beta1.05
+
++package require Expect
++
+ set expect_path [exec which expect]
+
+ ########################################################################
Modified: head/net-mgmt/rancid-devel/Makefile
==============================================================================
--- head/net-mgmt/rancid-devel/Makefile Fri Feb 28 10:15:16 2014 (r346482)
+++ head/net-mgmt/rancid-devel/Makefile Fri Feb 28 10:16:02 2014 (r346483)
@@ -11,9 +11,8 @@ PKGNAMESUFFIX= -devel
MAINTAINER= jmohacsi at bsd.hu
COMMENT= Really Awesome New Cisco confIg Differ
-BUILD_DEPENDS= expect:${PORTSDIR}/lang/expect-devel
-RUN_DEPENDS= expect:${PORTSDIR}/lang/expect-devel \
- p5-LockFile-Simple>=0:${PORTSDIR}/devel/p5-LockFile-Simple
+LIB_DEPENDS= libexpect.so:${PORTSDIR}/lang/expect-devel
+RUN_DEPENDS= p5-LockFile-Simple>=0:${PORTSDIR}/devel/p5-LockFile-Simple
USES= perl5 gmake
SUB_FILES= pkg-message
Modified: head/net-mgmt/rancid/Makefile
==============================================================================
--- head/net-mgmt/rancid/Makefile Fri Feb 28 10:15:16 2014 (r346482)
+++ head/net-mgmt/rancid/Makefile Fri Feb 28 10:16:02 2014 (r346483)
@@ -10,9 +10,8 @@ MASTER_SITES= ftp://ftp.shrubbery.net/pu
MAINTAINER= jmohacsi at bsd.hu
COMMENT= Really Awesome New Cisco confIg Differ
-BUILD_DEPENDS= expect:${PORTSDIR}/lang/expect-devel
-RUN_DEPENDS= expect:${PORTSDIR}/lang/expect-devel \
- p5-LockFile-Simple>=0:${PORTSDIR}/devel/p5-LockFile-Simple
+LIB_DEPENDS= libexpect.so:${PORTSDIR}/lang/expect
+RUN_DEPENDS= p5-LockFile-Simple>=0:${PORTSDIR}/devel/p5-LockFile-Simple
USES= gmake perl5 shebangfix
perl_OLD_CMD= @PERLV_PATH@
Modified: head/net/freenx/Makefile
==============================================================================
--- head/net/freenx/Makefile Fri Feb 28 10:15:16 2014 (r346482)
+++ head/net/freenx/Makefile Fri Feb 28 10:16:02 2014 (r346483)
@@ -25,8 +25,8 @@ NXPREFIX?= ${PREFIX}/NX
NO_STAGE= yes
post-patch:
@cd ${WRKSRC} && ${REINPLACE_CMD} -e "s|/usr/local/|${PREFIX}/|" \
- -e "s|!/bin/bash|!${PREFIX}/bin/bash|" \
- -e "s|/usr/bin/expect|${PREFIX}/bin/expect|" \
+ -e "s|!/bin/bash|!${LOCALBASE}/bin/bash|" \
+ -e "s|/usr/bin/expect|${LOCALBASE}/bin/expect|" \
-e "s|/usr/NX|${NXPREFIX}|" \
node.conf.sample nxclient nxkeygen nxloadconfig nxnode \
nxnode-login nxprint nxserver nxsetup
More information about the svn-ports-all
mailing list