Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/fox16/Makefile,v
retrieving revision 1.29
diff -u -u -r1.29 Makefile
--- Makefile	11 Mar 2010 16:36:01 -0000	1.29
+++ Makefile	11 Mar 2010 21:49:00 -0000
@@ -7,7 +7,6 @@
 
 PORTNAME=	fox
 PORTVERSION=	${MAJORVER}.${SHVER}
-PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
@@ -19,19 +18,19 @@
 
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
+		tiff.4:${PORTSDIR}/graphics/tiff
 
 CONFLICTS=	fox-1.0.* fox-1.2.* fox-1.4.*
 
 LATEST_LINK=	fox16
 
 MAJORVER=	1.6
-SHVER=		36
+SHVER=		37
 PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 
 USE_GNOME=	lthack
 USE_GL=		yes
+USE_XORG=	xft xext xextproto xcursor xrandr
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-opengl --with-x --enable-threadsafe
@@ -42,33 +41,18 @@
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
-OPTIONS=	XFT	"Enable Xft support" on \
-		SHM	"Enable Shared Memory support" on \
-		CUPS	"Enable CUPS support" off \
+OPTIONS=	CUPS	"Enable CUPS support" off \
 		DEBUG	"Build with DEBUG support" off \
 		FOX_APPLICATIONS	"Install sample applications" off \
 		OPTIMIZED_CXXFLAGS	"Enable additional optimizations" off \
 		PROFILING	"Build with PROFILING support" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 ##
 ## Additional Options
 ##
 #
-.if defined(WITHOUT_XFT)
-CONFIGURE_ARGS+=	--with-xft=no
-.else
-CONFIGURE_ARGS+=	--with-xft=yes
-CPPFLAGS+=	`freetype-config --cflags`
-LDFLAGS+=	`freetype-config --libs`
-.endif
-#
-.if defined(WITHOUT_SHM)
-CONFIGURE_ARGS+=	--with-xshm=no
-.else
-CONFIGURE_ARGS+=	--with-xshm=yes
-.endif
 #
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
@@ -92,7 +76,10 @@
 #
 .if defined(WITH_OPTIMIZED_CXXFLAGS)
 # turn distribution-recommended optimization flags back on
-CXXFLAGS+=	-O2 -Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations
+CXXFLAGS+=	-O2 -Wuninitialized -ffast-math -finline-functions -fexpensive-optimizations
+.if !defined(WITH_PROFILING)	# Incompatible with profiling flags
+CXXFLAGS+=	-fomit-frame-pointer
+.endif
 .endif
 #
 .if defined(WITH_PROFILING)
@@ -129,4 +116,4 @@
 		${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/fox16/distinfo,v
retrieving revision 1.18
diff -u -u -r1.18 distinfo
--- distinfo	4 Apr 2009 17:26:32 -0000	1.18
+++ distinfo	11 Mar 2010 20:25:19 -0000
@@ -1,3 +1,3 @@
-MD5 (fox-1.6.36.tar.gz) = 5fdc89446185fbbf024cec44eb50a239
-SHA256 (fox-1.6.36.tar.gz) = cf8f4d09e104d6b3c425df3ce5b3bd54ed4c8095389f742f81370aba16169dff
-SIZE (fox-1.6.36.tar.gz) = 4344694
+MD5 (fox-1.6.37.tar.gz) = e499e62c3ac4ef82a032bc67fa87f9af
+SHA256 (fox-1.6.37.tar.gz) = ac991c58694c00abbc9c7098b77e8ea86998ff6c9fc5b6f2ee545421b3ab45c7
+SIZE (fox-1.6.37.tar.gz) = 4345645
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/fox16/pkg-plist,v
retrieving revision 1.5
diff -u -u -r1.5 pkg-plist
--- pkg-plist	9 Jan 2009 13:52:52 -0000	1.5
+++ pkg-plist	11 Mar 2010 21:48:49 -0000
@@ -1,5 +1,6 @@
 %%APPS%%bin/PathFinder
 %%APPS%%bin/adie
+%%APPS%%bin/Adie.stx
 %%APPS%%bin/calculator
 bin/reswrap
 bin/shutterbug
Index: games/fxsudoku/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/fxsudoku/Makefile,v
retrieving revision 1.18
diff -u -u -r1.18 Makefile
--- games/fxsudoku/Makefile	5 Feb 2010 11:37:20 -0000	1.18
+++ games/fxsudoku/Makefile	11 Mar 2010 21:18:51 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	fxsudoku
 PORTVERSION=	0.5.1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	games
 MASTER_SITES=	http://www.fifthplanet.net/files/
 
Index: x11-fm/xfe/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-fm/xfe/Makefile,v
retrieving revision 1.36
diff -u -u -r1.36 Makefile
--- x11-fm/xfe/Makefile	5 Feb 2010 11:45:51 -0000	1.36
+++ x11-fm/xfe/Makefile	11 Mar 2010 21:21:12 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfe
 PORTVERSION=	1.19.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF
 
Index: x11-toolkits/fxscintilla/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/fxscintilla/Makefile,v
retrieving revision 1.32
diff -u -u -r1.32 Makefile
--- x11-toolkits/fxscintilla/Makefile	5 Feb 2010 11:46:15 -0000	1.32
+++ x11-toolkits/fxscintilla/Makefile	11 Mar 2010 21:23:03 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	fxscintilla
 PORTVERSION=	1.71
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
Index: x11-toolkits/ruby-fox16/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/ruby-fox16/Makefile,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile
--- x11-toolkits/ruby-fox16/Makefile	5 Feb 2010 11:46:39 -0000	1.8
+++ x11-toolkits/ruby-fox16/Makefile	11 Mar 2010 21:18:23 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.6.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	RF
 MASTER_SITE_SUBDIR=	fxruby