Attachment #198756 for bug #232732

View | Details | Raw Unified | Return to bug 232732 | Differences between
Collapse All | Expand All





PORTNAME=	expect
PORTVERSION=	5.45.4
PORTEPOCH=	2
CATEGORIES=	lang tcl tk
MASTER_SITES=	SF/expect/Expect/${PORTVERSION}
DISTNAME=	${PORTNAME}${PORTVERSION}

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>




--- Makefile.in.orig	2018-10-29 17:22:54 UTC
+++ Makefile.in
@@ -238,9 +238,9 @@ install-libraries: libraries $(SCRIPTS)
 	    $(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 ; \
-	    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
 
 




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
@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
%%DATADIR%%/tknewsbiff
%%DATADIR%%/tknewsbiff.1
%%DATADIR%%/tkpasswd
%%DATADIR%%/unbuffer
%%DATADIR%%/unbuffer.1
%%DATADIR%%/weather
%%DATADIR%%/xkibitz
%%DATADIR%%/xkibitz.1
%%DATADIR%%/xpstat

Return to bug 232732

Lines 3-9 Link Here

(-)Makefile (-2 / +12 lines)
3		3
4	PORTNAME= expect	4	PORTNAME= expect
5	PORTVERSION= 5.45.4	5	PORTVERSION= 5.45.4
6	PORTEPOCH= 1	6	PORTEPOCH= 2
7	CATEGORIES= lang tcl tk	7	CATEGORIES= lang tcl tk
8	MASTER_SITES= SF/expect/Expect/${PORTVERSION}	8	MASTER_SITES= SF/expect/Expect/${PORTVERSION}
9	DISTNAME= ${PORTNAME}${PORTVERSION}	9	DISTNAME= ${PORTNAME}${PORTVERSION}
Lines 17-30 Link Here
17	WRKSRC= ${WRKDIR}/${DISTNAME}	17	WRKSRC= ${WRKDIR}/${DISTNAME}
18		18
19	USES= tcl:tea autoreconf	19	USES= tcl:tea autoreconf
		20
20	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
21	CONFIGURE_ARGS= --datadir=${DATADIR}	22	CONFIGURE_ARGS= --datadir=${DATADIR}
22	PLIST_SUB+= PORTVERSION=${PORTVERSION}	23	PLIST_SUB+= PORTVERSION=${PORTVERSION}
		24	SUB_FILES= pkg-message
23	TEST_TARGET= test	25	TEST_TARGET= test
24		26
25	post-install:	27	post-install:
		28	.for prog in autoexpect autopasswd cryptdir decryptdir dislocate ftp-rfc kibitz \
		29	lpunlock mkpasswd multixterm passmass rftp rlogin-cwd timed-read timed-run \
		30	tknewsbiff tkpasswd unbuffer weather xkibitz xpstat
		31	${MV} ${WRKSRC}/${prog} ${STAGEDIR}${PREFIX}/bin/expect-${prog}
		32	.endfor
		33	.for prog in autoexpect cryptdir decryptdir dislocate kibitz mkpasswd multixterm \
		34	passmass tknewsbiff unbuffer xkibitz
		35	${MV} ${STAGEDIR}${PREFIX}/man/man1/${prog}.1 ${STAGEDIR}${PREFIX}/man/man1/expect-${prog}.1
		36	.endfor
26	${LN} -sf expect${PORTVERSION}/libexpect${PORTVERSION}.so \	37	${LN} -sf expect${PORTVERSION}/libexpect${PORTVERSION}.so \
27	${STAGEDIR}${PREFIX}/lib/libexpect.so.1	38	${STAGEDIR}${PREFIX}/lib/libexpect.so.1
28	${LN} -sf libexpect.so.1 ${STAGEDIR}${PREFIX}/lib/libexpect.so	39	${LN} -sf libexpect.so.1 ${STAGEDIR}${PREFIX}/lib/libexpect.so
29
30	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Lines 1-24 Link Here

(-)files/patch-Makefile.in (-17 / +9 lines)
1	--- Makefile.in.orig 2010-09-30 17:14:07 UTC	1	--- Makefile.in.orig 2018-10-29 17:22:54 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -236,10 +236,10 @@ install-libraries: libraries $(SCRIPTS)	3	@@ -238,9 +238,9 @@ install-libraries: libraries $(SCRIPTS)
4	$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir) ; \
5	done;
6	# install standalone scripts and their man pages, if requested	4	# install standalone scripts and their man pages, if requested
7	- @mkdir -p $(DESTDIR)$(prefix)/bin	5	@mkdir -p $(DESTDIR)$(prefix)/bin
8	+ @mkdir -p $(DESTDIR)$(datadir)
9	-for i in $(SCRIPT_LIST) ; do \	6	-for i in $(SCRIPT_LIST) ; do \
10	if [ -f $$i ] ; then \	7	- if [ -f $$i ] ; then \
11	- $(INSTALL_PROGRAM) $$i $(DESTDIR)$(prefix)/bin/$$i ; \	8	- $(INSTALL_PROGRAM) $$i $(DESTDIR)$(prefix)/bin/$$i ; \
12	+ $(INSTALL_SCRIPT) $$i $(DESTDIR)$(datadir)/$$i ; \	9	- rm -f $$i ; \
13	rm -f $$i ; \	10	+ if [ -f expect-$$i ] ; then \
		11	+ $(INSTALL_PROGRAM) expect-$$i $(DESTDIR)$(prefix)/bin/expect-$$i; \
		12	+ rm -f expect-$$i ; \
