Date: Sat, 19 Nov 2016 17:46:15 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426519 - in head/x11-toolkits/fox16: . files Message-ID: <201611191746.uAJHkFug095183@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Sat Nov 19 17:46:15 2016 New Revision: 426519 URL: https://svnweb.freebsd.org/changeset/ports/426519 Log: Update to 1.6.52 Refine the OPTIMIZED_CFLAGS option to exclude flags unsupported by clang and to fix build if the PROFILE option is also enabled Add a few dependencies to satisfy stage-qa Added: head/x11-toolkits/fox16/files/ head/x11-toolkits/fox16/files/patch-src_FXString.cpp (contents, props changed) Modified: head/x11-toolkits/fox16/Makefile head/x11-toolkits/fox16/distinfo head/x11-toolkits/fox16/pkg-plist Modified: head/x11-toolkits/fox16/Makefile ============================================================================== --- head/x11-toolkits/fox16/Makefile Sat Nov 19 17:42:40 2016 (r426518) +++ head/x11-toolkits/fox16/Makefile Sat Nov 19 17:46:15 2016 (r426519) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fox -PORTVERSION= 1.6.51 +PORTVERSION= 1.6.52 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.fox-toolkit.org/pub/ \ http://ftp.fox-toolkit.org/pub/ @@ -16,8 +16,9 @@ LICENSE= LGPL3+ LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff -USES= jpeg libtool pathfix -USE_GL= glu +USES= compiler:features jpeg libtool pathfix +USE_GL= gl glu +USE_XORG= x11 xext xfixes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-opengl --with-x --with-xim USE_LDCONFIG= yes @@ -31,15 +32,12 @@ PORTDOCS= * OPTIONS_DEFINE= APPS DEBUG DOCS OPTIMIZED_CFLAGS PROFILE SHM \ XCURSOR XFT XINPUT XRANDR XRENDER -OPTIONS_DEFAULT= SHM XCURSOR XFT XINPUT XRANDR XRENDER +OPTIONS_DEFAULT= SHM XCURSOR XFT XINPUT XRANDR XRENDER OPTIONS_SUB= yes APPS_DESC= Install sample applications DEBUG_CONFIGURE_ON= --enable-debug DEBUG_CONFIGURE_OFF= --enable-release -OPTIMIZED_CFLAGS_CXXFLAGS=\ - -ffast-math -fexpensive-optimizations \ - -finline-functions -fomit-frame-pointer PROFILE_CONFIGURE_ON= --with-profiling=gprof SHM_DESC= Shared Memory support SHM_CONFIGURE_ON= --with-xshm=yes @@ -48,6 +46,8 @@ XCURSOR_USE= xorg=xcursor XCURSOR_CONFIGURE_ON= --with-xcursor=yes XCURSOR_CONFIGURE_OFF= --with-xcursor=no XFT_USE= xorg=xft +XFT_LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig XFT_CONFIGURE_ON= --with-xft=yes XFT_CONFIGURE_OFF= --with-xft=no XFT_CPPFLAGS= $$(freetype-config --cflags) @@ -67,6 +67,18 @@ XRENDER_CONFIGURE_OFF= --with-xrender=no MAJORVER= ${PORTVERSION:R} +.include <bsd.port.pre.mk> + +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} +CXXFLAGS+= -ffast-math +. if !${PORT_OPTIONS:MPROFILE} +CXXFLAGS+= -fomit-frame-pointer +. endif +. if ${COMPILER_TYPE} == "gcc" +CXXFLAGS+= -fexpensive-optimizations -finline-functions +. endif +.endif + post-patch: # Rename man pages as in manpage.1 --> manpage-16.1 to avoid # conflicts with fox14 and fox17 @@ -108,4 +120,4 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libCHART-${MAJORVER}.so.[0-9].* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libFOX-${MAJORVER}.so.[0-9].* -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/x11-toolkits/fox16/distinfo ============================================================================== --- head/x11-toolkits/fox16/distinfo Sat Nov 19 17:42:40 2016 (r426518) +++ head/x11-toolkits/fox16/distinfo Sat Nov 19 17:46:15 2016 (r426519) @@ -1,2 +1,3 @@ -SHA256 (fox-1.6.51.tar.gz) = 15a99792965d933a4936e48b671c039657546bdec6a318c223ab1131624403d1 -SIZE (fox-1.6.51.tar.gz) = 4383165 +TIMESTAMP = 1479492241 +SHA256 (fox-1.6.52.tar.gz) = 8e57af9801a3400dbecf34927e871896ff4198ab72c1a3a5e4e27258a3a47d1b +SIZE (fox-1.6.52.tar.gz) = 4384974 Added: head/x11-toolkits/fox16/files/patch-src_FXString.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/fox16/files/patch-src_FXString.cpp Sat Nov 19 17:46:15 2016 (r426519) @@ -0,0 +1,11 @@ +--- src/FXString.cpp.orig 2016-11-18 18:04:41 UTC ++++ src/FXString.cpp +@@ -2365,7 +2365,7 @@ FXString& FXString::vformat(const FXchar + #else + va_list ag; + x: va_copy(ag,args); +- result=vsnprintf(str,length()+1,fmt,a); ++ result=vsnprintf(str,length()+1,fmt,ag); + va_end(ag); + if(result<0){ length(FXMAX(64,length()*2)); goto x; } + if(length()<result){ length(result); goto x; } Modified: head/x11-toolkits/fox16/pkg-plist ============================================================================== --- head/x11-toolkits/fox16/pkg-plist Sat Nov 19 17:42:40 2016 (r426518) +++ head/x11-toolkits/fox16/pkg-plist Sat Nov 19 17:46:15 2016 (r426519) @@ -294,11 +294,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.51 +lib/libCHART-%%MAJORVER%%.so.0.0.52 lib/libFOX-%%MAJORVER%%.a lib/libFOX-%%MAJORVER%%.so lib/libFOX-%%MAJORVER%%.so.0 -lib/libFOX-%%MAJORVER%%.so.0.0.51 +lib/libFOX-%%MAJORVER%%.so.0.0.52 libdata/pkgconfig/fox.pc %%APPS%%man/man1/PathFinder-16.1.gz %%APPS%%man/man1/adie-16.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611191746.uAJHkFug095183>