Upgrade to modern version (1.1.41). The changes are extensive;

see http://www.fox-toolkit.org/news.html.

While I'm here, simplify the conflict message and pacify portlint.
PR: ports/57620.

3 files changed, 214 insertions, 201 deletions

diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile
index 7f340c461400..be4fc4e00622 100644
--- a/x11-toolkits/fox-devel/Makefile
+++ b/x11-toolkits/fox-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fox
-PORTVERSION=	1.1.25
+PORTVERSION=	1.1.41
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
 
 MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	Fast and extensive C++ GUI toolkit
+COMMENT=	Fast and extensive C++ GUI toolkit
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
@@ -141,10 +141,7 @@ pre-everything::
 ## Port conflict management
 ##
 .if exists(${LOCALBASE}/lib/libFOX-1.0.so)
-IGNORE= Conflict management: you have port fox-devel installed. The\
-       fox port is incompatible with fox-devel one. You have to\
-       uninstall fox-devel port if you really need the fox one
+IGNORE= Conflict: this port is mutually exclusive with x11-toolkits/fox
 .endif
 
 .include <bsd.port.post.mk>
-
diff --git a/x11-toolkits/fox-devel/distinfo b/x11-toolkits/fox-devel/distinfo
index ab6378cc15fe..a9bdafad3f0b 100644
--- a/x11-toolkits/fox-devel/distinfo
+++ b/x11-toolkits/fox-devel/distinfo
@@ -1 +1 @@
-MD5 (fox-1.1.25.tar.gz) = b29c938c4f210defd3d12ff5eccf50f4
+MD5 (fox-1.1.41.tar.gz) = fa8e1762201fc867451036462f43512b
diff --git a/x11-toolkits/fox-devel/pkg-plist b/x11-toolkits/fox-devel/pkg-plist
index f0290db7cfd1..8f30661fc9e4 100644
--- a/x11-toolkits/fox-devel/pkg-plist
+++ b/x11-toolkits/fox-devel/pkg-plist
@@ -2,200 +2,215 @@
 %%APPS%%bin/adie
 %%APPS%%bin/calculator
 bin/reswrap
