From owner-svn-ports-all@FreeBSD.ORG Sun May 25 16:24:27 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D1312587; Sun, 25 May 2014 16:24:27 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD7702C7F; Sun, 25 May 2014 16:24:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PGORos039706; Sun, 25 May 2014 16:24:27 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4PGORFv039702; Sun, 25 May 2014 16:24:27 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201405251624.s4PGORFv039702@svn.freebsd.org> From: Bryan Drewery Date: Sun, 25 May 2014 16:24:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355252 - in head/ports-mgmt: portupgrade portupgrade-devel 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.18 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: Sun, 25 May 2014 16:24:27 -0000 Author: bdrewery Date: Sun May 25 16:24:26 2014 New Revision: 355252 URL: http://svnweb.freebsd.org/changeset/ports/355252 QAT: https://qat.redports.org/buildarchive/r355252/ Log: - Blacklist ruby-bdb with Ruby 2.1 [1] - Stop installing script(1) wrapper [2] - Fix ZSH dir leftover (somewhat a false-positive) [3] PR: ports/188084 [1] Submitted by: Christoph Moench-Tegeder [1] Submitted by: sunpoet [2] Reported by: swills [3] Modified: head/ports-mgmt/portupgrade-devel/Makefile head/ports-mgmt/portupgrade-devel/pkg-plist head/ports-mgmt/portupgrade/Makefile head/ports-mgmt/portupgrade/pkg-plist Modified: head/ports-mgmt/portupgrade-devel/Makefile ============================================================================== --- head/ports-mgmt/portupgrade-devel/Makefile Sun May 25 15:42:52 2014 (r355251) +++ head/ports-mgmt/portupgrade-devel/Makefile Sun May 25 16:24:26 2014 (r355252) @@ -3,6 +3,7 @@ PORTNAME= portupgrade PORTVERSION= 20140524 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= ports-mgmt MASTER_SITES= GH \ @@ -40,18 +41,10 @@ INSTALL_TARGET+= install-doc .endif # Reported that ruby-bdb is BROKEN with 2.0 -.if ${RUBY_VER} != 2.0 +.if ${RUBY_VER} != 2.0 && ${RUBY_VER} != 2.1 RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb .endif -# Need to install working script(1) -.if ${OSVERSION} < 801000 -PLIST_SUB+= SCRIPT="" -MAKE_ENV+= NEED_COMPAT_SCRIPT=yes -.else -PLIST_SUB+= SCRIPT="@comment " -.endif - regression-test: patch cd ${WRKSRC} && ${MAKE} test Modified: head/ports-mgmt/portupgrade-devel/pkg-plist ============================================================================== --- head/ports-mgmt/portupgrade-devel/pkg-plist Sun May 25 15:42:52 2014 (r355251) +++ head/ports-mgmt/portupgrade-devel/pkg-plist Sun May 25 16:24:26 2014 (r355252) @@ -47,15 +47,12 @@ sbin/portversion %%RUBY_SITELIBDIR%%/pkgtools/revision.rb %%RUBY_SITELIBDIR%%/pkgtools.rb @dirrm %%RUBY_SITELIBDIR%%/pkgtools -%%SCRIPT%%@exec mkdir -p %D/libexec/pkgtools 2> /dev/null -%%SCRIPT%%libexec/pkgtools/script -%%SCRIPT%%@dirrm libexec/pkgtools @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi etc/pkgtools.conf.sample @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools -@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true +@dirrmtry share/zsh/site-functions @dirrmtry share/zsh %%EXAMPLESDIR%%/bash/complete.sample %%EXAMPLESDIR%%/tcsh/complete.sample Modified: head/ports-mgmt/portupgrade/Makefile ============================================================================== --- head/ports-mgmt/portupgrade/Makefile Sun May 25 15:42:52 2014 (r355251) +++ head/ports-mgmt/portupgrade/Makefile Sun May 25 16:24:26 2014 (r355252) @@ -3,6 +3,7 @@ PORTNAME= portupgrade PORTVERSION= 2.4.12 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= SF/portupgrade/pkgtools/dist/ \ @@ -39,19 +40,11 @@ INSTALL_TARGET+= install-doc .endif # Reported that ruby-bdb is BROKEN with 2.0 -.if ${RUBY_VER} != 2.0 +.if ${RUBY_VER} != 2.0 && ${RUBY_VER} != 2.1 # For PKG_DBDRIVER={bdb_btree,bdb_hash} RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb .endif -# Need to install working script(1) -.if ${OSVERSION} < 801000 -PLIST_SUB+= SCRIPT="" -MAKE_ENV+= NEED_COMPAT_SCRIPT=yes -.else -PLIST_SUB+= SCRIPT="@comment " -.endif - post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg Modified: head/ports-mgmt/portupgrade/pkg-plist ============================================================================== --- head/ports-mgmt/portupgrade/pkg-plist Sun May 25 15:42:52 2014 (r355251) +++ head/ports-mgmt/portupgrade/pkg-plist Sun May 25 16:24:26 2014 (r355252) @@ -47,13 +47,10 @@ sbin/portversion %%RUBY_SITELIBDIR%%/pkgtools/revision.rb %%RUBY_SITELIBDIR%%/pkgtools.rb @dirrm %%RUBY_SITELIBDIR%%/pkgtools -%%SCRIPT%%@exec mkdir -p %D/libexec/pkgtools 2> /dev/null -%%SCRIPT%%libexec/pkgtools/script -%%SCRIPT%%@dirrm libexec/pkgtools @sample etc/pkgtools.conf.sample etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools -@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true +@dirrmtry share/zsh/site-functions @dirrmtry share/zsh %%EXAMPLESDIR%%/bash/complete.sample %%EXAMPLESDIR%%/tcsh/complete.sample