Re: UPDATE: devel/fox 1.6.50 => 1.6.57

2019-07-26 Thread Bryan Linton
On 2019-07-25 11:59:45, Brian Callahan  wrote:
> Hi Marc and ports --
> 
> Attached is a small update to devel/fox, updating it from the 5+ year old
> version we have.
> 

I've updated and rebuilt devel/fox with your patch and x11/xfe
still works fine on amd64.

No regressions seen so far.

-- 
Bryan



UPDATE: devel/fox 1.6.50 => 1.6.57

2019-07-25 Thread Brian Callahan

Hi Marc and ports --

Attached is a small update to devel/fox, updating it from the 5+ year 
old version we have.


Notes:
* No SHARED_LIBS bumps
* Added a patch to remove a line from configure that prevented our 
CXXFLAGS from being added

* Added -DNDEBUG to CXXFLAGS to avoid compiling some debug code
* Added --with-xim to CONFIGURE_ARGS. This brings consistency with other 
X11 toolkits in terms of deadkeys and compose key sequences. Indeed, 
this was the impetus for the update in the first place. See [0].

* Sync WANTLIB
* Remove some stray whitespace as reported by portcheck

FOX doesn't have many consumers (only 3--1 of which will go away in an 
upcoming port update) but all 3 of them are happy with this update. 
amd64 tested only.


OK?

~Brian

[0] http://daemonforums.org/showthread.php?t=11065
Index: Makefile
===
RCS file: /cvs/ports/devel/fox/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile	12 Jul 2019 21:02:14 -	1.36
+++ Makefile	25 Jul 2019 15:50:44 -
@@ -3,12 +3,11 @@
 COMMENT =	C++ toolkit for GUI
 CATEGORIES =	devel
 
-DISTNAME =	fox-1.6.50
-REVISION =	2
+DISTNAME =	fox-1.6.57
 
 SHARED_LIBS +=	FOX-1.6  2.1  # .0.50
 SHARED_LIBS +=	CHART-1.61.1  # .0.50
-MASTER_SITES =	http://ftp.fox-toolkit.org/pub/
+MASTER_SITES =	ftp://ftp.fox-toolkit.org/pub/
 HOMEPAGE =	http://www.fox-toolkit.org/
 
 MAINTAINER =	Marc Espie 
@@ -21,12 +20,14 @@ LIB_DEPENDS =	archivers/bzip2 \
 		graphics/tiff
 
 CONFIGURE_ENV += \
+	CXXFLAGS="${CXXFLAGS} -DNDEBUG" \
 	CPPFLAGS="-I${LOCALBASE}/include" \
-	LDFLAGS="-L${LOCALBASE}/lib" 
+	LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS += \
 	--x-includes="${X11BASE}/include -I${X11BASE}/include/freetype2" \
 	--x-libraries=${X11BASE}/lib \
-	--with-xft
+	--with-xft \
+	--with-xim
 
 # LGPL or looser
 PERMIT_PACKAGE = Yes
@@ -34,10 +35,11 @@ PERMIT_PACKAGE = Yes
 FOX =		fox-1.6
 SUBST_VARS =	FOX
 
-WANTLIB += GL GLU X11 X11-xcb Xcursor Xdamage Xext Xfixes Xft
-WANTLIB += Xrandr Xrender Xxf86vm bz2 c drm expat fontconfig freetype
-WANTLIB += glapi jpeg m png pthread ${COMPILER_LIBCXX} tiff
-WANTLIB += xcb xcb-dri2 xcb-glx z
+WANTLIB += ${COMPILER_LIBCXX} GL GLU X11 X11-xcb Xcursor Xdamage
+WANTLIB += Xext Xfixes Xft Xrandr Xrender Xxf86vm bz2 c drm expat
+WANTLIB += fontconfig freetype glapi jpeg m png tiff xcb xcb-dri2
+WANTLIB += xcb-dri3 xcb-glx xcb-present xcb-sync xcb-xfixes xshmfence
+WANTLIB += z
 
 COMPILER =		base-clang ports-gcc base-gcc
 
Index: distinfo
===
RCS file: /cvs/ports/devel/fox/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo	22 Dec 2015 13:07:50 -	1.10
+++ distinfo	25 Jul 2019 15:50:44 -
@@ -1,2 +1,2 @@
-SHA256 (fox-1.6.50.tar.gz) = NCx1HSp+2rE2rSbLRIMynaPBbHq/Lyg/MY1mbvEtCIc=
-SIZE (fox-1.6.50.tar.gz) = 4381855
+SHA256 (fox-1.6.57.tar.gz) = Ze8V3p4POjltw22eopwVi3j61H9xhHgDV7kpyU1FiSM=
+SIZE (fox-1.6.57.tar.gz) = 4284018
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-configure	25 Jul 2019 15:50:44 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+We want to set CXXFLAGS from env.
+
+Index: configure
+--- configure.orig
 configure
+@@ -3302,8 +3302,6 @@ LT_AGE=`expr $FOX_INTERFACE_VERSION - $FOX_BINARY_VERS
+ 
+ 
+ 
+-# Prevents setting flags.
+-CXXFLAGS=""
+ 
+ # More secret source
+ DEPDIR="${am__leading_dot}deps"
Index: pkg/DESCR
===
RCS file: /cvs/ports/devel/fox/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR	13 Nov 2003 18:50:39 -	1.1.1.1
+++ pkg/DESCR	25 Jul 2019 15:50:44 -
@@ -1,2 +1,2 @@
-FOX is a graphical toolkit written in C++ that runs on Unix 
+FOX is a graphical toolkit written in C++ that runs on Unix
 and Windows and provides a look somewhat similar to Windows.