-include/fox/FX4Splitter.h
-include/fox/FXAccelTable.h
-include/fox/FXApp.h
-include/fox/FXArray.h
-include/fox/FXArrowButton.h
-include/fox/FXBMPIcon.h
-include/fox/FXBMPImage.h
-include/fox/FXBitmap.h
-include/fox/FXButton.h
-include/fox/FXBzStream.h
-include/fox/FXCURCursor.h
-include/fox/FXCanvas.h
-include/fox/FXCharset.h
-include/fox/FXCheckButton.h
-include/fox/FXColorBar.h
-include/fox/FXColorDialog.h
-include/fox/FXColorSelector.h
-include/fox/FXColorWell.h
-include/fox/FXColorWheel.h
-include/fox/FXComboBox.h
-include/fox/FXComposite.h
-include/fox/FXCursor.h
-include/fox/FXDC.h
-include/fox/FXDCPrint.h
-include/fox/FXDCWindow.h
-include/fox/FXDHMat.h
-include/fox/FXDHVec.h
-include/fox/FXDLL.h
-include/fox/FXDQuat.h
-include/fox/FXDVec.h
-include/fox/FXDataTarget.h
-include/fox/FXDebugTarget.h
-include/fox/FXDelegator.h
-include/fox/FXDial.h
-include/fox/FXDialogBox.h
-include/fox/FXDict.h
-include/fox/FXDirBox.h
-include/fox/FXDirDialog.h
-include/fox/FXDirList.h
-include/fox/FXDirSelector.h
-include/fox/FXDocument.h
-include/fox/FXDragCorner.h
-include/fox/FXDrawable.h
-include/fox/FXDriveBox.h
-include/fox/FXElement.h
-include/fox/FXException.h
-include/fox/FXFile.h
-include/fox/FXFileDialog.h
-include/fox/FXFileDict.h
-include/fox/FXFileList.h
-include/fox/FXFileSelector.h
-include/fox/FXFont.h
-include/fox/FXFontDialog.h
-include/fox/FXFontSelector.h
-include/fox/FXFrame.h
-include/fox/FXGIFCursor.h
-include/fox/FXGIFIcon.h
-include/fox/FXGIFImage.h
-include/fox/FXGLCanvas.h
-include/fox/FXGLCone.h
-include/fox/FXGLContext.h
-include/fox/FXGLCube.h
-include/fox/FXGLCylinder.h
-include/fox/FXGLObject.h
-include/fox/FXGLShape.h
-include/fox/FXGLSphere.h
-include/fox/FXGLTriangleMesh.h
-include/fox/FXGLViewer.h
-include/fox/FXGLVisual.h
-include/fox/FXGradientBar.h
-include/fox/FXGroupBox.h
-include/fox/FXGzStream.h
-include/fox/FXHMat.h
-include/fox/FXHVec.h
-include/fox/FXHeader.h
-include/fox/FXHorizontalFrame.h
-include/fox/FXICOIcon.h
-include/fox/FXICOImage.h
-include/fox/FXIcon.h
-include/fox/FXIconList.h
-include/fox/FXId.h
-include/fox/FXImage.h
-include/fox/FXImageFrame.h
-include/fox/FXImageView.h
-include/fox/FXInputDialog.h
-include/fox/FXJPGIcon.h
-include/fox/FXJPGImage.h
-include/fox/FXLabel.h
-include/fox/FXList.h
-include/fox/FXListBox.h
-include/fox/FXMDIButton.h
-include/fox/FXMDIChild.h
-include/fox/FXMDIClient.h
-include/fox/FXMainWindow.h
-include/fox/FXMatrix.h
-include/fox/FXMenuBar.h
-include/fox/FXMenuButton.h
-include/fox/FXMenuCaption.h
-include/fox/FXMenuCascade.h
-include/fox/FXMenuCheck.h
-include/fox/FXMenuCommand.h
-include/fox/FXMenuPane.h
-include/fox/FXMenuRadio.h
-include/fox/FXMenuSeparator.h
-include/fox/FXMenuTitle.h
-include/fox/FXMessageBox.h
-include/fox/FXObject.h
-include/fox/FXObjectList.h
-include/fox/FXOptionMenu.h
-include/fox/FXPCXIcon.h
-include/fox/FXPCXImage.h
-include/fox/FXPNGIcon.h
-include/fox/FXPNGImage.h
-include/fox/FXPacker.h
-include/fox/FXPicker.h
-include/fox/FXPoint.h
-include/fox/FXPopup.h
-include/fox/FXPrintDialog.h
-include/fox/FXProgressBar.h
-include/fox/FXProgressDialog.h
-include/fox/FXQuat.h
-include/fox/FXRGBIcon.h
-include/fox/FXRGBImage.h
-include/fox/FXRadioButton.h
-include/fox/FXRange.h
-include/fox/FXRecentFiles.h
-include/fox/FXRectangle.h
-include/fox/FXRegion.h
-include/fox/FXRegistry.h
-include/fox/FXReplaceDialog.h
-include/fox/FXRex.h
-include/fox/FXRootWindow.h
-include/fox/FXRuler.h
-include/fox/FXScrollArea.h
-include/fox/FXScrollBar.h
-include/fox/FXScrollWindow.h
-include/fox/FXSearchDialog.h
-include/fox/FXSeparator.h
-include/fox/FXSettings.h
-include/fox/FXShell.h
-include/fox/FXShutter.h
-include/fox/FXSize.h
-include/fox/FXSlider.h
-include/fox/FXSpinner.h
-include/fox/FXSplitter.h
-include/fox/FXStatusBar.h
-include/fox/FXStatusLine.h
-include/fox/FXStream.h
-include/fox/FXString.h
-include/fox/FXStringDict.h
-include/fox/FXSwitcher.h
-include/fox/FXTGAIcon.h
-include/fox/FXTGAImage.h
-include/fox/FXTIFIcon.h
-include/fox/FXTIFImage.h
-include/fox/FXTabBar.h
-include/fox/FXTabBook.h
-include/fox/FXTabItem.h
-include/fox/FXTable.h
-include/fox/FXText.h
-include/fox/FXTextCodec.h
-include/fox/FXTextField.h
-include/fox/FXToggleButton.h
-include/fox/FXToolBar.h
-include/fox/FXToolBarGrip.h
-include/fox/FXToolBarShell.h
-include/fox/FXToolBarTab.h
-include/fox/FXToolTip.h
-include/fox/FXTopWindow.h
-include/fox/FXTreeList.h
-include/fox/FXTreeListBox.h
-include/fox/FXTriStateButton.h
-include/fox/FXURL.h
-include/fox/FXUTF8Codec.h
-include/fox/FXUndoList.h
-include/fox/FXVec.h
-include/fox/FXVerticalFrame.h
-include/fox/FXVisual.h
-include/fox/FXWString.h
-include/fox/FXWindow.h
-include/fox/FXWizard.h
-include/fox/FXXPMIcon.h
-include/fox/FXXPMImage.h
-include/fox/fx.h
-include/fox/fx3d.h
-include/fox/fxdefs.h
-include/fox/fxkeys.h
-include/fox/fxver.h
-include/fox/xincs.h
+include/fox-1.1/FX4Splitter.h
+include/fox-1.1/FXAccelTable.h
+include/fox-1.1/FXApp.h
+include/fox-1.1/FXArray.h
+include/fox-1.1/FXArrowButton.h
+include/fox-1.1/FXBMPIcon.h
+include/fox-1.1/FXBMPImage.h
+include/fox-1.1/FXBitmap.h
+include/fox-1.1/FXButton.h
+include/fox-1.1/FXBZStream.h
+include/fox-1.1/FXCURCursor.h
+include/fox-1.1/FXCanvas.h
+include/fox-1.1/FXCharset.h
+include/fox-1.1/FXCheckButton.h
+include/fox-1.1/FXColorBar.h
+include/fox-1.1/FXColorDialog.h
+include/fox-1.1/FXColorSelector.h
+include/fox-1.1/FXColorWell.h
+include/fox-1.1/FXColorWheel.h
+include/fox-1.1/FXComboBox.h
+include/fox-1.1/FXComposite.h
+include/fox-1.1/FXCursor.h
+include/fox-1.1/FXDC.h
+include/fox-1.1/FXDCPrint.h
+include/fox-1.1/FXDCWindow.h
+include/fox-1.1/FXDLL.h
+include/fox-1.1/FXDataTarget.h
+include/fox-1.1/FXDebugTarget.h
+include/fox-1.1/FXDelegator.h
+include/fox-1.1/FXDial.h
+include/fox-1.1/FXDialogBox.h
+include/fox-1.1/FXDict.h
+include/fox-1.1/FXDirBox.h
+include/fox-1.1/FXDirDialog.h
+include/fox-1.1/FXDirList.h
+include/fox-1.1/FXDirSelector.h
+include/fox-1.1/FXDocument.h
+include/fox-1.1/FXDragCorner.h
+include/fox-1.1/FXDrawable.h
+include/fox-1.1/FXDriveBox.h
+include/fox-1.1/FXElement.h
+include/fox-1.1/FXException.h
+include/fox-1.1/FXFile.h
+include/fox-1.1/FXFileDialog.h
+include/fox-1.1/FXFileDict.h
+include/fox-1.1/FXFileList.h
+include/fox-1.1/FXFileSelector.h
+include/fox-1.1/FXFileStream.h
+include/fox-1.1/FXFoldingList.h
+include/fox-1.1/FXFont.h
+include/fox-1.1/FXFontDialog.h
+include/fox-1.1/FXFontSelector.h
+include/fox-1.1/FXFrame.h
+include/fox-1.1/FXGIFCursor.h
+include/fox-1.1/FXGIFIcon.h
+include/fox-1.1/FXGIFImage.h
+include/fox-1.1/FXGLCanvas.h
+include/fox-1.1/FXGLCone.h
+include/fox-1.1/FXGLContext.h
+include/fox-1.1/FXGLCube.h
+include/fox-1.1/FXGLCylinder.h
+include/fox-1.1/FXGLObject.h
+include/fox-1.1/FXGLShape.h
+include/fox-1.1/FXGLSphere.h
+include/fox-1.1/FXGLTriangleMesh.h
+include/fox-1.1/FXGLViewer.h
+include/fox-1.1/FXGLVisual.h
+include/fox-1.1/FXGradientBar.h
+include/fox-1.1/FXGroupBox.h
+include/fox-1.1/FXGZStream.h
+include/fox-1.1/FXHash.h
+include/fox-1.1/FXHeader.h
+include/fox-1.1/FXHorizontalFrame.h
+include/fox-1.1/FXICOIcon.h
+include/fox-1.1/FXICOImage.h
+include/fox-1.1/FXIcon.h
+include/fox-1.1/FXIconList.h
+include/fox-1.1/FXId.h
+include/fox-1.1/FXImage.h
+include/fox-1.1/FXImageFrame.h
+include/fox-1.1/FXImageView.h
+include/fox-1.1/FXInputDialog.h
+include/fox-1.1/FXJPGIcon.h
+include/fox-1.1/FXJPGImage.h
+include/fox-1.1/FXLabel.h
+include/fox-1.1/FXList.h
+include/fox-1.1/FXListBox.h
+include/fox-1.1/FXMat3d.h
+include/fox-1.1/FXMat3f.h
+include/fox-1.1/FXMat4d.h
+include/fox-1.1/FXMat4f.h
+include/fox-1.1/FXMDIButton.h
+include/fox-1.1/FXMDIChild.h
+include/fox-1.1/FXMDIClient.h
+include/fox-1.1/FXMainWindow.h
+include/fox-1.1/FXMatrix.h
+include/fox-1.1/FXMemoryStream.h
+include/fox-1.1/FXMenuBar.h
+include/fox-1.1/FXMenuButton.h
+include/fox-1.1/FXMenuCaption.h
+include/fox-1.1/FXMenuCascade.h
+include/fox-1.1/FXMenuCheck.h
+include/fox-1.1/FXMenuCommand.h
+include/fox-1.1/FXMenuPane.h
+include/fox-1.1/FXMenuRadio.h
+include/fox-1.1/FXMenuSeparator.h
+include/fox-1.1/FXMenuTitle.h
+include/fox-1.1/FXMessageBox.h
+include/fox-1.1/FXObject.h
+include/fox-1.1/FXObjectList.h
+include/fox-1.1/FXOptionMenu.h
+include/fox-1.1/FXPCXIcon.h
+include/fox-1.1/FXPCXImage.h
+include/fox-1.1/FXPNGIcon.h
+include/fox-1.1/FXPNGImage.h
+include/fox-1.1/FXPPMIcon.h
+include/fox-1.1/FXPPMImage.h
+include/fox-1.1/FXPacker.h
+include/fox-1.1/FXPicker.h
+include/fox-1.1/FXPoint.h
+include/fox-1.1/FXPopup.h
+include/fox-1.1/FXPrintDialog.h
+include/fox-1.1/FXProgressBar.h
+include/fox-1.1/FXProgressDialog.h
+include/fox-1.1/FXQuatd.h
+include/fox-1.1/FXQuatf.h
+include/fox-1.1/FXRGBIcon.h
+include/fox-1.1/FXRGBImage.h
+include/fox-1.1/FXRadioButton.h
+include/fox-1.1/FXRange.h
+include/fox-1.1/FXRealSpinner.h
+include/fox-1.1/FXRecentFiles.h
+include/fox-1.1/FXRectangle.h
+include/fox-1.1/FXRegion.h
+include/fox-1.1/FXRegistry.h
+include/fox-1.1/FXReplaceDialog.h
+include/fox-1.1/FXRex.h
+include/fox-1.1/FXRootWindow.h
+include/fox-1.1/FXRuler.h
+include/fox-1.1/FXScrollArea.h
+include/fox-1.1/FXScrollBar.h
+include/fox-1.1/FXScrollWindow.h
+include/fox-1.1/FXSearchDialog.h
+include/fox-1.1/FXSeparator.h
+include/fox-1.1/FXSettings.h
+include/fox-1.1/FXShell.h
+include/fox-1.1/FXShutter.h
+include/fox-1.1/FXSize.h
+include/fox-1.1/FXSlider.h
+include/fox-1.1/FXSpinner.h
+include/fox-1.1/FXSplitter.h
+include/fox-1.1/FXStatusBar.h
+include/fox-1.1/FXStatusLine.h
+include/fox-1.1/FXStream.h
+include/fox-1.1/FXString.h
+include/fox-1.1/FXStringDict.h
+include/fox-1.1/FXSwitcher.h
+include/fox-1.1/FXTGAIcon.h
+include/fox-1.1/FXTGAImage.h
+include/fox-1.1/FXTIFIcon.h
+include/fox-1.1/FXTIFImage.h
+include/fox-1.1/FXTabBar.h
+include/fox-1.1/FXTabBook.h
+include/fox-1.1/FXTabItem.h
+include/fox-1.1/FXTable.h
+include/fox-1.1/FXText.h
+include/fox-1.1/FXTextCodec.h
+include/fox-1.1/FXTextField.h
+include/fox-1.1/FXToggleButton.h
+include/fox-1.1/FXToolBar.h
+include/fox-1.1/FXToolBarGrip.h
+include/fox-1.1/FXToolBarShell.h
+include/fox-1.1/FXToolBarTab.h
+include/fox-1.1/FXToolTip.h
+include/fox-1.1/FXTopWindow.h
+include/fox-1.1/FXTreeList.h
+include/fox-1.1/FXTreeListBox.h
+include/fox-1.1/FXTriStateButton.h
+include/fox-1.1/FXURL.h
+include/fox-1.1/FXUTF16Codec.h
+include/fox-1.1/FXUTF32Codec.h
+include/fox-1.1/FXUTF8Codec.h
+include/fox-1.1/FXUndoList.h
+include/fox-1.1/FXVec2d.h
+include/fox-1.1/FXVec2f.h
+include/fox-1.1/FXVec3d.h
+include/fox-1.1/FXVec3f.h
+include/fox-1.1/FXVec4d.h
+include/fox-1.1/FXVec4f.h
+include/fox-1.1/FXVerticalFrame.h
+include/fox-1.1/FXVisual.h
+include/fox-1.1/FXWString.h
+include/fox-1.1/FXWindow.h
+include/fox-1.1/FXWizard.h
+include/fox-1.1/FXXBMIcon.h
+include/fox-1.1/FXXBMImage.h
+include/fox-1.1/FXXPMIcon.h
+include/fox-1.1/FXXPMImage.h
+include/fox-1.1/fx.h
+include/fox-1.1/fx3d.h
+include/fox-1.1/fxdefs.h
+include/fox-1.1/fxkeys.h
+include/fox-1.1/fxver.h
+include/fox-1.1/xincs.h
+include/fox-1.1/chart/FXChart.h
+lib/libFOX-1.1.a
+lib/libFOX-1.1.la
 lib/libFOX-1.1.so
-lib/libFOX-1.1.so.25
-lib/libFOX.a
-lib/libFOX.la
-lib/libFOX.so
+lib/libFOX-1.1.so.41
 %%PORTDOCS%%share/doc/fox/html/SbSScreen1.jpg
 %%PORTDOCS%%share/doc/fox/html/SbSScreen1_small.jpg
 %%PORTDOCS%%share/doc/fox/html/adie.html
@@ -315,4 +330,5 @@ lib/libFOX.so
 %%PORTDOCS%%share/doc/fox/html/xml.html
 %%PORTDOCS%%@dirrm share/doc/fox/html
 %%PORTDOCS%%@dirrm share/doc/fox
-@dirrm include/fox
+@dirrm include/fox-1.1/chart
+@dirrm include/fox-1.1