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

4 files changed, 36 insertions, 12 deletions

diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index 691dd6566ad3..8ac9c6ec525b 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -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>
diff --git a/x11-toolkits/fox16/distinfo b/x11-toolkits/fox16/distinfo
index 1f22721a0f8f..cf46a8e34d02 100644
--- a/x11-toolkits/fox16/distinfo
+++ b/x11-toolkits/fox16/distinfo
@@ -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
diff --git a/x11-toolkits/fox16/files/patch-src_FXString.cpp b/x11-toolkits/fox16/files/patch-src_FXString.cpp
new file mode 100644
index 000000000000..81460082468c
--- /dev/null
+++ b/x11-toolkits/fox16/files/patch-src_FXString.cpp
@@ -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; }
diff --git a/x11-toolkits/fox16/pkg-plist b/x11-toolkits/fox16/pkg-plist
index 2cd66470e7a6..2fab1a89cbf8 100644
--- a/x11-toolkits/fox16/pkg-plist
+++ b/x11-toolkits/fox16/pkg-plist
@@ -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