Attachment 198756 Details for Bug 232732 – svn-diff-expect_v5

[patch] svn-diff-expect_v5

svn-diff-expect (text/plain), 4.50 KB, created by Walter Schwarzenfeld on 2018-10-29 22:48:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2018-10-29 22:48:54 UTC

Size: 4.50 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 483100)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	expect
> PORTVERSION=	5.45.4
>-PORTEPOCH=	1
>+PORTEPOCH=	2
> CATEGORIES=	lang tcl tk
> MASTER_SITES=	SF/expect/Expect/${PORTVERSION}
> DISTNAME=	${PORTNAME}${PORTVERSION}
>@@ -17,14 +17,24 @@
> WRKSRC=		${WRKDIR}/${DISTNAME}
> 
> USES=		tcl:tea autoreconf
>+
> USE_LDCONFIG=	yes
> CONFIGURE_ARGS=	--datadir=${DATADIR}
> PLIST_SUB+=	PORTVERSION=${PORTVERSION}
>+SUB_FILES=	pkg-message
> TEST_TARGET=	test
> 
> post-install:
>+.for prog in autoexpect autopasswd cryptdir decryptdir dislocate ftp-rfc kibitz \
>+		lpunlock mkpasswd multixterm passmass rftp rlogin-cwd timed-read timed-run \
>+		tknewsbiff tkpasswd unbuffer weather xkibitz xpstat
>+	${MV} ${WRKSRC}/${prog} ${STAGEDIR}${PREFIX}/bin/expect-${prog}
>+.endfor
>+.for prog in autoexpect cryptdir decryptdir dislocate kibitz mkpasswd multixterm \
>+		 passmass tknewsbiff unbuffer xkibitz
>+	${MV} ${STAGEDIR}${PREFIX}/man/man1/${prog}.1 ${STAGEDIR}${PREFIX}/man/man1/expect-${prog}.1
>+.endfor
> 	${LN} -sf expect${PORTVERSION}/libexpect${PORTVERSION}.so \
> 		${STAGEDIR}${PREFIX}/lib/libexpect.so.1
> 	${LN} -sf libexpect.so.1 ${STAGEDIR}${PREFIX}/lib/libexpect.so
>-
> .include <bsd.port.mk>
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 483100)
>+++ files/patch-Makefile.in	(working copy)
>@@ -1,24 +1,16 @@
>---- Makefile.in.orig	2010-09-30 17:14:07 UTC
>+--- Makefile.in.orig	2018-10-29 17:22:54 UTC
> +++ Makefile.in
>-@@ -236,10 +236,10 @@ install-libraries: libraries $(SCRIPTS)
>- 	    $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir) ; \
>- 	done;
>+@@ -238,9 +238,9 @@ install-libraries: libraries $(SCRIPTS)
>  # install standalone scripts and their man pages, if requested
>--	@mkdir -p $(DESTDIR)$(prefix)/bin
>-+	@mkdir -p $(DESTDIR)$(datadir)
>+ 	@mkdir -p $(DESTDIR)$(prefix)/bin
>  	-for i in $(SCRIPT_LIST) ; do \
>- 	  if [ -f $$i ] ; then \
>+-	  if [ -f $$i ] ; then \
> -	    $(INSTALL_PROGRAM) $$i $(DESTDIR)$(prefix)/bin/$$i ; \
>-+	    $(INSTALL_SCRIPT) $$i $(DESTDIR)$(datadir)/$$i ; \
>- 	    rm -f $$i ; \
>+-	    rm -f $$i ; \
>++	  if [ -f expect-$$i ] ; then \
>++	    $(INSTALL_PROGRAM) expect-$$i $(DESTDIR)$(prefix)/bin/expect-$$i; \
>++	    rm -f expect-$$i ; \
>  	  else true; fi ; \
>  	done
>-@@ -259,7 +259,7 @@ install-doc: doc
>- 	$(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(mandir)/man3/libexpect.3
>- 	-for i in $(SCRIPT_MANPAGE_LIST) ; do \
>- 	  if [ -f $(srcdir)/example/$$i.man ] ; then \
>--	    $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(mandir)/man1/$$i.1 ; \
>-+	    $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(datadir)/$$i.1 ; \
>- 	  else true; fi ; \
>- 	done
>  
>+ 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 483100)
>+++ pkg-plist	(working copy)
>@@ -8,36 +8,38 @@
> lib/libexpect.so
> lib/libexpect.so.1
> man/man1/expect.1.gz
>+man/man1/expect-autoexpect.1.gz
>+man/man1/expect-cryptdir.1.gz
>+man/man1/expect-decryptdir.1.gz
>+man/man1/expect-dislocate.1.gz
>+man/man1/expect-kibitz.1.gz
>+man/man1/expect-mkpasswd.1.gz
>+man/man1/expect-multixterm.1.gz
>+man/man1/expect-passmass.1.gz
>+man/man1/expect-tknewsbiff.1.gz
>+man/man1/expect-unbuffer.1.gz
>+man/man1/expect-xkibitz.1.gz
> man/man3/libexpect.3.gz
>-%%DATADIR%%/autoexpect
>-%%DATADIR%%/autoexpect.1
>-%%DATADIR%%/autopasswd
>-%%DATADIR%%/cryptdir
>-%%DATADIR%%/cryptdir.1
>-%%DATADIR%%/decryptdir
>-%%DATADIR%%/decryptdir.1
>-%%DATADIR%%/dislocate
>-%%DATADIR%%/dislocate.1
>-%%DATADIR%%/ftp-rfc
>-%%DATADIR%%/kibitz
>-%%DATADIR%%/kibitz.1
>-%%DATADIR%%/lpunlock
>-%%DATADIR%%/mkpasswd
>-%%DATADIR%%/mkpasswd.1
>-%%DATADIR%%/multixterm
>-%%DATADIR%%/multixterm.1
>-%%DATADIR%%/passmass
>-%%DATADIR%%/passmass.1
>-%%DATADIR%%/rftp
>-%%DATADIR%%/rlogin-cwd
>-%%DATADIR%%/timed-read
>-%%DATADIR%%/timed-run
>-%%DATADIR%%/tknewsbiff
>-%%DATADIR%%/tknewsbiff.1
>-%%DATADIR%%/tkpasswd
>-%%DATADIR%%/unbuffer
>-%%DATADIR%%/unbuffer.1
>-%%DATADIR%%/weather
>-%%DATADIR%%/xkibitz
>-%%DATADIR%%/xkibitz.1
>-%%DATADIR%%/xpstat
>+@mode 0755
>+bin/expect-autoexpect
>+bin/expect-autopasswd
>+bin/expect-cryptdir
>+bin/expect-decryptdir
>+bin/expect-dislocate
>+bin/expect-ftp-rfc
>+bin/expect-kibitz
>+bin/expect-lpunlock
>+bin/expect-mkpasswd
>+bin/expect-multixterm
>+bin/expect-passmass
>+bin/expect-rftp
>+bin/expect-rlogin-cwd
>+bin/expect-timed-read
>+bin/expect-timed-run
>+bin/expect-tknewsbiff
>+bin/expect-tkpasswd
>+bin/expect-unbuffer
>+bin/expect-weather
>+bin/expect-xkibitz
>+bin/expect-xpstat
>+@mode

Actions: View | Diff

Attachments on bug 232732: 198682 | 198683 | 198696 | 198744 | 198756