svn commit: r339881 - head/graphics/ImageMagick

[Matthias Andree]

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
- at dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters
- at dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders
- at dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%
 @dirrmtry lib/ImageMagick-%%PORTVERSION%%/config
 @dirrmtry lib/ImageMagick-%%PORTVERSION%%
 @dirrm include/ImageMagick/wand