[Midnightbsd-cvs] mports [16353] trunk/lang/expect/pkg-plist: update expect
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Apr 20 21:54:31 EDT 2014
Revision: 16353
http://svnweb.midnightbsd.org/mports/?rev=16353
Author: laffer1
Date: 2014-04-20 21:54:31 -0400 (Sun, 20 Apr 2014)
Log Message:
-----------
update expect
Modified Paths:
--------------
trunk/lang/expect/Makefile
trunk/lang/expect/distinfo
trunk/lang/expect/files/patch-exp_main_sub.c
trunk/lang/expect/pkg-plist
Added Paths:
-----------
trunk/lang/expect/files/patch-Makefile.in
trunk/lang/expect/files/patch-configure
Removed Paths:
-------------
trunk/lang/expect/files/patch-aa
trunk/lang/expect/files/patch-ac
Property Changed:
----------------
trunk/lang/expect/files/patch-exp_main_sub.c
Modified: trunk/lang/expect/Makefile
===================================================================
--- trunk/lang/expect/Makefile 2014-04-21 01:45:56 UTC (rev 16352)
+++ trunk/lang/expect/Makefile 2014-04-21 01:54:31 UTC (rev 16353)
@@ -1,71 +1,40 @@
# $MidnightBSD$
PORTNAME= expect
-PORTVERSION= 5.43.0
-PORTREVISION= 2
+PORTVERSION= 5.45
CATEGORIES= lang tcl tk
-MASTER_SITES= http://mirror.amdmi3.ru/distfiles/
+MASTER_SITES= SF/expect/Expect/${PORTVERSION}
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports at MidnightBSD.org
-COMMENT= A sophisticated scripter based on tcl/tk
+COMMENT= Sophisticated scripter based on Tcl/Tk
+
LICENSE= unknown
-FAKE_OPTS+= prefixhack
+LIBEXPECT_VER= ${PORTVERSION:S/.//}
+WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}
-EXPECT_VER= 5.43
-LIBEXPECT_VER= 543
+FAKE_OPTS+= prefixhack
-WRKSRC= ${WRKDIR}/expect-${EXPECT_VER}
+USES= tcl
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-MAKE_JOBS_UNSAFE= yes
+CONFIGURE_ARGS= --enable-shared \
+ --exec-prefix=${PREFIX} \
+ --datadir=${DATADIR} \
+ --with-tclconfig=${TCL_LIBDIR} \
+ --with-tclinclude=${TCL_INCLUDEDIR}
+PLIST_SUB+= EXPECT_VER=${PORTVERSION} \
+ LIBEXPECT_VER=${LIBEXPECT_VER}
-PLIST_SUB+= EXPECT_VER="${EXPECT_VER}"
-PLIST_SUB+= LIBEXPECT_VER="${LIBEXPECT_VER}"
+post-install:
+ ${LN} -sf expect${PORTVERSION}/libexpect${LIBEXPECT_VER}.so \
+ ${STAGEDIR}${PREFIX}/lib/libexpect.so.1
+ ${LN} -sf libexpect.so.1 \
+ ${STAGEDIR}${PREFIX}/lib/libexpect.so
-OPTIONS_DEFINE= X11
-OPTIONS_DEFAULT= X11
+regression-test: build
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test
-.include <bsd.mport.options.mk>
-
-.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:
- ${TOUCH} ${WRKSRC}/configure
-
-post-install:
- ${LN} -sf libexpect${LIBEXPECT_VER}.so.1 \
- ${PREFIX}/lib/libexpect${LIBEXPECT_VER}.so
- ${REINPLACE_CMD} -e 's|${FAKE_DESTDIR}||g' \
- ${PREFIX}/bin/expect ${PREFIX}/bin/expectk
-
.include <bsd.port.mk>
Modified: trunk/lang/expect/distinfo
===================================================================
--- trunk/lang/expect/distinfo 2014-04-21 01:45:56 UTC (rev 16352)
+++ trunk/lang/expect/distinfo 2014-04-21 01:54:31 UTC (rev 16353)
@@ -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: trunk/lang/expect/files/patch-Makefile.in
===================================================================
--- trunk/lang/expect/files/patch-Makefile.in (rev 0)
+++ trunk/lang/expect/files/patch-Makefile.in 2014-04-21 01:54:31 UTC (rev 16353)
@@ -0,0 +1,15 @@
+--- Makefile.in.orig 2010-09-30 19:14:07.000000000 +0200
++++ Makefile.in 2014-02-28 12:00:40.000000000 +0100
+@@ -236,10 +236,10 @@
+ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir) ; \
+ done;
+ # install standalone scripts and their man pages, if requested
+- @mkdir -p $(DESTDIR)$(prefix)/bin
++ @mkdir -p $(DESTDIR)$(datadir)
+ -for i in $(SCRIPT_LIST) ; do \
+ if [ -f $$i ] ; then \
+- $(INSTALL_PROGRAM) $$i $(DESTDIR)$(prefix)/bin/$$i ; \
++ $(INSTALL_SCRIPT) $$i $(DESTDIR)$(datadir)/$$i ; \
+ rm -f $$i ; \
+ else true; fi ; \
+ done
Deleted: trunk/lang/expect/files/patch-aa
===================================================================
--- trunk/lang/expect/files/patch-aa 2014-04-21 01:45:56 UTC (rev 16352)
+++ trunk/lang/expect/files/patch-aa 2014-04-21 01:54:31 UTC (rev 16353)
@@ -1,29 +0,0 @@
---- configure.orig Fri Oct 22 22:48:14 1999
-+++ configure Wed Oct 27 18:10:25 1999
-@@ -6273,7 +6273,7 @@
- echo "configure:6274: checking for type of library to build" >&5
- if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then
- EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
-- eval "EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}"
-+ eval "EXP_SHARED_LIB_FILE=libexpect`echo ${VERSION} | tr -d .`.so.1"
- EXP_LIB_FILE=$EXP_SHARED_LIB_FILE
- EXP_LIB_FILES="$EXP_SHARED_LIB_FILE $EXP_UNSHARED_LIB_FILE"
- echo "$ac_t""both shared and unshared" 1>&6
-@@ -6504,7 +6504,7 @@
- s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g
- s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g
- s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g
--s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
-+s%@TCL_BUILD_LIB_SPEC@%$TCL_LIB_SPEC%g
- s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
- s%@TCL_SHARED_LIB_SUFFIX@%$TCL_SHARED_LIB_SUFFIX%g
- s%@TK_VERSION@%$TK_VERSION%g
-@@ -6512,7 +6512,7 @@
- s%@TK_DBGX@%$TK_DBGX%g
- s%@TK_XINCLUDES@%$TK_XINCLUDES%g
- s%@TK_XLIBSW@%$TK_XLIBSW%g
--s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
-+s%@TK_BUILD_LIB_SPEC@%$TK_LIB_SPEC%g
- s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
Deleted: trunk/lang/expect/files/patch-ac
===================================================================
--- trunk/lang/expect/files/patch-ac 2014-04-21 01:45:56 UTC (rev 16352)
+++ trunk/lang/expect/files/patch-ac 2014-04-21 01:54:31 UTC (rev 16353)
@@ -1,36 +0,0 @@
---- Makefile.in.orig Sun Sep 28 19:20:30 1997
-+++ Makefile.in Fri Oct 10 09:05:17 1997
-@@ -186,6 +186,7 @@
-
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
-
- AR = ar
-@@ -202,6 +203,7 @@
- "HDEFS=$(HDEFS)" \
- "INSTALL=$(INSTALL)" \
- "INSTALL_DATA=$(INSTALL_DATA)" \
-+ "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
- "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
- "LDFLAGS=$(LDFLAGS)" \
- "RUNTEST=$(RUNTEST)" \
-@@ -350,7 +352,7 @@
- else true; fi
- if [ -s $(EXP_SHARED_LIB_FILE) ] ; then \
- $(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) ; \
-- $(INSTALL_PROGRAM) pkgIndex $(libdir)/pkgIndex.tcl ; \
-+ $(INSTALL_SCRIPT) pkgIndex $(libdir)/pkgIndex.tcl ; \
- else true; fi
-
- expect_installed: exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib
-@@ -430,7 +432,7 @@
- ${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR)
- -for i in $(SCRIPT_LIST) ; do \
- if [ -f $$i ] ; then \
-- $(INSTALL_PROGRAM) $$i $(bindir_arch_indep)/$$i ; \
-+ $(INSTALL_SCRIPT) $$i $(bindir_arch_indep)/$$i ; \
- rm -f $$i ; \
- else true; fi ; \
- done
Added: trunk/lang/expect/files/patch-configure
===================================================================
--- trunk/lang/expect/files/patch-configure (rev 0)
+++ trunk/lang/expect/files/patch-configure 2014-04-21 01:54:31 UTC (rev 16353)
@@ -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: trunk/lang/expect/files/patch-exp_main_sub.c
===================================================================
--- trunk/lang/expect/files/patch-exp_main_sub.c 2014-04-21 01:45:56 UTC (rev 16352)
+++ trunk/lang/expect/files/patch-exp_main_sub.c 2014-04-21 01:54:31 UTC (rev 16353)
@@ -1,4 +1,6 @@
+$FreeBSD: head/lang/expect/files/patch-exp_main_sub.c 340725 2014-01-22 17:40:44Z mat $
+
--- exp_main_sub.c 2002/08/24 08:04:43 1.1
+++ exp_main_sub.c 2002/08/24 08:15:33
@@ -593,6 +593,9 @@
Property changes on: trunk/lang/expect/files/patch-exp_main_sub.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/lang/expect/pkg-plist
===================================================================
--- trunk/lang/expect/pkg-plist 2014-04-21 01:45:56 UTC (rev 16352)
+++ trunk/lang/expect/pkg-plist 2014-04-21 01:54:31 UTC (rev 16353)
@@ -1,33 +1,45 @@
-bin/autoexpect
-bin/autopasswd
-bin/cryptdir
-bin/decryptdir
-bin/dislocate
bin/expect
-%%XFILES%%bin/expectk
-bin/ftp-rfc
-bin/kibitz
-bin/lpunlock
-bin/mkpasswd
-bin/multixterm
-bin/passmass
-bin/rftp
-bin/rlogin-cwd
-bin/timed-read
-bin/timed-run
-bin/tknewsbiff
-bin/tkpasswd
-bin/unbuffer
-bin/weather
-bin/xkibitz
-bin/xpstat
include/expect.h
include/expect_comm.h
include/expect_tcl.h
include/tcldbg.h
+%%DATADIR%%/autoexpect
+%%DATADIR%%/autopasswd
+%%DATADIR%%/cryptdir
+%%DATADIR%%/decryptdir
+%%DATADIR%%/dislocate
+%%DATADIR%%/ftp-rfc
+%%DATADIR%%/kibitz
+%%DATADIR%%/lpunlock
+%%DATADIR%%/mkpasswd
+%%DATADIR%%/multixterm
+%%DATADIR%%/passmass
+%%DATADIR%%/rftp
+%%DATADIR%%/rlogin-cwd
+%%DATADIR%%/timed-read
+%%DATADIR%%/timed-run
+%%DATADIR%%/tknewsbiff
+%%DATADIR%%/tkpasswd
+%%DATADIR%%/unbuffer
+%%DATADIR%%/weather
+%%DATADIR%%/xkibitz
+%%DATADIR%%/xpstat
+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%%
+ at dirrm %%DATADIR%%
More information about the Midnightbsd-cvs
mailing list