Update to 1.6.25 (latest stable version).

Too many changes to list here, please see http://www.fox-toolkit.org/
for full changes.

5 files changed, 450 insertions, 438 deletions

diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index 3d7f799c6eb..7ab6edcc7cf 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2007/01/11 16:53:18 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2007/04/13 05:45:35 xtraeme Exp $
 
-DISTNAME=	fox-1.4.34
+DISTNAME=	fox-1.6.25
 CATEGORIES=	x11
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/
 
diff --git a/x11/fox/PLIST b/x11/fox/PLIST
index d7701a3584c..76642127101 100644
--- a/x11/fox/PLIST
+++ b/x11/fox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/07/25 10:53:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/04/13 05:45:36 xtraeme Exp $
 bin/Adie.stx
 bin/PathFinder
 bin/adie
@@ -6,383 +6,444 @@ bin/calculator
 bin/fox-config
 bin/reswrap
 bin/shutterbug
-include/fox-1.4/FX4Splitter.h
-include/fox-1.4/FX7Segment.h
-include/fox-1.4/FXAccelTable.h
-include/fox-1.4/FXApp.h
-include/fox-1.4/FXArray.h
-include/fox-1.4/FXArrowButton.h
-include/fox-1.4/FXBMPIcon.h
-include/fox-1.4/FXBMPImage.h
-include/fox-1.4/FXBZStream.h
-include/fox-1.4/FXBitmap.h
-include/fox-1.4/FXBitmapFrame.h
-include/fox-1.4/FXBitmapView.h
-include/fox-1.4/FXButton.h
-include/fox-1.4/FXCURCursor.h
-include/fox-1.4/FXCanvas.h
-include/fox-1.4/FXCheckButton.h
-include/fox-1.4/FXChoiceBox.h
-include/fox-1.4/FXColorBar.h
-include/fox-1.4/FXColorDialog.h
-include/fox-1.4/FXColorSelector.h
-include/fox-1.4/FXColorWell.h
-include/fox-1.4/FXColorWheel.h
-include/fox-1.4/FXComboBox.h
-include/fox-1.4/FXComposite.h
-include/fox-1.4/FXCursor.h
-include/fox-1.4/FXDC.h
-include/fox-1.4/FXDCPrint.h
-include/fox-1.4/FXDCWindow.h
-include/fox-1.4/FXDLL.h
-include/fox-1.4/FXDataTarget.h
-include/fox-1.4/FXDebugTarget.h
-include/fox-1.4/FXDelegator.h
-include/fox-1.4/FXDial.h
-include/fox-1.4/FXDialogBox.h
-include/fox-1.4/FXDict.h
-include/fox-1.4/FXDirBox.h
-include/fox-1.4/FXDirDialog.h
-include/fox-1.4/FXDirList.h
-include/fox-1.4/FXDirSelector.h
-include/fox-1.4/FXDockBar.h
-include/fox-1.4/FXDockHandler.h
-include/fox-1.4/FXDockSite.h
-include/fox-1.4/FXDockTitle.h
-include/fox-1.4/FXDocument.h
-include/fox-1.4/FXDragCorner.h
-include/fox-1.4/FXDrawable.h
-include/fox-1.4/FXDriveBox.h
-include/fox-1.4/FXElement.h
-include/fox-1.4/FXException.h
-include/fox-1.4/FXFile.h
-include/fox-1.4/FXFileDialog.h
-include/fox-1.4/FXFileDict.h
-include/fox-1.4/FXFileList.h
-include/fox-1.4/FXFileSelector.h
-include/fox-1.4/FXFileStream.h
-include/fox-1.4/FXFoldingList.h
-include/fox-1.4/FXFont.h
-include/fox-1.4/FXFontDialog.h
-include/fox-1.4/FXFontSelector.h
-include/fox-1.4/FXFrame.h
-include/fox-1.4/FXGIFCursor.h
-include/fox-1.4/FXGIFIcon.h
-include/fox-1.4/FXGIFImage.h
-include/fox-1.4/FXGLCanvas.h
-include/fox-1.4/FXGLCone.h
-include/fox-1.4/FXGLContext.h
-include/fox-1.4/FXGLCube.h
-include/fox-1.4/FXGLCylinder.h
-include/fox-1.4/FXGLObject.h
-include/fox-1.4/FXGLShape.h
-include/fox-1.4/FXGLSphere.h
-include/fox-1.4/FXGLTriangleMesh.h
-include/fox-1.4/FXGLViewer.h
-include/fox-1.4/FXGLVisual.h
-include/fox-1.4/FXGUISignal.h
-include/fox-1.4/FXGZStream.h
-include/fox-1.4/FXGradientBar.h
-include/fox-1.4/FXGroupBox.h
-include/fox-1.4/FXHash.h
-include/fox-1.4/FXHeader.h
-include/fox-1.4/FXHorizontalFrame.h
-include/fox-1.4/FXICOIcon.h
-include/fox-1.4/FXICOImage.h
-include/fox-1.4/FXIFFIcon.h
-include/fox-1.4/FXIFFImage.h
-include/fox-1.4/FXIcon.h
-include/fox-1.4/FXIconDict.h
-include/fox-1.4/FXIconList.h
-include/fox-1.4/FXIconSource.h
-include/fox-1.4/FXId.h
-include/fox-1.4/FXImage.h
-include/fox-1.4/FXImageFrame.h
-include/fox-1.4/FXImageView.h
-include/fox-1.4/FXInputDialog.h
-include/fox-1.4/FXJPGIcon.h
-include/fox-1.4/FXJPGImage.h
-include/fox-1.4/FXLabel.h
-include/fox-1.4/FXList.h
-include/fox-1.4/FXListBox.h
-include/fox-1.4/FXMDIButton.h
-include/fox-1.4/FXMDIChild.h
-include/fox-1.4/FXMDIClient.h
-include/fox-1.4/FXMainWindow.h
-include/fox-1.4/FXMat3d.h
-include/fox-1.4/FXMat3f.h
-include/fox-1.4/FXMat4d.h
-include/fox-1.4/FXMat4f.h
-include/fox-1.4/FXMatrix.h
-include/fox-1.4/FXMemMap.h
-include/fox-1.4/FXMemoryStream.h
-include/fox-1.4/FXMenuBar.h
-include/fox-1.4/FXMenuButton.h
-include/fox-1.4/FXMenuCaption.h
-include/fox-1.4/FXMenuCascade.h
-include/fox-1.4/FXMenuCheck.h
-include/fox-1.4/FXMenuCommand.h
-include/fox-1.4/FXMenuPane.h
-include/fox-1.4/FXMenuRadio.h
-include/fox-1.4/FXMenuSeparator.h
-include/fox-1.4/FXMenuTitle.h
-include/fox-1.4/FXMessageBox.h
-include/fox-1.4/FXObject.h
-include/fox-1.4/FXObjectList.h
-include/fox-1.4/FXOptionMenu.h
-include/fox-1.4/FXPCXIcon.h
-include/fox-1.4/FXPCXImage.h
-include/fox-1.4/FXPNGIcon.h
-include/fox-1.4/FXPNGImage.h
-include/fox-1.4/FXPPMIcon.h
-include/fox-1.4/FXPPMImage.h
-include/fox-1.4/FXPacker.h
-include/fox-1.4/FXPicker.h
-include/fox-1.4/FXPoint.h
-include/fox-1.4/FXPopup.h
-include/fox-1.4/FXPrintDialog.h
-include/fox-1.4/FXProgressBar.h
-include/fox-1.4/FXProgressDialog.h
-include/fox-1.4/FXQuatd.h
-include/fox-1.4/FXQuatf.h
-include/fox-1.4/FXRASIcon.h
-include/fox-1.4/FXRASImage.h
-include/fox-1.4/FXRGBIcon.h
-include/fox-1.4/FXRGBImage.h
-include/fox-1.4/FXRadioButton.h
-include/fox-1.4/FXRanged.h
-include/fox-1.4/FXRangef.h
-include/fox-1.4/FXRealSlider.h
-include/fox-1.4/FXRealSpinner.h
-include/fox-1.4/FXRecentFiles.h
-include/fox-1.4/FXRectangle.h
-include/fox-1.4/FXRegion.h
-include/fox-1.4/FXRegistry.h
-include/fox-1.4/FXReplaceDialog.h
-include/fox-1.4/FXRex.h
-include/fox-1.4/FXRootWindow.h
-include/fox-1.4/FXRuler.h
-include/fox-1.4/FXScrollArea.h
-include/fox-1.4/FXScrollBar.h
-include/fox-1.4/FXScrollPane.h
-include/fox-1.4/FXScrollWindow.h
-include/fox-1.4/FXSearchDialog.h
-include/fox-1.4/FXSeparator.h
-include/fox-1.4/FXSettings.h
-include/fox-1.4/FXShell.h
-include/fox-1.4/FXShutter.h
-include/fox-1.4/FXSize.h
-include/fox-1.4/FXSlider.h
-include/fox-1.4/FXSphered.h
-include/fox-1.4/FXSpheref.h
-include/fox-1.4/FXSpinner.h
-include/fox-1.4/FXSplashWindow.h
-include/fox-1.4/FXSplitter.h
-include/fox-1.4/FXSpring.h
-include/fox-1.4/FXStatusBar.h
-include/fox-1.4/FXStatusLine.h
-include/fox-1.4/FXStream.h
-include/fox-1.4/FXString.h
-include/fox-1.4/FXStringDict.h
-include/fox-1.4/FXSwitcher.h
-include/fox-1.4/FXTGAIcon.h
-include/fox-1.4/FXTGAImage.h
-include/fox-1.4/FXTIFIcon.h
-include/fox-1.4/FXTIFImage.h
-include/fox-1.4/FXTabBar.h
-include/fox-1.4/FXTabBook.h
-include/fox-1.4/FXTabItem.h
-include/fox-1.4/FXTable.h
-include/fox-1.4/FXText.h
-include/fox-1.4/FXTextCodec.h
-include/fox-1.4/FXTextField.h
-include/fox-1.4/FXThread.h
-include/fox-1.4/FXToggleButton.h
-include/fox-1.4/FXToolBar.h
-include/fox-1.4/FXToolBarGrip.h
-include/fox-1.4/FXToolBarShell.h
-include/fox-1.4/FXToolBarTab.h
-include/fox-1.4/FXToolTip.h
-include/fox-1.4/FXTopWindow.h
-include/fox-1.4/FXTreeList.h
-include/fox-1.4/FXTreeListBox.h
-include/fox-1.4/FXTriStateButton.h
-include/fox-1.4/FXURL.h
-include/fox-1.4/FXUTF16Codec.h
-include/fox-1.4/FXUTF32Codec.h
-include/fox-1.4/FXUTF8Codec.h
-include/fox-1.4/FXUndoList.h
-include/fox-1.4/FXVec2d.h
-include/fox-1.4/FXVec2f.h
-include/fox-1.4/FXVec3d.h
-include/fox-1.4/FXVec3f.h
-include/fox-1.4/FXVec4d.h
-include/fox-1.4/FXVec4f.h
-include/fox-1.4/FXVerticalFrame.h
-include/fox-1.4/FXVisual.h
-include/fox-1.4/FXWindow.h
-include/fox-1.4/FXWizard.h
-include/fox-1.4/FXXBMIcon.h
-include/fox-1.4/FXXBMImage.h
-include/fox-1.4/FXXPMIcon.h
-include/fox-1.4/FXXPMImage.h
-include/fox-1.4/chart/FXChart.h
-include/fox-1.4/fx.h
-include/fox-1.4/fx3d.h
-include/fox-1.4/fxdefs.h
-include/fox-1.4/fxkeys.h
-include/fox-1.4/fxver.h
-include/fox-1.4/xincs.h
-lib/libCHART-1.4.la
-lib/libFOX-1.4.la
-man/man1/PathFinder.1.gz
-man/man1/adie.1.gz
-man/man1/calculator.1.gz
-man/man1/reswrap.1.gz
+include/fox-1.6/FX4Splitter.h
+include/fox-1.6/FX7Segment.h
+include/fox-1.6/FX885910Codec.h
+include/fox-1.6/FX885911Codec.h
+include/fox-1.6/FX885913Codec.h
+include/fox-1.6/FX885914Codec.h
+include/fox-1.6/FX885915Codec.h
+include/fox-1.6/FX885916Codec.h
+include/fox-1.6/FX88591Codec.h
+include/fox-1.6/FX88592Codec.h
+include/fox-1.6/FX88593Codec.h
+include/fox-1.6/FX88594Codec.h
+include/fox-1.6/FX88595Codec.h
+include/fox-1.6/FX88596Codec.h
+include/fox-1.6/FX88597Codec.h
+include/fox-1.6/FX88598Codec.h
+include/fox-1.6/FX88599Codec.h
+include/fox-1.6/FXAccelTable.h
+include/fox-1.6/FXApp.h
+include/fox-1.6/FXArray.h
+include/fox-1.6/FXArrowButton.h
+include/fox-1.6/FXBMPIcon.h
+include/fox-1.6/FXBMPImage.h
+include/fox-1.6/FXBZFileStream.h
+include/fox-1.6/FXBitmap.h
+include/fox-1.6/FXBitmapFrame.h
+include/fox-1.6/FXBitmapView.h
+include/fox-1.6/FXButton.h
+include/fox-1.6/FXCP1250Codec.h
+include/fox-1.6/FXCP1251Codec.h
+include/fox-1.6/FXCP1252Codec.h
+include/fox-1.6/FXCP1253Codec.h
+include/fox-1.6/FXCP1254Codec.h
+include/fox-1.6/FXCP1255Codec.h
+include/fox-1.6/FXCP1256Codec.h
+include/fox-1.6/FXCP1257Codec.h
+include/fox-1.6/FXCP1258Codec.h
+include/fox-1.6/FXCP437Codec.h
+include/fox-1.6/FXCP850Codec.h
+include/fox-1.6/FXCP852Codec.h
+include/fox-1.6/FXCP855Codec.h
+include/fox-1.6/FXCP856Codec.h
+include/fox-1.6/FXCP857Codec.h
+include/fox-1.6/FXCP860Codec.h
+include/fox-1.6/FXCP861Codec.h
+include/fox-1.6/FXCP862Codec.h
+include/fox-1.6/FXCP863Codec.h
+include/fox-1.6/FXCP864Codec.h
+include/fox-1.6/FXCP865Codec.h
+include/fox-1.6/FXCP866Codec.h
+include/fox-1.6/FXCP869Codec.h
+include/fox-1.6/FXCP874Codec.h
+include/fox-1.6/FXCURCursor.h
+include/fox-1.6/FXCanvas.h
+include/fox-1.6/FXCheckButton.h
+include/fox-1.6/FXChoiceBox.h
+include/fox-1.6/FXColorBar.h
+include/fox-1.6/FXColorDialog.h
+include/fox-1.6/FXColorList.h
+include/fox-1.6/FXColorRing.h
+include/fox-1.6/FXColorSelector.h
+include/fox-1.6/FXColorWell.h
+include/fox-1.6/FXColorWheel.h
+include/fox-1.6/FXComboBox.h
+include/fox-1.6/FXComposeContext.h
+include/fox-1.6/FXComposite.h
+include/fox-1.6/FXCursor.h
+include/fox-1.6/FXDC.h
+include/fox-1.6/FXDCPrint.h
+include/fox-1.6/FXDCWindow.h
+include/fox-1.6/FXDLL.h
+include/fox-1.6/FXDataTarget.h
+include/fox-1.6/FXDate.h
+include/fox-1.6/FXDebugTarget.h
+include/fox-1.6/FXDelegator.h
+include/fox-1.6/FXDial.h
+include/fox-1.6/FXDialogBox.h
+include/fox-1.6/FXDict.h
+include/fox-1.6/FXDir.h
+include/fox-1.6/FXDirBox.h
+include/fox-1.6/FXDirDialog.h
+include/fox-1.6/FXDirList.h
+include/fox-1.6/FXDirSelector.h
+include/fox-1.6/FXDockBar.h
+include/fox-1.6/FXDockHandler.h
+include/fox-1.6/FXDockSite.h
+include/fox-1.6/FXDockTitle.h
+include/fox-1.6/FXDocument.h
+include/fox-1.6/FXDragCorner.h
+include/fox-1.6/FXDrawable.h
+include/fox-1.6/FXDriveBox.h
+include/fox-1.6/FXElement.h
+include/fox-1.6/FXException.h
+include/fox-1.6/FXExpression.h
+include/fox-1.6/FXExtentd.h
+include/fox-1.6/FXExtentf.h
+include/fox-1.6/FXFile.h
+include/fox-1.6/FXFileDialog.h
+include/fox-1.6/FXFileDict.h
+include/fox-1.6/FXFileList.h
+include/fox-1.6/FXFileSelector.h
+include/fox-1.6/FXFileStream.h
+include/fox-1.6/FXFoldingList.h
+include/fox-1.6/FXFont.h
+include/fox-1.6/FXFontDialog.h
+include/fox-1.6/FXFontSelector.h
+include/fox-1.6/FXFrame.h
+include/fox-1.6/FXGIFCursor.h
+include/fox-1.6/FXGIFIcon.h
+include/fox-1.6/FXGIFImage.h
+include/fox-1.6/FXGLCanvas.h
+include/fox-1.6/FXGLCone.h
+include/fox-1.6/FXGLContext.h
+include/fox-1.6/FXGLCube.h
+include/fox-1.6/FXGLCylinder.h
+include/fox-1.6/FXGLObject.h
+include/fox-1.6/FXGLShape.h
+include/fox-1.6/FXGLSphere.h
+include/fox-1.6/FXGLTriangleMesh.h
+include/fox-1.6/FXGLViewer.h
+include/fox-1.6/FXGLVisual.h
+include/fox-1.6/FXGUISignal.h
+include/fox-1.6/FXGZFileStream.h
+include/fox-1.6/FXGradientBar.h
+include/fox-1.6/FXGroupBox.h
+include/fox-1.6/FXHash.h
+include/fox-1.6/FXHeader.h
+include/fox-1.6/FXHorizontalFrame.h
+include/fox-1.6/FXICOIcon.h
+include/fox-1.6/FXICOImage.h
+include/fox-1.6/FXIFFIcon.h
+include/fox-1.6/FXIFFImage.h
+include/fox-1.6/FXIO.h
+include/fox-1.6/FXIcon.h
+include/fox-1.6/FXIconDict.h
+include/fox-1.6/FXIconList.h
+include/fox-1.6/FXIconSource.h
+include/fox-1.6/FXId.h
+include/fox-1.6/FXImage.h
+include/fox-1.6/FXImageFrame.h
+include/fox-1.6/FXImageView.h
+include/fox-1.6/FXInputDialog.h
+include/fox-1.6/FXJPGIcon.h
+include/fox-1.6/FXJPGImage.h
+include/fox-1.6/FXKOI8RCodec.h
+include/fox-1.6/FXKnob.h
+include/fox-1.6/FXLabel.h
+include/fox-1.6/FXList.h
+include/fox-1.6/FXListBox.h
+include/fox-1.6/FXMDIButton.h
+include/fox-1.6/FXMDIChild.h
+include/fox-1.6/FXMDIClient.h
+include/fox-1.6/FXMainWindow.h
+include/fox-1.6/FXMat3d.h
+include/fox-1.6/FXMat3f.h
+include/fox-1.6/FXMat4d.h
+include/fox-1.6/FXMat4f.h
+include/fox-1.6/FXMatrix.h
+include/fox-1.6/FXMemMap.h
+include/fox-1.6/FXMemoryStream.h
+include/fox-1.6/FXMenuBar.h
+include/fox-1.6/FXMenuButton.h
+include/fox-1.6/FXMenuCaption.h
+include/fox-1.6/FXMenuCascade.h
+include/fox-1.6/FXMenuCheck.h
+include/fox-1.6/FXMenuCommand.h
+include/fox-1.6/FXMenuPane.h
+include/fox-1.6/FXMenuRadio.h
+include/fox-1.6/FXMenuSeparator.h
+include/fox-1.6/FXMenuTitle.h
+include/fox-1.6/FXMessageBox.h
+include/fox-1.6/FXObject.h
+include/fox-1.6/FXObjectList.h
+include/fox-1.6/FXOptionMenu.h
+include/fox-1.6/FXPCXIcon.h
+include/fox-1.6/FXPCXImage.h
+include/fox-1.6/FXPNGIcon.h
+include/fox-1.6/FXPNGImage.h
+include/fox-1.6/FXPPMIcon.h
+include/fox-1.6/FXPPMImage.h
+include/fox-1.6/FXPacker.h
+include/fox-1.6/FXPath.h
+include/fox-1.6/FXPicker.h
+include/fox-1.6/FXPipe.h
+include/fox-1.6/FXPoint.h
+include/fox-1.6/FXPopup.h
+include/fox-1.6/FXPrintDialog.h
+include/fox-1.6/FXProgressBar.h
+include/fox-1.6/FXProgressDialog.h
+include/fox-1.6/FXQuatd.h
+include/fox-1.6/FXQuatf.h
+include/fox-1.6/FXRASIcon.h
+include/fox-1.6/FXRASImage.h
+include/fox-1.6/FXRGBIcon.h
+include/fox-1.6/FXRGBImage.h
+include/fox-1.6/FXRadioButton.h
+include/fox-1.6/FXRanged.h
+include/fox-1.6/FXRangef.h
+include/fox-1.6/FXRealSlider.h
+include/fox-1.6/FXRealSpinner.h
+include/fox-1.6/FXRecentFiles.h
+include/fox-1.6/FXRectangle.h
+include/fox-1.6/FXRegion.h
+include/fox-1.6/FXRegistry.h
+include/fox-1.6/FXReplaceDialog.h
+include/fox-1.6/FXRex.h
+include/fox-1.6/FXRootWindow.h
+include/fox-1.6/FXRuler.h
+include/fox-1.6/FXRulerView.h
+include/fox-1.6/FXScrollArea.h
+include/fox-1.6/FXScrollBar.h
+include/fox-1.6/FXScrollPane.h
+include/fox-1.6/FXScrollWindow.h
+include/fox-1.6/FXSearchDialog.h
+include/fox-1.6/FXSeparator.h
+include/fox-1.6/FXSettings.h
+include/fox-1.6/FXShell.h
+include/fox-1.6/FXShutter.h
+include/fox-1.6/FXSize.h
+include/fox-1.6/FXSlider.h
+include/fox-1.6/FXSocket.h
+include/fox-1.6/FXSphered.h
+include/fox-1.6/FXSpheref.h
+include/fox-1.6/FXSpinner.h
+include/fox-1.6/FXSplashWindow.h
+include/fox-1.6/FXSplitter.h
+include/fox-1.6/FXSpring.h
+include/fox-1.6/FXStat.h
+include/fox-1.6/FXStatusBar.h
+include/fox-1.6/FXStatusLine.h
+include/fox-1.6/FXStream.h
+include/fox-1.6/FXString.h
+include/fox-1.6/FXStringDict.h
+include/fox-1.6/FXSwitcher.h
+include/fox-1.6/FXSystem.h
+include/fox-1.6/FXTGAIcon.h
+include/fox-1.6/FXTGAImage.h
+include/fox-1.6/FXTIFIcon.h
+include/fox-1.6/FXTIFImage.h
+include/fox-1.6/FXTabBar.h
+include/fox-1.6/FXTabBook.h
+include/fox-1.6/FXTabItem.h
+include/fox-1.6/FXTable.h
+include/fox-1.6/FXText.h
+include/fox-1.6/FXTextCodec.h
+include/fox-1.6/FXTextField.h
+include/fox-1.6/FXThread.h
+include/fox-1.6/FXToggleButton.h
+include/fox-1.6/FXToolBar.h
+include/fox-1.6/FXToolBarGrip.h
+include/fox-1.6/FXToolBarShell.h
+include/fox-1.6/FXToolBarTab.h
+include/fox-1.6/FXToolTip.h
+include/fox-1.6/FXTopWindow.h
+include/fox-1.6/FXTranslator.h
+include/fox-1.6/FXTreeList.h
+include/fox-1.6/FXTreeListBox.h
+include/fox-1.6/FXTriStateButton.h
+include/fox-1.6/FXURL.h
+include/fox-1.6/FXUTF16Codec.h
+include/fox-1.6/FXUTF32Codec.h
+include/fox-1.6/FXUTF8Codec.h
+include/fox-1.6/FXUndoList.h
+include/fox-1.6/FXVec2d.h
+include/fox-1.6/FXVec2f.h
+include/fox-1.6/FXVec3d.h
+include/fox-1.6/FXVec3f.h
+include/fox-1.6/FXVec4d.h
+include/fox-1.6/FXVec4f.h
+include/fox-1.6/FXVerticalFrame.h
+include/fox-1.6/FXVisual.h
+include/fox-1.6/FXWindow.h
+include/fox-1.6/FXWizard.h
+include/fox-1.6/FXXBMIcon.h
+include/fox-1.6/FXXBMImage.h
+include/fox-1.6/FXXPMIcon.h
+include/fox-1.6/FXXPMImage.h
+include/fox-1.6/chart/FXChart.h
+include/fox-1.6/fx.h
+include/fox-1.6/fx3d.h
+include/fox-1.6/fxascii.h
+include/fox-1.6/fxdefs.h
+include/fox-1.6/fxkeys.h
+include/fox-1.6/fxunicode.h
+include/fox-1.6/fxver.h
+include/fox-1.6/xincs.h
+lib/libCHART-1.6.la
+lib/libFOX-1.6.la
+lib/pkgconfig/fox.pc
+man/man1/PathFinder.1
+man/man1/adie.1
+man/man1/calculator.1
+man/man1/reswrap.1
 man/man1/shutterbug.1
