From owner-svn-ports-head@freebsd.org Fri Sep 15 18:08:40 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31AABE00168; Fri, 15 Sep 2017 18:08:40 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 0051171C64; Fri, 15 Sep 2017 18:08:39 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8FI8den095234; Fri, 15 Sep 2017 18:08:39 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8FI8dKb095233; Fri, 15 Sep 2017 18:08:39 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201709151808.v8FI8dKb095233@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Fri, 15 Sep 2017 18:08:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449915 - head/devel/rubygem-paperclip-rails5 X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: head/devel/rubygem-paperclip-rails5 X-SVN-Commit-Revision: 449915 X-SVN-Commit-Repository: ports 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.23 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: Fri, 15 Sep 2017 18:08:40 -0000 Author: jrm Date: Fri Sep 15 18:08:38 2017 New Revision: 449915 URL: https://svnweb.freebsd.org/changeset/ports/449915 Log: devel/rubygem-paperclip-rails5: Add OPTION_SINGLE, so that either graphics/ImageMagick-nox11 or graphics/ImageMagick can be depended on. Modified: head/devel/rubygem-paperclip-rails5/Makefile Modified: head/devel/rubygem-paperclip-rails5/Makefile ============================================================================== --- head/devel/rubygem-paperclip-rails5/Makefile Fri Sep 15 18:01:17 2017 (r449914) +++ head/devel/rubygem-paperclip-rails5/Makefile Fri Sep 15 18:08:38 2017 (r449915) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= paperclip -PORTVERSION= 5.1.0 +DISTVERSION= 5.1.0 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails5 @@ -13,16 +14,26 @@ COMMENT= Easy upload management for ActiveRecord LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ImageMagick7-nox11>0:graphics/ImageMagick7-nox11 - -RUN_DEPENDS+= rubygem-activemodel5>0:databases/rubygem-activemodel5 \ +RUN_DEPENDS= rubygem-activemodel5>0:databases/rubygem-activemodel5 \ rubygem-activesupport5>=0:devel/rubygem-activesupport5 \ rubygem-cocaine>=0.5.5:devel/rubygem-cocaine \ rubygem-mimemagic>=0.3.0:misc/rubygem-mimemagic \ rubygem-mime-types>=0:misc/rubygem-mime-types -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +OPTIONS_SINGLE= IMAGEMAGICK +OPTIONS_SINGLE_IMAGEMAGICK= IMX11 IMNOX11 +OPTIONS_DEFAULT= IMNOX11 + +IMAGEMAGICK_DESC= ImageMagick image processing support +IMNOX11_DESC= Depend on ImageMagick without X11 support +IMX11_DESC= Depend on ImageMagick with X11 support + +IMNOX11_RUN_DEPENDS= ImageMagick-nox11>0:graphics/ImageMagick-nox11 +IMX11_RUN_DEPENDS= ImageMagick>0:graphics/ImageMagick .include