14	else true; fi ; \	13	else true; fi ; \
15	done	14	done
16	@@ -259,7 +259,7 @@ install-doc: doc
17	$(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(mandir)/man3/libexpect.3
18	-for i in $(SCRIPT_MANPAGE_LIST) ; do \
19	if [ -f $(srcdir)/example/$$i.man ] ; then \
20	- $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(mandir)/man1/$$i.1 ; \
21	+ $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(datadir)/$$i.1 ; \
22	else true; fi ; \
23	done
24		15
		16

Lines 8-43 Link Here

(-)pkg-plist (-32 / +34 lines)
8	lib/libexpect.so	8	lib/libexpect.so
9	lib/libexpect.so.1	9	lib/libexpect.so.1
10	man/man1/expect.1.gz	10	man/man1/expect.1.gz
		11	man/man1/expect-autoexpect.1.gz
		12	man/man1/expect-cryptdir.1.gz
		13	man/man1/expect-decryptdir.1.gz
		14	man/man1/expect-dislocate.1.gz
		15	man/man1/expect-kibitz.1.gz
		16	man/man1/expect-mkpasswd.1.gz
		17	man/man1/expect-multixterm.1.gz
		18	man/man1/expect-passmass.1.gz
		19	man/man1/expect-tknewsbiff.1.gz
		20	man/man1/expect-unbuffer.1.gz
		21	man/man1/expect-xkibitz.1.gz
11	man/man3/libexpect.3.gz	22	man/man3/libexpect.3.gz
12	%%DATADIR%%/autoexpect	23	@mode 0755
13	%%DATADIR%%/autoexpect.1	24	bin/expect-autoexpect
14	%%DATADIR%%/autopasswd	25	bin/expect-autopasswd
15	%%DATADIR%%/cryptdir	26	bin/expect-cryptdir
16	%%DATADIR%%/cryptdir.1	27	bin/expect-decryptdir
17	%%DATADIR%%/decryptdir	28	bin/expect-dislocate
18	%%DATADIR%%/decryptdir.1	29	bin/expect-ftp-rfc
19	%%DATADIR%%/dislocate	30	bin/expect-kibitz
20	%%DATADIR%%/dislocate.1	31	bin/expect-lpunlock
21	%%DATADIR%%/ftp-rfc	32	bin/expect-mkpasswd
22	%%DATADIR%%/kibitz	33	bin/expect-multixterm
23	%%DATADIR%%/kibitz.1	34	bin/expect-passmass
24	%%DATADIR%%/lpunlock	35	bin/expect-rftp
25	%%DATADIR%%/mkpasswd	36	bin/expect-rlogin-cwd
26	%%DATADIR%%/mkpasswd.1	37	bin/expect-timed-read
27	%%DATADIR%%/multixterm	38	bin/expect-timed-run
28	%%DATADIR%%/multixterm.1	39	bin/expect-tknewsbiff
29	%%DATADIR%%/passmass	40	bin/expect-tkpasswd
30	%%DATADIR%%/passmass.1	41	bin/expect-unbuffer
31	%%DATADIR%%/rftp	42	bin/expect-weather
32	%%DATADIR%%/rlogin-cwd	43	bin/expect-xkibitz
33	%%DATADIR%%/timed-read	44	bin/expect-xpstat
34	%%DATADIR%%/timed-run	45	@mode
35	%%DATADIR%%/tknewsbiff
36	%%DATADIR%%/tknewsbiff.1
37	%%DATADIR%%/tkpasswd
38	%%DATADIR%%/unbuffer
39	%%DATADIR%%/unbuffer.1
40	%%DATADIR%%/weather
41	%%DATADIR%%/xkibitz
42	%%DATADIR%%/xkibitz.1
43	%%DATADIR%%/xpstat