Index: head/x11-toolkits/fox16/Makefile =================================================================== --- head/x11-toolkits/fox16/Makefile (revision 447008) +++ head/x11-toolkits/fox16/Makefile (revision 447009) @@ -1,124 +1,124 @@ # Created by: Alexander Novitsky # $FreeBSD$ PORTNAME= fox -PORTVERSION= 1.6.52 -PORTREVISION= 2 +PORTVERSION= 1.6.55 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.fox-toolkit.org/pub/ \ http://ftp.fox-toolkit.org/pub/ PKGNAMESUFFIX= ${PORTVERSION:R:S/.//} MAINTAINER= jhale@FreeBSD.org COMMENT= Fast and extensive C++ GUI toolkit -- ver.1.6 -LICENSE= LGPL3+ +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff 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 CPPFLAGS+= -I${LOCALBASE}/include -fPIC LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= MAJORVER="${MAJORVER}" PORTDOCS= * OPTIONS_DEFINE= APPS DEBUG DOCS OPTIMIZED_CFLAGS PROFILE 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 PROFILE_CONFIGURE_ON= --with-profiling=gprof SHM_DESC= Shared Memory support SHM_CONFIGURE_ON= --with-xshm=yes SHM_CONFIGURE_OFF= --with-xshm=no 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) XFT_LDFLAGS= $$(freetype-config --libs) XFT_IMPLIES= XRENDER XINPUT_DESC= X Input extension library support XINPUT_USE= xorg=xi XINPUT_CONFIGURE_ON= --with-xinput=yes XINPUT_CONFIGURE_OFF= --with-xinput=no XRANDR_USE= xorg=xrandr XRANDR_CONFIGURE_ON= --with-xrandr=yes XRANDR_CONFIGURE_OFF= --with-xrandr=no XRENDER_DESC= X Render extension library support XRENDER_USE= xorg=xrender XRENDER_CONFIGURE_ON= --with-xrender=yes XRENDER_CONFIGURE_OFF= --with-xrender=no MAJORVER= ${PORTVERSION:R} .include .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 files=$$(${FIND} ${WRKSRC} -name *.1); \ for f in $$files; do \ ${MV} $$f `${ECHO_CMD} $$f | ${SED} -e 's|\.1|-16.1|'`; \ done; @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ '/man_MANS/s|\.1|-16.1|g' @${REINPLACE_CMD} -e \ '/^Libs:/s|$$| -pthread|; \ s|"||g' ${WRKSRC}/fox.pc.in # CXXFLAGS safeness @${REINPLACE_CMD} -e \ 's|^\(CXXFLAGS=""\)|#\1|; \ /CXXFLAGS/s|-O2 ||; \ /CXXFLAGS/s|\(-Wuninitialized\).*"|\1"|; \ /LDFLAGS/s|-s ||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # doc prefix safeness @${REINPLACE_CMD} -e \ 's|^\(htmldir\).*$$|\1=${DOCSDIR}/html|' \ ${WRKSRC}/doc/Makefile.in @${REINPLACE_CMD} -e \ 's|^\(artdir\).*$$|\1=${DOCSDIR}/html|' \ ${WRKSRC}/doc/art/Makefile.in @${REINPLACE_CMD} -e \ 's|^\(screenshotsdir\).*$$|\1=${DOCSDIR}/html|' \ ${WRKSRC}/doc/screenshots/Makefile.in post-patch-APPS-off: @${REINPLACE_CMD} -e \ 's|^\(SUBDIRS.*\)adie|\1|; \ s|^\(SUBDIRS.*\)pathfinder|\1|; \ s|^\(SUBDIRS.*\)calculator|\1|' \ ${WRKSRC}/Makefile.in post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libCHART-${MAJORVER}.so.[0-9].* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libFOX-${MAJORVER}.so.[0-9].* .include Index: head/x11-toolkits/fox16/distinfo =================================================================== --- head/x11-toolkits/fox16/distinfo (revision 447008) +++ head/x11-toolkits/fox16/distinfo (revision 447009) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479492241 -SHA256 (fox-1.6.52.tar.gz) = 8e57af9801a3400dbecf34927e871896ff4198ab72c1a3a5e4e27258a3a47d1b -SIZE (fox-1.6.52.tar.gz) = 4384974 +TIMESTAMP = 1501510377 +SHA256 (fox-1.6.55.tar.gz) = 172416625221e54dcc1c4293fc892b9695f1e952f4b895376e6604c6c3813d74 +SIZE (fox-1.6.55.tar.gz) = 4384971 Index: head/x11-toolkits/fox16/files/patch-src_FXString.cpp =================================================================== --- head/x11-toolkits/fox16/files/patch-src_FXString.cpp (revision 447008) +++ head/x11-toolkits/fox16/files/patch-src_FXString.cpp (revision 447009) @@ -1,20 +1,11 @@ ---- src/FXString.cpp.orig 2016-06-16 04:16:00 UTC +--- src/FXString.cpp.orig 2017-04-21 00:34:42 UTC +++ src/FXString.cpp @@ -2353,7 +2353,7 @@ FXString& FXString::vformat(const FXchar length(result); vsnprintf(str,length()+1,fmt,args); #elif defined(HAVE_VSNPRINTF) // Have vsnprintf() -#if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1)) +#if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1)) || defined(__FreeBSD__) va_list ag; va_copy(ag,args); result=vsnprintf(str,length(),fmt,ag); -@@ -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()