From owner-svn-ports-all@freebsd.org Mon Sep 30 13:59:10 2019 Return-Path: Delivered-To: svn-ports-all@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 5840D12887D; Mon, 30 Sep 2019 13:59:10 +0000 (UTC) (envelope-from tobik@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46hkXZ1ZWXz3x3m; Mon, 30 Sep 2019 13:59:10 +0000 (UTC) (envelope-from tobik@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 14DA8394B; Mon, 30 Sep 2019 13:59:10 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8UDx9IX043474; Mon, 30 Sep 2019 13:59:09 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8UDx954043473; Mon, 30 Sep 2019 13:59:09 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201909301359.x8UDx954043473@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 30 Sep 2019 13:59:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513375 - head/graphics/netpbm X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/graphics/netpbm X-SVN-Commit-Revision: 513375 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Sep 2019 13:59:10 -0000 Author: tobik Date: Mon Sep 30 13:59:09 2019 New Revision: 513375 URL: https://svnweb.freebsd.org/changeset/ports/513375 Log: graphics/netpbm: Cosmetic changes Modified: head/graphics/netpbm/Makefile Modified: head/graphics/netpbm/Makefile ============================================================================== --- head/graphics/netpbm/Makefile Mon Sep 30 13:39:37 2019 (r513374) +++ head/graphics/netpbm/Makefile Mon Sep 30 13:59:09 2019 (r513375) @@ -10,7 +10,7 @@ MASTER_SITES= https://github.com/t6/netpbm/releases/do MAINTAINER= tobik@FreeBSD.org COMMENT= Toolkit for conversion of images between different formats -LICENSE= IJG GPLv2 LGPL21 MIT PD +LICENSE= GPLv2 IJG LGPL21 MIT PD LICENSE_COMB= multi LICENSE_NAME_IJG= Independent JPEG Group License LICENSE_FILE_IJG= ${WRKSRC}/doc/copyright_summary @@ -27,59 +27,60 @@ USES= ghostscript:test gmake perl5 shebangfix USE_LDCONFIG= yes USE_PERL5= build test -SHEBANG_FILES= buildtools/makeman editor/pnmflip editor/pnmquant \ - editor/ppmfade editor/ppmquant editor/ppmshadow \ - generator/ppmrainbow converter/pbm/pbmtox10bm \ - test/Execute-Tests test/*.test test/Available-Testprog +SHEBANG_FILES= buildtools/makeman converter/pbm/pbmtox10bm editor/pnmflip \ + editor/pnmquant editor/ppmfade editor/ppmquant editor/ppmshadow \ + generator/ppmrainbow test/*.test test/Available-Testprog \ + test/Execute-Tests MAKEFILE= GNUmakefile -INSTALL_TARGET= install.bin install.lib install.data install.hdr \ - install.staticlib -MAKE_ARGS= pkgdir=${STAGEDIR}${PREFIX} \ - BINMODE=${BINMODE} \ - SHAREMODE=${SHAREMODE} \ +MAKE_ARGS= BINMODE=${BINMODE} \ + DATADIR=${DATADIR} \ DATAMODE=${_SHAREMODE} \ DIRMODE=755 \ MANMODE=${MANMODE} \ - DATADIR=${DATADIR} + pkgdir=${STAGEDIR}${PREFIX} \ + SHAREMODE=${SHAREMODE} +INSTALL_TARGET= install.bin install.lib install.data install.hdr \ + install.staticlib TEST_ARGS= pkgdir="${STAGEDIR}${PREFIX}" \ resultdir="${WRKDIR}/tests" \ RGBDEF="${STAGEDIR}${PREFIX}/share/netpbm/rgb.txt" TEST_TARGET= check - -# tiff-flate-lzw-roundtrip's checksums are different on FreeBSD so the -# test fails. The resulting and intermediary images look fine in -# spite of this. -DISABLED_TESTS= all-in-place palm-roundtrip pamhue pammixmulti-identity \ +# Disable fragile tests. tiff-flate-lzw-roundtrip's checksums are +# different on FreeBSD so the test fails. The resulting and +# intermediary images look fine in spite of this. +_DISABLE_TESTS= all-in-place palm-roundtrip pamhue pammixmulti-identity \ pamtopdbimg ppmgauss ps-alt-roundtrip tiff-flate-lzw-roundtrip +OPTIONS_DEFINE= MANPAGES PERL STATIC SVGTOPAM X11 OPTIONS_DEFAULT= MANPAGES PERL -OPTIONS_DEFINE= MANPAGES PERL STATIC SVGTOPAM X11 -OPTIONS_SUB= yes +OPTIONS_SUB= yes +SVGTOPAM_DESC= Build svgtopam +X11_DESC= Build pamx + PERL_USE= PERL5=run -STATIC_BUILD_DEPENDS= tiff>0:graphics/tiff \ - png>0:graphics/png \ +STATIC_BUILD_DEPENDS= jasper>0:graphics/jasper \ jbigkit>0:graphics/jbigkit \ - jasper>0:graphics/jasper -STATIC_LIB_DEPENDS_OFF= libtiff.so:graphics/tiff \ - libpng.so:graphics/png \ + png>0:graphics/png \ + tiff>0:graphics/tiff +STATIC_LIB_DEPENDS_OFF= libjasper.so:graphics/jasper \ libjbig.so:graphics/jbigkit \ - libjasper.so:graphics/jasper -STATIC_USES= jpeg:build + libpng.so:graphics/png \ + libtiff.so:graphics/tiff STATIC_USES_OFF= jpeg -SVGTOPAM_DESC= Build svgtopam +STATIC_USES= jpeg:build SVGTOPAM_USES= gnome SVGTOPAM_USE= GNOME=libxml2 -SVGTOPAM_VARS_OFF= DISABLED_TESTS+=svgtopam -X11_USE= XORG=x11,xcb,xau,xdmcp +SVGTOPAM_VARS_OFF= _DISABLE_TESTS+=svgtopam +X11_USE= XORG=x11,xau,xcb,xdmcp post-patch: @${REINPLACE_CMD} -e 's|misc|share/netpbm|g' ${WRKSRC}/common.mk @${REINPLACE_CMD} -e 's|$$(PKGDIR)/link|$$(PKGDIR)/lib|g' \ -e 's|pkg-config|false|g' \ ${WRKSRC}/GNUmakefile ${WRKSRC}/lib/Makefile -.for test in ${DISABLED_TESTS} +.for test in ${_DISABLE_TESTS} @${REINPLACE_CMD} -e '/${test}/d' ${WRKSRC}/test/Test-Order .endfor