From owner-svn-ports-all@FreeBSD.ORG Fri Feb 28 11:52:18 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 59AC8148; Fri, 28 Feb 2014 11:52:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 45A4E12F1; Fri, 28 Feb 2014 11:52:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1SBqI6s059029; Fri, 28 Feb 2014 11:52:18 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1SBqH2n059025; Fri, 28 Feb 2014 11:52:17 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201402281152.s1SBqH2n059025@svn.freebsd.org> From: Pietro Cerutti Date: Fri, 28 Feb 2014 11:52:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346491 - in head: astro/weather lang/expect lang/expect/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2014 11:52:18 -0000 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@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%% +@dirrm %%DATADIR%%