From owner-svn-ports-head@FreeBSD.ORG Thu Jan 16 00:53:52 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 9B1E9AB7; Thu, 16 Jan 2014 00:53:52 +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 6C1FE1934; Thu, 16 Jan 2014 00:53:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0G0rquS016481; Thu, 16 Jan 2014 00:53:52 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0G0rqUI016478; Thu, 16 Jan 2014 00:53:52 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201401160053.s0G0rqUI016478@svn.freebsd.org> From: Matthias Andree Date: Thu, 16 Jan 2014 00:53:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339881 - head/graphics/ImageMagick 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: Thu, 16 Jan 2014 00:53:52 -0000 Author: mandree Date: Thu Jan 16 00:53:51 2014 New Revision: 339881 URL: http://svnweb.freebsd.org/changeset/ports/339881 QAT: https://qat.redports.org/buildarchive/r339881/ Log: Fix packaging with MODULES option disabled, by not trying to package empty directories. Submitted by: Lowell Gilbert Modified: head/graphics/ImageMagick/Makefile head/graphics/ImageMagick/pkg-plist Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Thu Jan 16 00:38:09 2014 (r339880) +++ head/graphics/ImageMagick/Makefile Thu Jan 16 00:53:51 2014 (r339881) @@ -2,7 +2,7 @@ PORTNAME= ImageMagick DISTVERSION= 6.8.0-7 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ Modified: head/graphics/ImageMagick/pkg-plist ============================================================================== --- head/graphics/ImageMagick/pkg-plist Thu Jan 16 00:38:09 2014 (r339880) +++ head/graphics/ImageMagick/pkg-plist Thu Jan 16 00:53:51 2014 (r339881) @@ -394,6 +394,9 @@ lib/ImageMagick-%%PORTVERSION%%/config/c %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/.keep %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/analyze.la %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/analyze.so +%%MODULES%%@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters +%%MODULES%%@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders +%%MODULES%%@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%% lib/libMagick++.a lib/libMagick++.la lib/libMagick++.so @@ -1455,9 +1458,6 @@ man/man1/stream.1.gz %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick %%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image %%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Image -@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters -@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders -@dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%% @dirrmtry lib/ImageMagick-%%PORTVERSION%%/config @dirrmtry lib/ImageMagick-%%PORTVERSION%% @dirrm include/ImageMagick/wand