From owner-svn-ports-all@freebsd.org Tue Dec 3 11:27:14 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 CE24F1AABC5; Tue, 3 Dec 2019 11:27:14 +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) 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 47S07k55KQz4HNF; Tue, 3 Dec 2019 11:27:14 +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 9317DF067; Tue, 3 Dec 2019 11:27:14 +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 xB3BREIl097418; Tue, 3 Dec 2019 11:27:14 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB3BREho097417; Tue, 3 Dec 2019 11:27:14 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201912031127.xB3BREho097417@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Tue, 3 Dec 2019 11:27:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518932 - head/graphics/simpleviewer X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/graphics/simpleviewer X-SVN-Commit-Revision: 518932 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: Tue, 03 Dec 2019 11:27:14 -0000 Author: danfe Date: Tue Dec 3 11:27:14 2019 New Revision: 518932 URL: https://svnweb.freebsd.org/changeset/ports/518932 Log: - Allow to disable a lot of extra features via options - Report correct (actual) program version in various places - Simplify the grammar in the explanation about DIST_SUBDIR - Wrap USES string a little earlier and put missing `gl' to USE_GL list as reported by stage Q/A Modified: head/graphics/simpleviewer/Makefile Modified: head/graphics/simpleviewer/Makefile ============================================================================== --- head/graphics/simpleviewer/Makefile Tue Dec 3 11:26:34 2019 (r518931) +++ head/graphics/simpleviewer/Makefile Tue Dec 3 11:27:14 2019 (r518932) @@ -5,29 +5,25 @@ PORTNAME= simpleviewer PORTVERSION= 3.1.7 CATEGORIES= graphics MASTER_SITES= https://bitbucket.org/andreyu/simple-viewer-gl/get/ -DISTNAME= v${PORTVERSION} # version tag, thus no embedded ${PORTNAME} -DIST_SUBDIR= ${PORTNAME} # and hence the need for ${DIST_SUBDIR} +DISTNAME= v${PORTVERSION} # version tag, has no embedded ${PORTNAME} +DIST_SUBDIR= ${PORTNAME} # and that's why we need ${DIST_SUBDIR} MAINTAINER= danfe@FreeBSD.org COMMENT= Small and simple image viewer based on OpenGL LICENSE= GPLv2 -LIB_DEPENDS= libIlmImf.so:graphics/openexr \ - libImlib2.so:graphics/imlib2 \ - libexif.so:graphics/libexif \ - libfreetype.so:print/freetype2 \ - libgif.so:graphics/giflib \ +LIB_DEPENDS= libfreetype.so:print/freetype2 \ libglfw.so:graphics/glfw \ - liblcms2.so:graphics/lcms2 \ - libpng.so:graphics/png \ - libtiff.so:graphics/tiff \ - libwebp.so:graphics/webp + libpng.so:graphics/png -USES= cmake:insource compiler:c++11-lang gl jpeg pkgconfig tar:bzip2 \ - xorg -USE_GL= glu +USES= cmake:insource compiler:c++11-lang gl jpeg pkgconfig \ + tar:bzip2 xorg +USE_GL= gl glu USE_XORG= ice sm x11 xcursor xext xinerama xrandr xxf86vm +CMAKE_ARGS= -DAPP_VERSION_MAJOR:STRING=${PORTVERSION:S/./ /g:[1]} \ + -DAPP_VERSION_MINOR:STRING=${PORTVERSION:S/./ /g:[2]} \ + -DAPP_VERSION_RELEASE:STRING=${PORTVERSION:S/./ /g:[3]} WRKSRC= ${WRKDIR}/andreyu-simple-viewer-gl-d8928067922d @@ -37,7 +33,36 @@ PORTDOCS= README.md PORTEXAMPLES= config.example SUB_FILES= pkg-message -OPTIONS_DEFINE= DOCS EXAMPLES +EXTRA_FEATURES= CURL GIF IMLIB2 JPEG2000 LCMS2 LIBEXIF OPENEXR TIFF WEBP +OPTIONS_DEFINE= DOCS EXAMPLES ${EXTRA_FEATURES} +OPTIONS_DEFAULT= ${EXTRA_FEATURES} + +CURL_LIB_DEPENDS= libcurl.so:ftp/curl +CURL_CMAKE_OFF= -DDISABLE_CURL_SUPPORT:STRING=1 + +GIF_LIB_DEPENDS= libgif.so:graphics/giflib +GIF_CMAKE_OFF= -DDISABLE_GIF_SUPPORT:STRING=1 + +IMLIB2_LIB_DEPENDS= libImlib2.so:graphics/imlib2 +IMLIB2_CMAKE_OFF= -DDISABLE_IMLIB2_SUPPORT:STRING=1 + +JPEG2000_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg +JPEG2000_CMAKE_OFF= -DDISABLE_JPEG2000_SUPPORT:STRING=1 + +LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 +LCMS2_CMAKE_OFF= -DDISABLE_LCMS2_SUPPORT:STRING=1 + +LIBEXIF_LIB_DEPENDS= libexif.so:graphics/libexif +LIBEXIF_CMAKE_OFF= -DDISABLE_EXIF_SUPPORT:STRING=1 + +OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr +OPENEXR_CMAKE_OFF= -DDISABLE_OPENEXR_SUPPORT:STRING=1 + +TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff +TIFF_CMAKE_OFF= -DDISABLE_TIFF_SUPPORT:STRING=1 + +WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WEBP_CMAKE_OFF= -DDISABLE_WEBP_SUPPORT:STRING=1 post-patch: @${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \