From owner-svn-ports-all@freebsd.org Tue Apr 30 03:21:02 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D69E1580DE0; Tue, 30 Apr 2019 03:21:02 +0000 (UTC) (envelope-from wen@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 46BF28971C; Tue, 30 Apr 2019 03:21:02 +0000 (UTC) (envelope-from wen@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 247543C50; Tue, 30 Apr 2019 03:21:02 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3U3L2II022152; Tue, 30 Apr 2019 03:21:02 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3U3L2Cc022151; Tue, 30 Apr 2019 03:21:02 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201904300321.x3U3L2Cc022151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Tue, 30 Apr 2019 03:21:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500453 - head/graphics/mapserver X-SVN-Group: ports-head X-SVN-Commit-Author: wen X-SVN-Commit-Paths: head/graphics/mapserver X-SVN-Commit-Revision: 500453 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 46BF28971C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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, 30 Apr 2019 03:21:02 -0000 Author: wen Date: Tue Apr 30 03:21:01 2019 New Revision: 500453 URL: https://svnweb.freebsd.org/changeset/ports/500453 Log: - Fix build without fribidi [1] - Fix build with GCC-based architectures [2] - Update and sort options PR: 225336[1], 237598[2] Submitted by: igorz@yandex.ru[1], pkubaj@[2] Modified: head/graphics/mapserver/Makefile Modified: head/graphics/mapserver/Makefile ============================================================================== --- head/graphics/mapserver/Makefile Tue Apr 30 01:25:36 2019 (r500452) +++ head/graphics/mapserver/Makefile Tue Apr 30 03:21:01 2019 (r500453) @@ -3,6 +3,7 @@ PORTNAME= mapserver PORTVERSION= 7.2.2 +PORTREVISION= 1 CATEGORIES= graphics www geography MASTER_SITES= https://download.osgeo.org/mapserver/ @@ -15,24 +16,26 @@ LIB_DEPENDS= libgd.so:graphics/gd \ libproj.so:graphics/proj \ libpng.so:graphics/png \ libgif.so:graphics/giflib \ - libharfbuzz.so:print/harfbuzz \ libsvg.so:graphics/libsvg \ - libfreetype.so:print/freetype2 \ - libprotobuf-c.so:devel/protobuf-c + libfreetype.so:print/freetype2 -USES= cpe cmake jpeg +USES= compiler:c++11-lang cpe cmake gnome jpeg \ + localbase:ldflags CPE_VENDOR= umn -USE_GNOME= libxml2 -LDFLAGS+= -L${LOCALBASE} -pthread +LDFLAGS+= -pthread CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${LOCALBASE} \ -DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DWITH_GD=1 MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= FRIBIDI CURL GDAL GEOS KML POSTGIS PHP PERL PYTHON \ - WMS WFS WCS FASTCGI DEBUG CAIRO CAIRO_SVG \ - CLIENT_WMS CLIENT_WFS -OPTIONS_DEFAULT= FRIBIDI GDAL GEOS CLIENT_WMS CLIENT_WFS KML CAIRO_SVG +PROG_FILES= legend scalebar shp2img shptree shptreetst shptreevis \ + sortshp msencrypt tile4ms mapserv + +OPTIONS_DEFINE= CAIRO CAIRO_SVG CLIENT_WMS CLIENT_WFS CURL DEBUG \ + FASTCGI FRIBIDI GDAL GEOS HARFBUZZ KML \ + PERL PHP POSTGIS PROTOBUFC PYTHON WCS WFS WMS +OPTIONS_DEFAULT= CAIRO FRIBIDI GDAL GEOS \ + HARFBUZZ POSTGIS PROTOBUFC WCS WFS CAIRO_SVG_DESC= Cairo SVG parser support GDAL_DESC= GDAL library support FRIBIDI_DESC= Fribidi library support @@ -64,12 +67,28 @@ CMAKE_ARGS+= -DWITH_CAIRO=0 .endif .if ${PORT_OPTIONS:MFRIBIDI} -LIB_DEPENDS+= libfribidi.so:converters/fribidi -CMAKE_ARGS+= -DWITH_FRIBIDI=1 +LIB_DEPENDS+= libfribidi.so:converters/fribidi \ + libharfbuzz.so:print/harfbuzz +CMAKE_ARGS+= -DWITH_FRIBIDI=1 -DWITH_HARFBUZZ=1 .else -CMAKE_ARGS+= -DWITH_FRIBIDI=0 +CMAKE_ARGS+= -DWITH_FRIBIDI=0 -DWITH_HARFBUZZ=0 .endif +.if ${PORT_OPTIONS:MHARFBUZZ} +LIB_DEPENDS+= libfribidi.so:converters/fribidi \ + libharfbuzz.so:print/harfbuzz +CMAKE_ARGS+= -DWITH_FRIBIDI=1 -DWITH_HARFBUZZ=1 +.else +CMAKE_ARGS+= -DWITH_FRIBIDI=0 -DWITH_HARFBUZZ=0 +.endif + +.if ${PORT_OPTIONS:MPROTOBUFC} +LIB_DEPENDS+= libprotobuf-c.so:devel/protobuf-c +CMAKE_ARGS+= -DWITH_PROTOBUFC=1 +.else +CMAKE_ARGS+= -DWITH_PROTOBUFC=0 +.endif + .if ${PORT_OPTIONS:MCAIRO_SVG} LIB_DEPENDS+= libcairo.so:graphics/cairo \ libsvg-cairo.so:graphics/libsvg-cairo \ @@ -166,9 +185,6 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug .else CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release .endif - -PROG_FILES= legend scalebar shp2img shptree shptreetst shptreevis \ - sortshp msencrypt tile4ms mapserv .if ${PORT_OPTIONS:MCLIENT_WMS} LIB_DEPENDS+= libcurl.so:ftp/curl