FreeBSD Bugzilla – Attachment 198744 Details for
Bug 232732
build of expect in lang/expect does not install autoexpect script correctly
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn-diff-expect_v4
svn-diff-expect (text/plain), 4.35 KB, created by
Walter Schwarzenfeld
on 2018-10-29 18:57:01 UTC
(
hide
)
Description:
svn-diff-expect_v4
Filename:
MIME Type:
Creator:
Walter Schwarzenfeld
Created:
2018-10-29 18:57:01 UTC
Size:
4.35 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 483100) >+++ Makefile (working copy) >@@ -20,11 +20,21 @@ > 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} >+ ${CHMOD} 0755 ${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 >- >+ ${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,36 @@ > 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 >+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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 232732
:
198682
|
198683
|
198696
|
198744
|
198756