From owner-svn-ports-head@freebsd.org Sat Feb 27 08:39:12 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4BD27560436; Sat, 27 Feb 2021 08:39:12 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dng1D1Xgyz4bMM; Sat, 27 Feb 2021 08:39:12 +0000 (UTC) (envelope-from danfe@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 21DB01ABA6; Sat, 27 Feb 2021 08:39:12 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11R8dBa4080576; Sat, 27 Feb 2021 08:39:11 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11R8dBE9080574; Sat, 27 Feb 2021 08:39:11 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202102270839.11R8dBE9080574@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sat, 27 Feb 2021 08:39:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566678 - in head/x11-wm: libwraster windowmaker X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11-wm: libwraster windowmaker X-SVN-Commit-Revision: 566678 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.34 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: Sat, 27 Feb 2021 08:39:12 -0000 Author: danfe Date: Sat Feb 27 08:39:11 2021 New Revision: 566678 URL: https://svnweb.freebsd.org/changeset/ports/566678 Log: Make ImageMagick support optional and respect IMAGEMAGICK_DEFAULT. Modified: head/x11-wm/libwraster/Makefile head/x11-wm/windowmaker/Makefile Modified: head/x11-wm/libwraster/Makefile ============================================================================== --- head/x11-wm/libwraster/Makefile Sat Feb 27 08:24:28 2021 (r566677) +++ head/x11-wm/libwraster/Makefile Sat Feb 27 08:39:11 2021 (r566678) @@ -2,6 +2,7 @@ PORTNAME= libwraster PORTVERSION= 0.95.9 +PORTREVISION= 1 CATEGORIES= x11-wm windowmaker MASTER_SITES= http://windowmaker.org/pub/source/release/ DISTNAME= WindowMaker-${PORTVERSION} @@ -15,8 +16,7 @@ LIB_DEPENDS= libgif.so:graphics/giflib \ libpng.so:graphics/png \ libjbig.so:graphics/jbigkit \ libtiff.so:graphics/tiff \ - libwebp.so:graphics/webp \ - libMagickWand-7.so:graphics/ImageMagick7 + libwebp.so:graphics/webp USES= jpeg libtool localbase pathfix pkgconfig xorg USE_LDCONFIG= yes @@ -35,6 +35,20 @@ CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11 --enable-wmreplace \ --with-x INSTALL_TARGET= install-strip + +OPTIONS_DEFINE= IMAGEMAGICK +OPTIONS_DEFAULT= IMAGEMAGICK + +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +IMAGEMAGICK_CONFIGURE_OFF= --disable-magick + +.include + +post-patch-IMAGEMAGICK-on: +.if ${IMAGEMAGICK_DEFAULT} == 6 + @${REINPLACE_CMD} -e '/MagickWand\.h/s,MagickWand/,wand/,' \ + ${WRKSRC}/configure ${WRKSRC}/wrlib/load_magick.c +.endif pre-build: cd ${WRKSRC} && ${MAKE_CMD} config-paths.h Modified: head/x11-wm/windowmaker/Makefile ============================================================================== --- head/x11-wm/windowmaker/Makefile Sat Feb 27 08:24:28 2021 (r566677) +++ head/x11-wm/windowmaker/Makefile Sat Feb 27 08:39:11 2021 (r566678) @@ -3,6 +3,7 @@ PORTNAME= windowmaker PORTVERSION= 0.95.9 +PORTREVISION= 1 CATEGORIES= x11-wm windowmaker MASTER_SITES= http://windowmaker.org/pub/source/release/ DISTNAME= WindowMaker-${PORTVERSION} @@ -17,7 +18,6 @@ LIB_DEPENDS= libgif.so:graphics/giflib \ libjbig.so:graphics/jbigkit \ libtiff.so:graphics/tiff \ libwebp.so:graphics/webp \ - libMagickWand-7.so:graphics/ImageMagick7 \ libwraster.so:x11-wm/libwraster \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ @@ -51,11 +51,24 @@ PORTDOCS= AUTHORS BUGFORM BUGS ChangeLog FAQ INSTALL \ INSTALL-WMAKER NEWS README README.definable-cursor \ README.i18n TODO The-perfect-Window-Maker-patch.txt -OPTIONS_DEFINE= DOCS NLS +OPTIONS_DEFINE= IMAGEMAGICK DOCS NLS +OPTIONS_DEFAULT= IMAGEMAGICK OPTIONS_SUB= yes + +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +IMAGEMAGICK_CONFIGURE_OFF= --disable-magick + NLS_USES= gettext NLS_CONFIGURE_ENV= LINGUAS="*" NLS_CONFIGURE_ENABLE= locale + +.include + +post-patch-IMAGEMAGICK-on: +.if ${IMAGEMAGICK_DEFAULT} == 6 + @${REINPLACE_CMD} -e '/MagickWand\.h/s,MagickWand/,wand/,' \ + ${WRKSRC}/configure ${WRKSRC}/wrlib/load_magick.c +.endif post-install: @${MKDIR} \