From owner-svn-ports-head@FreeBSD.ORG Wed Feb 5 16:19:11 2014 Return-Path: Delivered-To: svn-ports-head@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 70B3D2DA; Wed, 5 Feb 2014 16:19:11 +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 5BB7F1AB7; Wed, 5 Feb 2014 16:19:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s15GJBYF021956; Wed, 5 Feb 2014 16:19:11 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s15GJBPo021955; Wed, 5 Feb 2014 16:19:11 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201402051619.s15GJBPo021955@svn.freebsd.org> From: John Marino Date: Wed, 5 Feb 2014 16:19:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342756 - head/devel/otrs X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Feb 2014 16:19:11 -0000 Author: marino Date: Wed Feb 5 16:19:10 2014 New Revision: 342756 URL: http://svnweb.freebsd.org/changeset/ports/342756 QAT: https://qat.redports.org/buildarchive/r342756/ Log: devel/otrs: Unbreak when /usr/bin/perl d.n.e. yet again Technically the pointyhat for breaking this port goes to swills@, but there were extenuating circumstances. After I complained that USES=shebangfix had been removed by him accidentally during a separate update, he restored it. However, it did it three days after az@ added USES=perl5. The end result is that restoring shebangfix didn't do anything because the second USES definition overrode the first one. Let's combine both to fix. Regretable this changes PLIST again, so we have to bump too. Modified: head/devel/otrs/Makefile Modified: head/devel/otrs/Makefile ============================================================================== --- head/devel/otrs/Makefile Wed Feb 5 16:18:11 2014 (r342755) +++ head/devel/otrs/Makefile Wed Feb 5 16:19:10 2014 (r342756) @@ -3,6 +3,7 @@ PORTNAME= otrs PORTVERSION= 3.3.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://ftp.otrs.org/pub/otrs/ \ ftp://ftp.samurai.com/pub/otrs/ \ @@ -37,7 +38,7 @@ BUILD_DEPENDS= p5-DBI>=0:${PORTSDIR}/dat p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= shebangfix +USES= shebangfix perl5 SHEBANG_FILES= bin/cgi-bin/*.pl bin/fcgi-bin/*.pl bin/*.pl \ scripts/auto_build/*.pl scripts/tools/*.pl scripts/*.pl @@ -76,7 +77,6 @@ CLEAN_FILES= scripts/suse* scripts/redha var/httpd/htdocs/js/thirdparty/ckeditor-4.0/_source \ var/httpd/htdocs/skins/Agent/*/img/source -USES= perl5 USE_APACHE_RUN= 22+ PLIST_SUB+= VER_CKEDITOR="4.3"