From owner-svn-ports-all@freebsd.org Sun Dec 25 13:11:36 2016 Return-Path: Delivered-To: svn-ports-all@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 5F09AC8D2C7; Sun, 25 Dec 2016 13:11:36 +0000 (UTC) (envelope-from jhale@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 1FDCC900; Sun, 25 Dec 2016 13:11:36 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBPDBZgB017539; Sun, 25 Dec 2016 13:11:35 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBPDBYDU017534; Sun, 25 Dec 2016 13:11:34 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201612251311.uBPDBYDU017534@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Sun, 25 Dec 2016 13:11:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429416 - in head/x11-toolkits/fox17: . files X-SVN-Group: ports-head 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.23 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: Sun, 25 Dec 2016 13:11:36 -0000 Author: jhale Date: Sun Dec 25 13:11:34 2016 New Revision: 429416 URL: https://svnweb.freebsd.org/changeset/ports/429416 Log: - Update to 1.7.57 - Add TEST option - Make PNG support non-optional since audio/gogglesmm won't run without it - Enable XIM support - Convert to USES=localbase and clean up flags Added: head/x11-toolkits/fox17/files/patch-configure (contents, props changed) Modified: head/x11-toolkits/fox17/Makefile head/x11-toolkits/fox17/distinfo head/x11-toolkits/fox17/files/patch-tests_math.cpp head/x11-toolkits/fox17/pkg-plist Modified: head/x11-toolkits/fox17/Makefile ============================================================================== --- head/x11-toolkits/fox17/Makefile Sun Dec 25 13:09:46 2016 (r429415) +++ head/x11-toolkits/fox17/Makefile Sun Dec 25 13:11:34 2016 (r429416) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fox -PORTVERSION= 1.7.56 +PORTVERSION= 1.7.57 CATEGORIES= x11-toolkits MASTER_SITES= http://ftp.fox-toolkit.org/pub/ \ ftp://ftp.fox-toolkit.org/pub/ @@ -12,37 +12,40 @@ MAINTAINER= jhale@FreeBSD.org COMMENT= Fast and extensive C++ GUI toolkit (development version) LICENSE= LGPL3+ +LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libfreetype.so:print/freetype2 \ +LIB_DEPENDS= libpng.so:graphics/png \ + libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig -USES= compiler:c++11-lib libtool pathfix -GNU_CONFIGURE= yes +USES= compiler:c++11-lib libtool localbase pathfix USE_GL= gl glu USE_XORG= ice sm x11 xcursor xext xfixes xft xi xrandr xrender USE_LDCONFIG= yes + +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-opengl=yes \ + --with-xim \ + --enable-png \ --bindir=${PREFIX}/bin/${PORTNAME}-${MAJORVER} - -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -fPIC -DPIC -LDFLAGS+= -L${LOCALBASE}/lib -PORTDOCS= * +INSTALL_TARGET= install-strip MAJORVER= ${PORTVERSION:R} PLIST_SUB+= MAJORVER=${MAJORVER} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${MAJORVER} +PORTDOCS= * BROKEN_aarch64= Fails to compile: cannot initialize a parameter of type void * with an lvalue of type long BROKEN_powerpc= missing __sync_bool_compare_and_swap_8() -OPTIONS_DEFINE= DEBUG DOCS EXAMPLES OPTIMIZED_CFLAGS PROFILE +OPTIONS_DEFINE= DEBUG DOCS EXAMPLES OPTIMIZED_CFLAGS PROFILE TEST OPTIONS_GROUP= IMGFMTS -OPTIONS_GROUP_IMGFMTS= JPEG OPENJPEG PNG TIFF WEBP -OPTIONS_DEFAULT= JPEG OPENJPEG PNG TIFF WEBP +OPTIONS_GROUP_IMGFMTS= JPEG OPENJPEG TIFF WEBP +OPTIONS_DEFAULT= JPEG OPENJPEG TIFF WEBP IMGFMTS_DESC= Image formats -DEBUG_CONFIGURE_ON= --enable-debug -DEBUG_CONFIGURE_OFF= --enable-release +DEBUG_CONFIGURE_ENABLE= debug +DEBUG_CXXFLAGS_OFF= -DNDEBUG JPEG_USES= jpeg JPEG_CONFIGURE_ENABLE= jpeg @@ -50,9 +53,6 @@ JPEG_CONFIGURE_ENABLE= jpeg OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= jp2 -PNG_LIB_DEPENDS= libpng.so:graphics/png -PNG_CONFIGURE_ENABLE= png - PROFILE_CONFIGURE_ON= --with-profiling=gprof TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff @@ -64,7 +64,7 @@ WEBP_CONFIGURE_ENABLE= webp .include .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CXXFLAGS+= -ffast-math +CXXFLAGS+= -O2 -ffast-math . if !${PORT_OPTIONS:MPROFILE} CXXFLAGS+= -fomit-frame-pointer . endif @@ -85,10 +85,7 @@ post-patch: @${REINPLACE_CMD} -e '/^Libs:/s|$$| -pthread|; s|"||g' ${WRKSRC}/fox17.pc.in # CXXFLAGS safeness @${REINPLACE_CMD} -e \ - 's|^\(CXXFLAGS=""\)|#\1|; \ - /CXXFLAGS/s|-O2 ||; \ - /CXXFLAGS/s|\(-Wuninitialized\).*"|\1"|; \ - /LDFLAGS/s|-s ||' \ + 's|^\(CXXFLAGS=""\)|#\1|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} post-patch-EXAMPLES-off: @@ -99,8 +96,10 @@ post-patch-EXAMPLES-off: s|^\(SUBDIRS.*\)calculator|\1|' \ ${WRKSRC}/Makefile.in -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libFOX-${MAJORVER}.so \ - ${STAGEDIR}${PREFIX}/lib/libCHART-${MAJORVER}.so +post-patch-TEST-off: + @${REINPLACE_CMD} -e \ + 's|^\(SUBDIRS.*\)glviewer|\1|; \ + s|^\(SUBDIRS.*\)tests|\1|' \ + ${WRKSRC}/Makefile.in .include Modified: head/x11-toolkits/fox17/distinfo ============================================================================== --- head/x11-toolkits/fox17/distinfo Sun Dec 25 13:09:46 2016 (r429415) +++ head/x11-toolkits/fox17/distinfo Sun Dec 25 13:11:34 2016 (r429416) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479576730 -SHA256 (fox-1.7.56.tar.gz) = 41a03ff6a211c584e7547004002a1cfc768cdc32c84a46ec1499a4c345190885 -SIZE (fox-1.7.56.tar.gz) = 5409138 +TIMESTAMP = 1481108283 +SHA256 (fox-1.7.57.tar.gz) = f4fad81ef62e64eeca4c4c6d66c80e210ac5aed832d68d1ca0356e4d5f503c8d +SIZE (fox-1.7.57.tar.gz) = 5418276 Added: head/x11-toolkits/fox17/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/fox17/files/patch-configure Sun Dec 25 13:11:34 2016 (r429416) @@ -0,0 +1,13 @@ +--- configure.orig 2016-12-07 22:04:54 UTC ++++ configure +@@ -18010,8 +18010,8 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_xft" >&5 + $as_echo "$with_xft" >&6; } + if test "x$with_xft" != "xno"; then +-XFTCFLAGS="-I/usr/include/freetype2" +-XFTLIBS="-lXft -lfontconfig -lfreetype" ++XFTCFLAGS="`freetype-config --cflags`" ++XFTLIBS="-lXft -lfontconfig `freetype-config --libs`" + saved_cppflags="${CXXFLAGS}" + CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H=1 $XFTCFLAGS" + X_BASE_LIBS="${X_BASE_LIBS} $XFTLIBS" Modified: head/x11-toolkits/fox17/files/patch-tests_math.cpp ============================================================================== --- head/x11-toolkits/fox17/files/patch-tests_math.cpp Sun Dec 25 13:09:46 2016 (r429415) +++ head/x11-toolkits/fox17/files/patch-tests_math.cpp Sun Dec 25 13:11:34 2016 (r429416) @@ -1,4 +1,4 @@ ---- tests/math.cpp.orig 2016-01-18 02:25:42 UTC +--- tests/math.cpp.orig 2016-07-08 18:07:27 UTC +++ tests/math.cpp @@ -105,7 +105,6 @@ static const char *const names[]={ "atanh", @@ -24,3 +24,12 @@ {Math::log1p, ::log1pf}, {Math::log2, ::log2f}, }; +@@ -497,8 +494,6 @@ int main(int argc,char *argv[]){ + testFloat(Math::expm1,expm1f,"expm1f"); + testDouble(Math::exp2,exp2,"exp2"); + testFloat(Math::exp2,exp2f,"exp2f"); +- testDouble(Math::exp10,exp10,"exp10"); +- testFloat(Math::exp10,exp10f,"exp10f"); + + // Inverse hyperbolic sine, cosine, tangent + testDouble(Math::asinh,asinh,"asinh"); Modified: head/x11-toolkits/fox17/pkg-plist ============================================================================== --- head/x11-toolkits/fox17/pkg-plist Sun Dec 25 13:09:46 2016 (r429415) +++ head/x11-toolkits/fox17/pkg-plist Sun Dec 25 13:11:34 2016 (r429416) @@ -126,6 +126,7 @@ include/fox-%%MAJORVER%%/FXFile.h include/fox-%%MAJORVER%%/FXFileAssociations.h include/fox-%%MAJORVER%%/FXFileDialog.h include/fox-%%MAJORVER%%/FXFileList.h +include/fox-%%MAJORVER%%/FXFileProgressDialog.h include/fox-%%MAJORVER%%/FXFileSelector.h include/fox-%%MAJORVER%%/FXFileStream.h include/fox-%%MAJORVER%%/FXFoldingList.h @@ -137,14 +138,8 @@ include/fox-%%MAJORVER%%/FXGIFCursor.h include/fox-%%MAJORVER%%/FXGIFIcon.h include/fox-%%MAJORVER%%/FXGIFImage.h include/fox-%%MAJORVER%%/FXGLCanvas.h -include/fox-%%MAJORVER%%/FXGLCone.h include/fox-%%MAJORVER%%/FXGLContext.h -include/fox-%%MAJORVER%%/FXGLCube.h -include/fox-%%MAJORVER%%/FXGLCylinder.h include/fox-%%MAJORVER%%/FXGLObject.h -include/fox-%%MAJORVER%%/FXGLShape.h -include/fox-%%MAJORVER%%/FXGLSphere.h -include/fox-%%MAJORVER%%/FXGLTriangleMesh.h include/fox-%%MAJORVER%%/FXGLViewer.h include/fox-%%MAJORVER%%/FXGLVisual.h include/fox-%%MAJORVER%%/FXGZFileStream.h @@ -362,11 +357,11 @@ include/fox-%%MAJORVER%%/xincs.h lib/libCHART-%%MAJORVER%%.a lib/libCHART-%%MAJORVER%%.so lib/libCHART-%%MAJORVER%%.so.0 -lib/libCHART-%%MAJORVER%%.so.0.0.56 +lib/libCHART-%%MAJORVER%%.so.0.0.57 lib/libFOX-%%MAJORVER%%.a lib/libFOX-%%MAJORVER%%.so lib/libFOX-%%MAJORVER%%.so.0 -lib/libFOX-%%MAJORVER%%.so.0.0.56 +lib/libFOX-%%MAJORVER%%.so.0.0.57 libdata/pkgconfig/fox17.pc man/man1/ControlPanel-17.1.gz %%PORTEXAMPLES%%man/man1/PathFinder-17.1.gz