svn commit: r346491 - in head: astro/weather lang/expect lang/expect/files

[Pietro Cerutti]

Author: gahr
Date: Fri Feb 28 11:52:17 2014
New Revision: 346491
URL: http://svnweb.freebsd.org/changeset/ports/346491
QAT: https://qat.redports.org/buildarchive/r346491/

Log:
  - Install expect scripts in DATADIR. This fixes the conflict with
    astro/weather
  
  Suggested by:	sunpoet

Modified:
  head/astro/weather/Makefile
  head/lang/expect/Makefile
  head/lang/expect/files/patch-Makefile.in
  head/lang/expect/pkg-plist

Modified: head/astro/weather/Makefile
==============================================================================
--- head/astro/weather/Makefile	Fri Feb 28 10:58:37 2014	(r346490)
+++ head/astro/weather/Makefile	Fri Feb 28 11:52:17 2014	(r346491)
@@ -13,8 +13,6 @@ COMMENT=	Utility to provide current weat
 
 LICENSE=	ISCL
 
-CONFLICTS_INSTALL=	expect-[0-9]* expect-nox11-[0-9]*
-
 USE_PYTHON=	yes
 USE_XZ=		yes
 USES=		shebangfix

Modified: head/lang/expect/Makefile
==============================================================================
--- head/lang/expect/Makefile	Fri Feb 28 10:58:37 2014	(r346490)
+++ head/lang/expect/Makefile	Fri Feb 28 11:52:17 2014	(r346491)
@@ -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 at 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} \

Modified: head/lang/expect/files/patch-Makefile.in
==============================================================================
--- head/lang/expect/files/patch-Makefile.in	Fri Feb 28 10:58:37 2014	(r346490)
+++ head/lang/expect/files/patch-Makefile.in	Fri Feb 28 11:52:17 2014	(r346491)
@@ -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

Modified: head/lang/expect/pkg-plist
==============================================================================
--- head/lang/expect/pkg-plist	Fri Feb 28 10:58:37 2014	(r346490)
+++ head/lang/expect/pkg-plist	Fri Feb 28 11:52:17 2014	(r346491)
@@ -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%%LIBE
 lib/libexpect.so.1
 lib/libexpect.so
 @dirrm lib/expect%%EXPECT_VER%%
+ at dirrm %%DATADIR%%