1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00

- Install expect scripts in DATADIR. This fixes the conflict with

astro/weather

Suggested by:	sunpoet
This commit is contained in:
Pietro Cerutti 2014-02-28 11:52:17 +00:00
parent 8169902a2c
commit 414adba8b1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=346491
4 changed files with 33 additions and 30 deletions

View File

@ -13,8 +13,6 @@ COMMENT= Utility to provide current weather conditions and forecasts
LICENSE= ISCL
CONFLICTS_INSTALL= expect-[0-9]* expect-nox11-[0-9]*
USE_PYTHON= yes
USE_XZ= yes
USES= shebangfix

View File

@ -3,6 +3,7 @@
PORTNAME= expect
PORTVERSION= 5.45
PORTREVISION= 1
CATEGORIES= lang tcl tk
MASTER_SITES= SF/expect/Expect/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}
@ -10,8 +11,6 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= tcltk@FreeBSD.org
COMMENT= Sophisticated scripter based on Tcl/Tk
CONFLICTS= weather-[0-9]*
LIBEXPECT_VER= ${PORTVERSION:S/.//}
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}
@ -21,6 +20,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared \
--exec-prefix=${PREFIX} \
--datadir=${DATADIR} \
--with-tclconfig=${TCL_LIBDIR} \
--with-tclinclude=${TCL_INCLUDEDIR}
PLIST_SUB+= EXPECT_VER=${PORTVERSION} \

View File

@ -1,11 +1,15 @@
--- Makefile.in.orig 2014-02-21 14:51:15.000000000 +0100
+++ Makefile.in 2014-02-21 14:55:44.000000000 +0100
@@ -239,7 +239,7 @@
@mkdir -p $(DESTDIR)$(prefix)/bin
--- 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)$(prefix)/bin/$$i ; \
+ $(INSTALL_SCRIPT) $$i $(DESTDIR)$(datadir)/$$i ; \
rm -f $$i ; \
else true; fi ; \
done

View File

@ -1,29 +1,29 @@
bin/autoexpect
bin/autopasswd
bin/cryptdir
bin/decryptdir
bin/dislocate
bin/expect
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
@ -42,3 +42,4 @@ lib/expect%%EXPECT_VER%%/libexpect%%LIBEXPECT_VER%%.so
lib/libexpect.so.1
lib/libexpect.so
@dirrm lib/expect%%EXPECT_VER%%
@dirrm %%DATADIR%%