diff options
author | lioux <lioux@FreeBSD.org> | 2003-02-08 08:14:58 +0800 |
---|---|---|
committer | lioux <lioux@FreeBSD.org> | 2003-02-08 08:14:58 +0800 |
commit | 26f77cd9c7bc4d7db9b0e13b7fa9d2bbcf6917cb (patch) | |
tree | e39857f9960867ae1e506402a3d5747ee393acfd /x11-toolkits | |
parent | e94e7d5e3b41d44f300a867e870093d84abdda14 (diff) | |
download | freebsd-ports-gnome-26f77cd9c7bc4d7db9b0e13b7fa9d2bbcf6917cb.tar.gz freebsd-ports-gnome-26f77cd9c7bc4d7db9b0e13b7fa9d2bbcf6917cb.tar.zst freebsd-ports-gnome-26f77cd9c7bc4d7db9b0e13b7fa9d2bbcf6917cb.zip |
o After repo copy from fox port:
- Update to 1.1.22
- Add a conflict management mechanism: do not install if
fox port is already installed
Repo copy performed by: cvs (joe)
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/fox-devel/Makefile | 22 | ||||
-rw-r--r-- | x11-toolkits/fox-devel/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/fox-devel/pkg-plist | 52 | ||||
-rw-r--r-- | x11-toolkits/fox14/Makefile | 22 | ||||
-rw-r--r-- | x11-toolkits/fox14/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/fox14/pkg-plist | 52 |
6 files changed, 116 insertions, 36 deletions
diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile index 0046bc81b46f..6de627fb31c9 100644 --- a/x11-toolkits/fox-devel/Makefile +++ b/x11-toolkits/fox-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= fox -PORTVERSION?= 1.0.30 -PORTREVISION?= 0 +PORTVERSION= 1.1.22 CATEGORIES= x11-toolkits MASTER_SITES= http://www.fox-toolkit.org/ftp/ \ ftp://ftp.fox-toolkit.org/pub/ \ @@ -26,8 +25,9 @@ USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+=--with-opengl=mesa --with-x + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXm" +CONFIGURE_ARGS+=--with-opengl=mesa --with-x \ + --enable-xthreads MAN1= reswrap.1 @@ -133,4 +133,16 @@ pre-everything:: .endif @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +## +## 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 +.endif + +.include <bsd.port.post.mk> + diff --git a/x11-toolkits/fox-devel/distinfo b/x11-toolkits/fox-devel/distinfo index 6e6a9c8482e2..b1a970119a08 100644 --- a/x11-toolkits/fox-devel/distinfo +++ b/x11-toolkits/fox-devel/distinfo @@ -1 +1 @@ -MD5 (fox-1.0.30.tar.gz) = 19486a03a11f916c17b8988d9d6f2cef +MD5 (fox-1.1.22.tar.gz) = a7d3d6b79ddb8338869364964a175daa diff --git a/x11-toolkits/fox-devel/pkg-plist b/x11-toolkits/fox-devel/pkg-plist index 0cd4f1d88a18..d4cbf37976d3 100644 --- a/x11-toolkits/fox-devel/pkg-plist +++ b/x11-toolkits/fox-devel/pkg-plist @@ -11,6 +11,7 @@ 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 @@ -28,6 +29,7 @@ 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 @@ -69,7 +71,9 @@ 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 @@ -80,6 +84,7 @@ 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 @@ -92,14 +97,16 @@ 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/FXMenubar.h include/fox/FXMessageBox.h include/fox/FXObject.h include/fox/FXObjectList.h @@ -127,9 +134,10 @@ 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/FXScrollbar.h include/fox/FXSearchDialog.h include/fox/FXSeparator.h include/fox/FXSettings.h @@ -139,8 +147,8 @@ 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/FXStatusBar.h +include/fox/FXStatusLine.h include/fox/FXStream.h include/fox/FXString.h include/fox/FXStringDict.h @@ -154,22 +162,27 @@ 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/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 @@ -178,18 +191,21 @@ include/fox/fxdefs.h include/fox/fxkeys.h include/fox/fxver.h include/fox/xincs.h -lib/libFOX-1.0.so -lib/libFOX-1.0.so.0 +lib/libFOX-1.1.so +lib/libFOX-1.1.so.22 lib/libFOX.a lib/libFOX.la lib/libFOX.so +man/man1/reswrap.1.gz %%PORTDOCS%%share/doc/fox/html/adie.html %%PORTDOCS%%share/doc/fox/html/adie.jpg %%PORTDOCS%%share/doc/fox/html/adie_colors.jpg -%%PORTDOCS%%share/doc/fox/html/adie_del.jpg %%PORTDOCS%%share/doc/fox/html/adie_edit.jpg %%PORTDOCS%%share/doc/fox/html/adie_font.jpg +%%PORTDOCS%%share/doc/fox/html/adie_lang.jpg %%PORTDOCS%%share/doc/fox/html/adie_pat.jpg +%%PORTDOCS%%share/doc/fox/html/adie_style.jpg +%%PORTDOCS%%share/doc/fox/html/adie_syntax.jpg %%PORTDOCS%%share/doc/fox/html/app.html %%PORTDOCS%%share/doc/fox/html/bigpenguin.png %%PORTDOCS%%share/doc/fox/html/calc.html @@ -198,25 +214,32 @@ lib/libFOX.so %%PORTDOCS%%share/doc/fox/html/dirdialog.png %%PORTDOCS%%share/doc/fox/html/doc.html %%PORTDOCS%%share/doc/fox/html/download.html +%%PORTDOCS%%share/doc/fox/html/doxygen.cfg %%PORTDOCS%%share/doc/fox/html/draganddrop.html %%PORTDOCS%%share/doc/fox/html/faq.html +%%PORTDOCS%%share/doc/fox/html/fifthplanet.jpg %%PORTDOCS%%share/doc/fox/html/filedialog.png %%PORTDOCS%%share/doc/fox/html/filefuncs.html +%%PORTDOCS%%share/doc/fox/html/filter.pl %%PORTDOCS%%share/doc/fox/html/focus.html %%PORTDOCS%%share/doc/fox/html/fontdialog.png %%PORTDOCS%%share/doc/fox/html/fonts.html +%%PORTDOCS%%share/doc/fox/html/footer.html %%PORTDOCS%%share/doc/fox/html/foreword.html %%PORTDOCS%%share/doc/fox/html/fox.html %%PORTDOCS%%share/doc/fox/html/foxcalc.jpg %%PORTDOCS%%share/doc/fox/html/foxcalc_prefdialog_01_small.jpg %%PORTDOCS%%share/doc/fox/html/foxcalc_prefdialog_02_small.jpg %%PORTDOCS%%share/doc/fox/html/foxcalc_prefdialog_03_small.jpg +%%PORTDOCS%%share/doc/fox/html/foxlogo.jpg %%PORTDOCS%%share/doc/fox/html/foxlogo.png +%%PORTDOCS%%share/doc/fox/html/foxlogo_small.jpg %%PORTDOCS%%share/doc/fox/html/foxstart.png %%PORTDOCS%%share/doc/fox/html/freespeach.gif %%PORTDOCS%%share/doc/fox/html/glview.png %%PORTDOCS%%share/doc/fox/html/goals.html %%PORTDOCS%%share/doc/fox/html/guiupdate.html +%%PORTDOCS%%share/doc/fox/html/header.html %%PORTDOCS%%share/doc/fox/html/icons.html %%PORTDOCS%%share/doc/fox/html/ill.gif %%PORTDOCS%%share/doc/fox/html/ilr.gif @@ -225,7 +248,10 @@ lib/libFOX.so %%PORTDOCS%%share/doc/fox/html/iul.gif %%PORTDOCS%%share/doc/fox/html/iur.gif %%PORTDOCS%%share/doc/fox/html/layout.html +%%PORTDOCS%%share/doc/fox/html/license.html +%%PORTDOCS%%share/doc/fox/html/line.gif %%PORTDOCS%%share/doc/fox/html/messages.html +%%PORTDOCS%%share/doc/fox/html/mouse.gif %%PORTDOCS%%share/doc/fox/html/nerd_inside.gif %%PORTDOCS%%share/doc/fox/html/news.html %%PORTDOCS%%share/doc/fox/html/oldfox.html @@ -235,11 +261,13 @@ lib/libFOX.so %%PORTDOCS%%share/doc/fox/html/oul.gif %%PORTDOCS%%share/doc/fox/html/oul_grey.gif %%PORTDOCS%%share/doc/fox/html/our.gif +%%PORTDOCS%%share/doc/fox/html/page.css %%PORTDOCS%%share/doc/fox/html/pathfinder.html %%PORTDOCS%%share/doc/fox/html/pathfinder.png %%PORTDOCS%%share/doc/fox/html/printdialog.png %%PORTDOCS%%share/doc/fox/html/progress.png %%PORTDOCS%%share/doc/fox/html/projects.html +%%PORTDOCS%%share/doc/fox/html/references.html %%PORTDOCS%%share/doc/fox/html/registry.html %%PORTDOCS%%share/doc/fox/html/replacedialog.png %%PORTDOCS%%share/doc/fox/html/rex.html diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile index 0046bc81b46f..6de627fb31c9 100644 --- a/x11-toolkits/fox14/Makefile +++ b/x11-toolkits/fox14/Makefile @@ -6,8 +6,7 @@ # PORTNAME= fox -PORTVERSION?= 1.0.30 -PORTREVISION?= 0 +PORTVERSION= 1.1.22 CATEGORIES= x11-toolkits MASTER_SITES= http://www.fox-toolkit.org/ftp/ \ ftp://ftp.fox-toolkit.org/pub/ \ @@ -26,8 +25,9 @@ USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+=--with-opengl=mesa --with-x + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXm" +CONFIGURE_ARGS+=--with-opengl=mesa --with-x \ + --enable-xthreads MAN1= reswrap.1 @@ -133,4 +133,16 @@ pre-everything:: .endif @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +## +## 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 +.endif + +.include <bsd.port.post.mk> + diff --git a/x11-toolkits/fox14/distinfo b/x11-toolkits/fox14/distinfo index 6e6a9c8482e2..b1a970119a08 100644 --- a/x11-toolkits/fox14/distinfo +++ b/x11-toolkits/fox14/distinfo @@ -1 +1 @@ -MD5 (fox-1.0.30.tar.gz) = 19486a03a11f916c17b8988d9d6f2cef +MD5 (fox-1.1.22.tar.gz) = a7d3d6b79ddb8338869364964a175daa diff --git a/x11-toolkits/fox14/pkg-plist b/x11-toolkits/fox14/pkg-plist index 0cd4f1d88a18..d4cbf37976d3 100644 --- a/x11-toolkits/fox14/pkg-plist +++ b/x11-toolkits/fox14/pkg-plist @@ -11,6 +11,7 @@ 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 @@ -28,6 +29,7 @@ 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 @@ -69,7 +71,9 @@ 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 @@ -80,6 +84,7 @@ 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 @@ -92,14 +97,16 @@ 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/FXMenubar.h include/fox/FXMessageBox.h include/fox/FXObject.h include/fox/FXObjectList.h @@ -127,9 +134,10 @@ 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/FXScrollbar.h include/fox/FXSearchDialog.h include/fox/FXSeparator.h include/fox/FXSettings.h @@ -139,8 +147,8 @@ 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/FXStatusBar.h +include/fox/FXStatusLine.h include/fox/FXStream.h include/fox/FXString.h include/fox/FXStringDict.h @@ -154,22 +162,27 @@ 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/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 @@ -178,18 +191,21 @@ include/fox/fxdefs.h include/fox/fxkeys.h include/fox/fxver.h include/fox/xincs.h -lib/libFOX-1.0.so -lib/libFOX-1.0.so.0 +lib/libFOX-1.1.so +lib/libFOX-1.1.so.22 lib/libFOX.a lib/libFOX.la lib/libFOX.so +man/man1/reswrap.1.gz %%PORTDOCS%%share/doc/fox/html/adie.html %%PORTDOCS%%share/doc/fox/html/adie.jpg %%PORTDOCS%%share/doc/fox/html/adie_colors.jpg -%%PORTDOCS%%share/doc/fox/html/adie_del.jpg %%PORTDOCS%%share/doc/fox/html/adie_edit.jpg %%PORTDOCS%%share/doc/fox/html/adie_font.jpg +%%PORTDOCS%%share/doc/fox/html/adie_lang.jpg %%PORTDOCS%%share/doc/fox/html/adie_pat.jpg +%%PORTDOCS%%share/doc/fox/html/adie_style.jpg +%%PORTDOCS%%share/doc/fox/html/adie_syntax.jpg %%PORTDOCS%%share/doc/fox/html/app.html %%PORTDOCS%%share/doc/fox/html/bigpenguin.png %%PORTDOCS%%share/doc/fox/html/calc.html @@ -198,25 +214,32 @@ lib/libFOX.so %%PORTDOCS%%share/doc/fox/html/dirdialog.png %%PORTDOCS%%share/doc/fox/html/doc.html %%PORTDOCS%%share/doc/fox/html/download.html +%%PORTDOCS%%share/doc/fox/html/doxygen.cfg %%PORTDOCS%%share/doc/fox/html/draganddrop.html %%PORTDOCS%%share/doc/fox/html/faq.html +%%PORTDOCS%%share/doc/fox/html/fifthplanet.jpg %%PORTDOCS%%share/doc/fox/html/filedialog.png %%PORTDOCS%%share/doc/fox/html/filefuncs.html +%%PORTDOCS%%share/doc/fox/html/filter.pl %%PORTDOCS%%share/doc/fox/html/focus.html %%PORTDOCS%%share/doc/fox/html/fontdialog.png %%PORTDOCS%%share/doc/fox/html/fonts.html +%%PORTDOCS%%share/doc/fox/html/footer.html %%PORTDOCS%%share/doc/fox/html/foreword.html %%PORTDOCS%%share/doc/fox/html/fox.html %%PORTDOCS%%share/doc/fox/html/foxcalc.jpg %%PORTDOCS%%share/doc/fox/html/foxcalc_prefdialog_01_small.jpg %%PORTDOCS%%share/doc/fox/html/foxcalc_prefdialog_02_small.jpg %%PORTDOCS%%share/doc/fox/html/foxcalc_prefdialog_03_small.jpg +%%PORTDOCS%%share/doc/fox/html/foxlogo.jpg %%PORTDOCS%%share/doc/fox/html/foxlogo.png +%%PORTDOCS%%share/doc/fox/html/foxlogo_small.jpg %%PORTDOCS%%share/doc/fox/html/foxstart.png %%PORTDOCS%%share/doc/fox/html/freespeach.gif %%PORTDOCS%%share/doc/fox/html/glview.png %%PORTDOCS%%share/doc/fox/html/goals.html %%PORTDOCS%%share/doc/fox/html/guiupdate.html +%%PORTDOCS%%share/doc/fox/html/header.html %%PORTDOCS%%share/doc/fox/html/icons.html %%PORTDOCS%%share/doc/fox/html/ill.gif %%PORTDOCS%%share/doc/fox/html/ilr.gif @@ -225,7 +248,10 @@ lib/libFOX.so %%PORTDOCS%%share/doc/fox/html/iul.gif %%PORTDOCS%%share/doc/fox/html/iur.gif %%PORTDOCS%%share/doc/fox/html/layout.html +%%PORTDOCS%%share/doc/fox/html/license.html +%%PORTDOCS%%share/doc/fox/html/line.gif %%PORTDOCS%%share/doc/fox/html/messages.html +%%PORTDOCS%%share/doc/fox/html/mouse.gif %%PORTDOCS%%share/doc/fox/html/nerd_inside.gif %%PORTDOCS%%share/doc/fox/html/news.html %%PORTDOCS%%share/doc/fox/html/oldfox.html @@ -235,11 +261,13 @@ lib/libFOX.so %%PORTDOCS%%share/doc/fox/html/oul.gif %%PORTDOCS%%share/doc/fox/html/oul_grey.gif %%PORTDOCS%%share/doc/fox/html/our.gif +%%PORTDOCS%%share/doc/fox/html/page.css %%PORTDOCS%%share/doc/fox/html/pathfinder.html %%PORTDOCS%%share/doc/fox/html/pathfinder.png %%PORTDOCS%%share/doc/fox/html/printdialog.png %%PORTDOCS%%share/doc/fox/html/progress.png %%PORTDOCS%%share/doc/fox/html/projects.html +%%PORTDOCS%%share/doc/fox/html/references.html %%PORTDOCS%%share/doc/fox/html/registry.html %%PORTDOCS%%share/doc/fox/html/replacedialog.png %%PORTDOCS%%share/doc/fox/html/rex.html |