3 files changed, 15 insertions, 10 deletions

diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile
index 4336adc6617c..ef10261e6c09 100644
--- a/x11-toolkits/fox17/Makefile
+++ b/x11-toolkits/fox17/Makefile
@@ -1,8 +1,8 @@
-# Whom: gahr
+# Created by: gahr
 # $FreeBSD$
 
 PORTNAME=	fox
-PORTVERSION=	1.7.37
+PORTVERSION=	1.7.38
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.fox-toolkit.org/pub/ \
    		ftp://ftp.fox-toolkit.org/pub/
@@ -31,7 +31,7 @@ CONFIGURE_ARGS=	--with-opengl=yes \
 		--bindir=${PREFIX}/bin/${PORTNAME}-${MAJORVER}
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		reswrap-17.1 shutterbug-17.1 adie-17.1 PathFinder-17.1 \
 		calculator-17.1 ControlPanel-17.1
@@ -70,15 +70,17 @@ BROKEN=		Does not link on powerpc
 .endif
 
 post-patch:
+# Rename man pages as in manpage.1 --> manpage-17.1 to avoid
+# conflicts with x11-toolkits/fox16
 	for f in ${MAN1}; do \
-	    old=$$(echo $$f | sed -e 's|-17||'); \
+	    old=$$(echo $$f | ${SED} -e 's|-17||'); \
 	    dir=$$(dirname $$(find ${WRKSRC} -name $$old)); \
-	    mv $$dir/$$old $$dir/$$f; \
+	    ${MV} $$dir/$$old $$dir/$$f; \
 	done
 	${FIND} ${WRKSRC} -name Makefile.am -o -name Makefile.in | ${XARGS} \
 	    ${REINPLACE_CMD} -i '' -e '${MAN_REPLACE}'
-	${REINPLACE_CMD} -e '/^Libs:/s|$$| ${PTHREAD_LIBS}|; s|"||g' ${WRKSRC}/fox17.pc.in
-.if defined(NOPORTDOCS)
+	${REINPLACE_CMD} -e '/^Libs:/s|$$| -pthread|; s|"||g' ${WRKSRC}/fox17.pc.in
+.if !${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e '/^SUBDIRS/s/ doc//' ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
 .endif
 
diff --git a/x11-toolkits/fox17/distinfo b/x11-toolkits/fox17/distinfo
index fc086eb2e062..7e72c8f4b92f 100644
--- a/x11-toolkits/fox17/distinfo
+++ b/x11-toolkits/fox17/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fox-1.7.37.tar.gz) = c3dadbaac55319da3d8ad237a7e8b4903ba91fdc45d721d815314db67d6eced1
-SIZE (fox-1.7.37.tar.gz) = 4964962
+SHA256 (fox-1.7.38.tar.gz) = 83fd1262a65096db54a82daa080d6845020480bb5c8ab63fa333a0eef8fd2bc1
+SIZE (fox-1.7.38.tar.gz) = 4979947
diff --git a/x11-toolkits/fox17/pkg-plist b/x11-toolkits/fox17/pkg-plist
index 2d197b3707bc..d5fb47f50167 100644
--- a/x11-toolkits/fox17/pkg-plist
+++ b/x11-toolkits/fox17/pkg-plist
@@ -90,7 +90,6 @@ include/fox-%%MAJORVER%%/FXComplexd.h
 include/fox-%%MAJORVER%%/FXComplexf.h
 include/fox-%%MAJORVER%%/FXComposeContext.h
 include/fox-%%MAJORVER%%/FXComposite.h
-include/fox-%%MAJORVER%%/FXConcurrent.h
 include/fox-%%MAJORVER%%/FXCondition.h
 include/fox-%%MAJORVER%%/FXConsole.h
 include/fox-%%MAJORVER%%/FXCursor.h
@@ -181,6 +180,7 @@ include/fox-%%MAJORVER%%/FXJPGImage.h
 include/fox-%%MAJORVER%%/FXKOI8RCodec.h
 include/fox-%%MAJORVER%%/FXKnob.h
 include/fox-%%MAJORVER%%/FXLabel.h
+include/fox-%%MAJORVER%%/FXLFQueue.h
 include/fox-%%MAJORVER%%/FXList.h
 include/fox-%%MAJORVER%%/FXListBox.h
 include/fox-%%MAJORVER%%/FXLocale.h
@@ -214,6 +214,7 @@ include/fox-%%MAJORVER%%/FXMutex.h
 include/fox-%%MAJORVER%%/FXObject.h
 include/fox-%%MAJORVER%%/FXObjectList.h
 include/fox-%%MAJORVER%%/FXOptionMenu.h
+include/fox-%%MAJORVER%%/FXParallel.h
 include/fox-%%MAJORVER%%/FXPCXIcon.h
 include/fox-%%MAJORVER%%/FXPCXImage.h
 include/fox-%%MAJORVER%%/FXPNGIcon.h
@@ -257,11 +258,13 @@ include/fox-%%MAJORVER%%/FXRootWindow.h
 include/fox-%%MAJORVER%%/FXRuler.h
 include/fox-%%MAJORVER%%/FXRulerView.h
 include/fox-%%MAJORVER%%/FXRunnable.h
+include/fox-%%MAJORVER%%/FXScopedThread.h
 include/fox-%%MAJORVER%%/FXScrollArea.h
 include/fox-%%MAJORVER%%/FXScrollBar.h
 include/fox-%%MAJORVER%%/FXScrollPane.h
 include/fox-%%MAJORVER%%/FXScrollWindow.h
 include/fox-%%MAJORVER%%/FXSearchDialog.h
+include/fox-%%MAJORVER%%/FXSemaQueue.h
 include/fox-%%MAJORVER%%/FXSemaphore.h
 include/fox-%%MAJORVER%%/FXSeparator.h
 include/fox-%%MAJORVER%%/FXSettings.h