-share/doc/fox-1.4/html/adie.html
-share/doc/fox-1.4/html/app.html
-share/doc/fox-1.4/html/art/bigpenguin.png
-share/doc/fox-1.4/html/art/fifthplanet.jpg
-share/doc/fox-1.4/html/art/fox.gif
-share/doc/fox-1.4/html/art/foxlogo.jpg
-share/doc/fox-1.4/html/art/foxlogo.png
-share/doc/fox-1.4/html/art/foxlogo_small.jpg
-share/doc/fox-1.4/html/art/foxstart.png
-share/doc/fox-1.4/html/art/freespeach.gif
-share/doc/fox-1.4/html/art/ill.gif
-share/doc/fox-1.4/html/art/ilr.gif
-share/doc/fox-1.4/html/art/innernerd.gif
-share/doc/fox-1.4/html/art/iul.gif
-share/doc/fox-1.4/html/art/iur.gif
-share/doc/fox-1.4/html/art/layout.gif
-share/doc/fox-1.4/html/art/line.gif
-share/doc/fox-1.4/html/art/mouse.gif
-share/doc/fox-1.4/html/art/nerd_inside.gif
-share/doc/fox-1.4/html/art/oll.gif
-share/doc/fox-1.4/html/art/olr.gif
-share/doc/fox-1.4/html/art/opengl_logo.png
-share/doc/fox-1.4/html/art/oul.gif
-share/doc/fox-1.4/html/art/oul_grey.gif
-share/doc/fox-1.4/html/art/our.gif
-share/doc/fox-1.4/html/art/progress.png
-share/doc/fox-1.4/html/art/scribble.png
-share/doc/fox-1.4/html/art/sgitextedit.png
-share/doc/fox-1.4/html/art/slingerzbutton1.gif
-share/doc/fox-1.4/html/art/widget.jpg
-share/doc/fox-1.4/html/art/win32-libraries.png
-share/doc/fox-1.4/html/art/win32-linkoutput.png
-share/doc/fox-1.4/html/art/win32-postbuild.png
-share/doc/fox-1.4/html/art/win32-preprocessor.png
-share/doc/fox-1.4/html/art/win32-project.png
-share/doc/fox-1.4/html/art/win32-tooloptions.png
-share/doc/fox-1.4/html/art/wintextedit.png
-share/doc/fox-1.4/html/calc.html
-share/doc/fox-1.4/html/clipboard.html
-share/doc/fox-1.4/html/consulting.html
-share/doc/fox-1.4/html/datatarget.html
-share/doc/fox-1.4/html/doc.html
-share/doc/fox-1.4/html/download.html
-share/doc/fox-1.4/html/doxygen.cfg
-share/doc/fox-1.4/html/draganddrop.html
-share/doc/fox-1.4/html/faq.html
-share/doc/fox-1.4/html/filefuncs.html
-share/doc/fox-1.4/html/filter.pl
-share/doc/fox-1.4/html/focus.html
-share/doc/fox-1.4/html/fonts.html
-share/doc/fox-1.4/html/footer.html
-share/doc/fox-1.4/html/foreword.html
-share/doc/fox-1.4/html/fox.html
-share/doc/fox-1.4/html/goals.html
-share/doc/fox-1.4/html/gpgkey.html
-share/doc/fox-1.4/html/guiupdate.html
-share/doc/fox-1.4/html/header.html
-share/doc/fox-1.4/html/home.html
-share/doc/fox-1.4/html/icons.html
-share/doc/fox-1.4/html/install.html
-share/doc/fox-1.4/html/introduction.html
-share/doc/fox-1.4/html/layout.html
-share/doc/fox-1.4/html/license.html
-share/doc/fox-1.4/html/menu.css
-share/doc/fox-1.4/html/menu.html
-share/doc/fox-1.4/html/messages.html
-share/doc/fox-1.4/html/news.html
-share/doc/fox-1.4/html/news1.html
-share/doc/fox-1.4/html/news2.html
-share/doc/fox-1.4/html/page.css
-share/doc/fox-1.4/html/pathfinder.html
-share/doc/fox-1.4/html/projects.html
-share/doc/fox-1.4/html/references.html
-share/doc/fox-1.4/html/registry.html
-share/doc/fox-1.4/html/rex.html
-share/doc/fox-1.4/html/screenshots.html
-share/doc/fox-1.4/html/screenshots/SbSScreen1.jpg
-share/doc/fox-1.4/html/screenshots/SbSScreen1_small.jpg
-share/doc/fox-1.4/html/screenshots/adie.gif
-share/doc/fox-1.4/html/screenshots/adie_colors.gif
-share/doc/fox-1.4/html/screenshots/adie_edit.gif
-share/doc/fox-1.4/html/screenshots/adie_font.gif
-share/doc/fox-1.4/html/screenshots/adie_sty.gif
-share/doc/fox-1.4/html/screenshots/analysisview.png
-share/doc/fox-1.4/html/screenshots/aqx_linux_visualizacao_peq.jpg
-share/doc/fox-1.4/html/screenshots/arithmedrill-screenshot.png
-share/doc/fox-1.4/html/screenshots/arithmedrill-screenshot_small.png
-share/doc/fox-1.4/html/screenshots/boskalisday.gif
-share/doc/fox-1.4/html/screenshots/boskalisnite.gif
-share/doc/fox-1.4/html/screenshots/clview_icon.gif
-share/doc/fox-1.4/html/screenshots/colordialog.png
-share/doc/fox-1.4/html/screenshots/cometassay.jpg
-share/doc/fox-1.4/html/screenshots/contact.gif
-share/doc/fox-1.4/html/screenshots/dirdialog.png
-share/doc/fox-1.4/html/screenshots/dlgedit1.png
-share/doc/fox-1.4/html/screenshots/dlgedit2.png
-share/doc/fox-1.4/html/screenshots/emso_screen.png
-share/doc/fox-1.4/html/screenshots/emso_screen_small.jpg
-share/doc/fox-1.4/html/screenshots/filedialog.png
-share/doc/fox-1.4/html/screenshots/fontdialog.png
-share/doc/fox-1.4/html/screenshots/foxcalc.jpg
-share/doc/fox-1.4/html/screenshots/foxcalc_prefdialog_01_small.jpg
-share/doc/fox-1.4/html/screenshots/foxcalc_prefdialog_02_small.jpg
-share/doc/fox-1.4/html/screenshots/foxcalc_prefdialog_03_small.jpg
-share/doc/fox-1.4/html/screenshots/glview.png
-share/doc/fox-1.4/html/screenshots/goggles.png
-share/doc/fox-1.4/html/screenshots/iims1.png
-share/doc/fox-1.4/html/screenshots/iims1_small.png
-share/doc/fox-1.4/html/screenshots/iims2.png
-share/doc/fox-1.4/html/screenshots/iims2_small.png
-share/doc/fox-1.4/html/screenshots/iims3.png
-share/doc/fox-1.4/html/screenshots/iims3_small.png
-share/doc/fox-1.4/html/screenshots/imagedebugger.gif
-share/doc/fox-1.4/html/screenshots/pathfinder.png
-share/doc/fox-1.4/html/screenshots/pdiary.jpg
-share/doc/fox-1.4/html/screenshots/printdialog.png
-share/doc/fox-1.4/html/screenshots/replacedialog.png
-share/doc/fox-1.4/html/screenshots/rezound_thumb.gif
-share/doc/fox-1.4/html/screenshots/scenegraphnavigator.gif
-share/doc/fox-1.4/html/screenshots/scriptolutions.gif
-share/doc/fox-1.4/html/screenshots/searchdialog.png
-share/doc/fox-1.4/html/screenshots/table.png
-share/doc/fox-1.4/html/screenshots/tmp_vision_snap.jpg
-share/doc/fox-1.4/html/screenshots/tux_small.jpg
-share/doc/fox-1.4/html/screenshots/udine_physics.jpg
-share/doc/fox-1.4/html/screenshots/vorhour1.jpg
-share/doc/fox-1.4/html/screenshots/vorhour1_small.jpg
-share/doc/fox-1.4/html/screenshots/vorhour2.jpg
-share/doc/fox-1.4/html/screenshots/vorhour2_small.jpg
-share/doc/fox-1.4/html/screenshots/xfe.png
-share/doc/fox-1.4/html/screenshots/xfe_small.png
-share/doc/fox-1.4/html/screenshots/xtc.gif
-share/doc/fox-1.4/html/serialization.html
-share/doc/fox-1.4/html/styles.css
-share/doc/fox-1.4/html/timers.html
-share/doc/fox-1.4/html/top.html
-share/doc/fox-1.4/html/widgets.html
-share/doc/fox-1.4/html/win32.html
-share/doc/fox-1.4/html/window.html
-share/doc/fox-1.4/html/xml.html
-@dirrm include/fox-1.4/chart
-@dirrm include/fox-1.4
-@dirrm share/doc/fox-1.4/html/screenshots
-@dirrm share/doc/fox-1.4/html/art
-@dirrm share/doc/fox-1.4/html
-@dirrm share/doc/fox-1.4
+share/doc/fox-1.6/html/adie.html
+share/doc/fox-1.6/html/app.html
+share/doc/fox-1.6/html/art/bigpenguin.png
+share/doc/fox-1.6/html/art/fifthplanet.jpg
+share/doc/fox-1.6/html/art/fox.gif
+share/doc/fox-1.6/html/art/foxlogo.jpg
+share/doc/fox-1.6/html/art/foxlogo.png
+share/doc/fox-1.6/html/art/foxlogo_small.jpg
+share/doc/fox-1.6/html/art/foxstart.png
+share/doc/fox-1.6/html/art/freespeach.gif
+share/doc/fox-1.6/html/art/ill.gif
+share/doc/fox-1.6/html/art/ilr.gif
+share/doc/fox-1.6/html/art/innernerd.gif
+share/doc/fox-1.6/html/art/iul.gif
+share/doc/fox-1.6/html/art/iur.gif
+share/doc/fox-1.6/html/art/layout.gif
+share/doc/fox-1.6/html/art/line.gif
+share/doc/fox-1.6/html/art/mouse.gif
+share/doc/fox-1.6/html/art/nerd_inside.gif
+share/doc/fox-1.6/html/art/oll.gif
+share/doc/fox-1.6/html/art/olr.gif
+share/doc/fox-1.6/html/art/opengl_logo.png
+share/doc/fox-1.6/html/art/oul.gif
+share/doc/fox-1.6/html/art/oul_grey.gif
+share/doc/fox-1.6/html/art/our.gif
+share/doc/fox-1.6/html/art/progress.png
+share/doc/fox-1.6/html/art/scribble.png
+share/doc/fox-1.6/html/art/sgitextedit.png
+share/doc/fox-1.6/html/art/slingerzbutton1.gif
+share/doc/fox-1.6/html/art/widget.jpg
+share/doc/fox-1.6/html/art/win32-libraries.png
+share/doc/fox-1.6/html/art/win32-linkoutput.png
+share/doc/fox-1.6/html/art/win32-postbuild.png
+share/doc/fox-1.6/html/art/win32-preprocessor.png
+share/doc/fox-1.6/html/art/win32-project.png
+share/doc/fox-1.6/html/art/win32-tooloptions.png
+share/doc/fox-1.6/html/art/wintextedit.png
+share/doc/fox-1.6/html/calc.html
+share/doc/fox-1.6/html/clipboard.html
+share/doc/fox-1.6/html/consulting.html
+share/doc/fox-1.6/html/datatarget.html
+share/doc/fox-1.6/html/doc.html
+share/doc/fox-1.6/html/download.html
+share/doc/fox-1.6/html/doxygen.cfg
+share/doc/fox-1.6/html/draganddrop.html
+share/doc/fox-1.6/html/faq.html
+share/doc/fox-1.6/html/filefuncs.html
+share/doc/fox-1.6/html/filter.pl
+share/doc/fox-1.6/html/focus.html
+share/doc/fox-1.6/html/fonts.html
+share/doc/fox-1.6/html/footer.html
+share/doc/fox-1.6/html/foreword.html
+share/doc/fox-1.6/html/fox.html
+share/doc/fox-1.6/html/goals.html
+share/doc/fox-1.6/html/gpgkey.html
+share/doc/fox-1.6/html/guiupdate.html
+share/doc/fox-1.6/html/header.html
+share/doc/fox-1.6/html/home.html
+share/doc/fox-1.6/html/icons.html
+share/doc/fox-1.6/html/install.html
+share/doc/fox-1.6/html/introduction.html
+share/doc/fox-1.6/html/layout.html
+share/doc/fox-1.6/html/license.html
+share/doc/fox-1.6/html/menu.css
+share/doc/fox-1.6/html/menu.html
+share/doc/fox-1.6/html/messages.html
+share/doc/fox-1.6/html/news.html
+share/doc/fox-1.6/html/news1.html
+share/doc/fox-1.6/html/news2.html
+share/doc/fox-1.6/html/news3.html
+share/doc/fox-1.6/html/page.css
+share/doc/fox-1.6/html/pathfinder.html
+share/doc/fox-1.6/html/projects.html
+share/doc/fox-1.6/html/references.html
+share/doc/fox-1.6/html/registry.html
+share/doc/fox-1.6/html/rex.html
+share/doc/fox-1.6/html/screenshots.html
+share/doc/fox-1.6/html/screenshots/SbSScreen1.jpg
+share/doc/fox-1.6/html/screenshots/SbSScreen1_small.jpg
+share/doc/fox-1.6/html/screenshots/adie.gif
+share/doc/fox-1.6/html/screenshots/adie_colors.gif
+share/doc/fox-1.6/html/screenshots/adie_edit.gif
+share/doc/fox-1.6/html/screenshots/adie_font.gif
+share/doc/fox-1.6/html/screenshots/adie_sty.gif
+share/doc/fox-1.6/html/screenshots/analysisview.png
+share/doc/fox-1.6/html/screenshots/aqx_linux_visualizacao_peq.jpg
+share/doc/fox-1.6/html/screenshots/arithmedrill-screenshot.png
+share/doc/fox-1.6/html/screenshots/arithmedrill-screenshot_small.png
+share/doc/fox-1.6/html/screenshots/boskalisday.gif
+share/doc/fox-1.6/html/screenshots/boskalisnite.gif
+share/doc/fox-1.6/html/screenshots/clview_icon.gif
+share/doc/fox-1.6/html/screenshots/colordialog.png
+share/doc/fox-1.6/html/screenshots/cometassay.jpg
+share/doc/fox-1.6/html/screenshots/contact.gif
+share/doc/fox-1.6/html/screenshots/dirdialog.png
+share/doc/fox-1.6/html/screenshots/dlgedit1.png
+share/doc/fox-1.6/html/screenshots/dlgedit2.png
+share/doc/fox-1.6/html/screenshots/emso_screen.png
+share/doc/fox-1.6/html/screenshots/emso_screen_small.jpg
+share/doc/fox-1.6/html/screenshots/filedialog.png
+share/doc/fox-1.6/html/screenshots/fontdialog.png
+share/doc/fox-1.6/html/screenshots/foxcalc.jpg
+share/doc/fox-1.6/html/screenshots/foxcalc_prefdialog_01_small.jpg
+share/doc/fox-1.6/html/screenshots/foxcalc_prefdialog_02_small.jpg
+share/doc/fox-1.6/html/screenshots/foxcalc_prefdialog_03_small.jpg
+share/doc/fox-1.6/html/screenshots/glview.png
+share/doc/fox-1.6/html/screenshots/goggles.png
+share/doc/fox-1.6/html/screenshots/iims1.png
+share/doc/fox-1.6/html/screenshots/iims1_small.png
+share/doc/fox-1.6/html/screenshots/iims2.png
+share/doc/fox-1.6/html/screenshots/iims2_small.png
+share/doc/fox-1.6/html/screenshots/iims3.png
+share/doc/fox-1.6/html/screenshots/iims3_small.png
+share/doc/fox-1.6/html/screenshots/imagedebugger.gif
+share/doc/fox-1.6/html/screenshots/pathfinder.png
+share/doc/fox-1.6/html/screenshots/pdiary.jpg
+share/doc/fox-1.6/html/screenshots/printdialog.png
+share/doc/fox-1.6/html/screenshots/replacedialog.png
+share/doc/fox-1.6/html/screenshots/rezound_thumb.gif
+share/doc/fox-1.6/html/screenshots/scenegraphnavigator.gif
+share/doc/fox-1.6/html/screenshots/scriptolutions.gif
+share/doc/fox-1.6/html/screenshots/searchdialog.png
+share/doc/fox-1.6/html/screenshots/table.png
+share/doc/fox-1.6/html/screenshots/tmp_vision_snap.jpg
+share/doc/fox-1.6/html/screenshots/tux_small.jpg
+share/doc/fox-1.6/html/screenshots/udine_physics.jpg
+share/doc/fox-1.6/html/screenshots/vorhour1.jpg
+share/doc/fox-1.6/html/screenshots/vorhour1_small.jpg
+share/doc/fox-1.6/html/screenshots/vorhour2.jpg
+share/doc/fox-1.6/html/screenshots/vorhour2_small.jpg
+share/doc/fox-1.6/html/screenshots/xfe.png
+share/doc/fox-1.6/html/screenshots/xfe_small.png
+share/doc/fox-1.6/html/screenshots/xtc.gif
+share/doc/fox-1.6/html/serialization.html
+share/doc/fox-1.6/html/styles.css
+share/doc/fox-1.6/html/timers.html
+share/doc/fox-1.6/html/top.html
+share/doc/fox-1.6/html/widgets.html
+share/doc/fox-1.6/html/win32.html
+share/doc/fox-1.6/html/window.html
+share/doc/fox-1.6/html/xml.html
+@dirrm share/doc/fox-1.6/html/screenshots
+@dirrm share/doc/fox-1.6/html/art
+@dirrm share/doc/fox-1.6/html
+@dirrm share/doc/fox-1.6
+@dirrm include/fox-1.6/chart
+@dirrm include/fox-1.6
diff --git a/x11/fox/buildlink3.mk b/x11/fox/buildlink3.mk
index a6e69f285c9..5e09105f3aa 100644
--- a/x11/fox/buildlink3.mk
+++ b/x11/fox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2007/01/11 16:53:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2007/04/13 05:45:36 xtraeme Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FOX_BUILDLINK3_MK:=	${FOX_BUILDLINK3_MK}+
@@ -12,10 +12,9 @@ BUILDLINK_PACKAGES+=	fox
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fox
 
 .if !empty(FOX_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.fox+=		fox>=1.4.16
-BUILDLINK_ABI_DEPENDS.fox?=	fox>=1.4.17nb2
+BUILDLINK_API_DEPENDS.fox+=	fox>=1.6.25
 BUILDLINK_PKGSRCDIR.fox?=	../../x11/fox
-BUILDLINK_INCDIRS.fox?=		include/fox-1.4
+BUILDLINK_INCDIRS.fox?=		include/fox-1.6
 .endif	# FOX_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/x11/fox/distinfo b/x11/fox/distinfo
index ab4e2e275de..df9c8035666 100644
--- a/x11/fox/distinfo
+++ b/x11/fox/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.13 2006/07/17 19:20:45 wiz Exp $
+$NetBSD: distinfo,v 1.14 2007/04/13 05:45:36 xtraeme Exp $
 
-SHA1 (fox-1.4.34.tar.gz) = cd532233436082fda3bd077741236f118c71e1b8
-RMD160 (fox-1.4.34.tar.gz) = 35701bff6937f4753310b364dba1553109e661a4
-Size (fox-1.4.34.tar.gz) = 4028423 bytes
-SHA1 (patch-aa) = f59eddab1b70ad504e94d78ca1bb3508c95a7d5a
+SHA1 (fox-1.6.25.tar.gz) = 1811e838cdccb66c259bc94377f9d1097a307bff
+RMD160 (fox-1.6.25.tar.gz) = 41951a19e46cdb5a7989cd9ba2a2745552e098d5
+Size (fox-1.6.25.tar.gz) = 4193062 bytes
diff --git a/x11/fox/patches/patch-aa b/x11/fox/patches/patch-aa
deleted file mode 100644
index 389aac5fbb1..00000000000
--- a/x11/fox/patches/patch-aa
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/07/17 19:20:45 wiz Exp $
-
---- configure.orig	2006-06-13 02:24:25.000000000 +0000
-+++ configure
-@@ -1845,7 +1845,6 @@ LT_AGE=`expr $FOX_INTERFACE_VERSION - $F
- 
- 
- 
--CXXFLAGS=""
- 
- echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-@@ -23331,13 +23330,13 @@ fi
- 
- PTHREAD_LIBS=notfound
- if test "x$PTHREAD_LIBS" = xnotfound; then
--echo "$as_me:$LINENO: checking for pthread_exit in -lpthread" >&5
--echo $ECHO_N "checking for pthread_exit in -lpthread... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for pthread_exit in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_exit in ${PTHREAD_LDFLAGS} ${REAL_PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_exit+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${REAL_PTHREAD_LIBS}  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23396,7 +23395,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_exit" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_exit" >&6
- if test $ac_cv_lib_pthread_pthread_exit = yes; then
--  PTHREAD_LIBS="-lpthread"
-+  PTHREAD_LIBS="${PTHREAD_LDFLAGS} ${REAL_PTHREAD_LIBS}"
- fi
- 
- fi
-@@ -25467,7 +25466,7 @@ fi;
- echo "$as_me:$LINENO: result: $enable_release" >&5
- echo "${ECHO_T}$enable_release" >&6
- if test "x$enable_release" = "xyes" ; then
--CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
-+CXXFLAGS="${CXXFLAGS} -DNDEBUG"
- if test "${GXX}" = "yes" ; then
- CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -fno-strict-aliasing -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
- fi