[Midnightbsd-cvs] mports [19843] trunk/devel/qt4-designer: fix build
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Aug 20 07:56:46 EDT 2015
Revision: 19843
http://svnweb.midnightbsd.org/mports/?rev=19843
Author: laffer1
Date: 2015-08-20 07:56:44 -0400 (Thu, 20 Aug 2015)
Log Message:
-----------
fix build
Modified Paths:
--------------
trunk/devel/qt4-designer/Makefile
trunk/devel/qt4-designer/pkg-plist
Removed Paths:
-------------
trunk/devel/qt4-designer/distinfo
trunk/devel/qt4-designer/files/
Modified: trunk/devel/qt4-designer/Makefile
===================================================================
--- trunk/devel/qt4-designer/Makefile 2015-08-20 11:49:11 UTC (rev 19842)
+++ trunk/devel/qt4-designer/Makefile 2015-08-20 11:56:44 UTC (rev 19843)
@@ -3,7 +3,8 @@
PORTNAME= designer
DISTVERSION= ${QT4_VERSION}
-CATEGORIES?= devel
+PORTREVISION= 1
+CATEGORIES= devel
PKGNAMEPREFIX= qt4-
MAINTAINER= ports at MidnightBSD.org
@@ -12,15 +13,13 @@
USE_QT4= qmake_build moc_build rcc_build uic_build assistant_run \
qt3support corelib declarative gui network script sql xml \
- webkit phonon
-QT_NONSTANDARD= yes
+ webkit
QT_DIST= yes
-MAKE_JOBS_SAFE= yes
HAS_CONFIGURE= yes
-#Try to fix linking when previous version is installed
-CONFIGURE_ARGS+= -L${WRKSRC}/lib
-USE_LDCONFIG= ${PREFIX}/lib/qt4
+# Try to fix linking when previous version is installed
+CONFIGURE_ARGS= -L${WRKSRC}/lib -no-phonon
+USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
@@ -27,9 +26,10 @@
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
PATH=${WRKSRC}/bin:$$PATH
-DESKTOP_ENTRIES="Qt Designer" "${COMMENT}" \
+DESKTOP_ENTRIES="Qt 4 Designer" "" \
"${PREFIX}/share/pixmaps/designer-qt4.png" \
- "${PREFIX}/bin/designer-qt4" "Development;Qt;" true
+ "${PREFIX}/${QT_BINDIR_REL}/designer${_QT_BINSUFX}" \
+ "Development;Qt;" true
DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \
src/activeqt src/dbus src/multimedia src/opengl src/openvg \
@@ -44,11 +44,11 @@
BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure
-
pre-configure:
- ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=designer-qt4|g' \
+ ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=designer${_QT_BINSUFX}|g' \
${BUILD_WRKSRC}/src/${PORTNAME}/${PORTNAME}.pro
+ ${REINPLACE_CMD} -e '/QLatin1String/ s|("assistant")|("assistant${_QT_BINSUFX}")|' \
+ ${BUILD_WRKSRC}/src/${PORTNAME}/assistantclient.cpp
# fix build when previous version is installed
${REINPLACE_CMD} -e '/^CONFIG/s|depend_prl||' \
${BUILD_WRKSRC}/src/components/lib/lib.pro
Deleted: trunk/devel/qt4-designer/distinfo
===================================================================
--- trunk/devel/qt4-designer/distinfo 2015-08-20 11:49:11 UTC (rev 19842)
+++ trunk/devel/qt4-designer/distinfo 2015-08-20 11:56:44 UTC (rev 19843)
@@ -1,2 +0,0 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138
-SIZE (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467
Modified: trunk/devel/qt4-designer/pkg-plist
===================================================================
--- trunk/devel/qt4-designer/pkg-plist 2015-08-20 11:49:11 UTC (rev 19842)
+++ trunk/devel/qt4-designer/pkg-plist 2015-08-20 11:56:44 UTC (rev 19843)
@@ -1,116 +1,108 @@
-bin/designer-qt4
-%%DEBUG%%bin/designer-qt4.debug
-include/qt4/QtDesigner/QAbstractExtensionFactory
-include/qt4/QtDesigner/QAbstractExtensionManager
-include/qt4/QtDesigner/QAbstractFormBuilder
-include/qt4/QtDesigner/QDesignerActionEditorInterface
-include/qt4/QtDesigner/QDesignerBrushManagerInterface
-include/qt4/QtDesigner/QDesignerComponents
-include/qt4/QtDesigner/QDesignerContainerExtension
-include/qt4/QtDesigner/QDesignerCustomWidgetCollectionInterface
-include/qt4/QtDesigner/QDesignerCustomWidgetInterface
-include/qt4/QtDesigner/QDesignerDnDItemInterface
-include/qt4/QtDesigner/QDesignerDynamicPropertySheetExtension
-include/qt4/QtDesigner/QDesignerExportWidget
-include/qt4/QtDesigner/QDesignerExtraInfoExtension
-include/qt4/QtDesigner/QDesignerFormEditorInterface
-include/qt4/QtDesigner/QDesignerFormEditorPluginInterface
-include/qt4/QtDesigner/QDesignerFormWindowCursorInterface
-include/qt4/QtDesigner/QDesignerFormWindowInterface
-include/qt4/QtDesigner/QDesignerFormWindowManagerInterface
-include/qt4/QtDesigner/QDesignerFormWindowToolInterface
-include/qt4/QtDesigner/QDesignerIconCacheInterface
-include/qt4/QtDesigner/QDesignerIntegrationInterface
-include/qt4/QtDesigner/QDesignerLanguageExtension
-include/qt4/QtDesigner/QDesignerLayoutDecorationExtension
-include/qt4/QtDesigner/QDesignerMemberSheetExtension
-include/qt4/QtDesigner/QDesignerMetaDataBaseInterface
-include/qt4/QtDesigner/QDesignerMetaDataBaseItemInterface
-include/qt4/QtDesigner/QDesignerObjectInspectorInterface
-include/qt4/QtDesigner/QDesignerPromotionInterface
-include/qt4/QtDesigner/QDesignerPropertyEditorInterface
-include/qt4/QtDesigner/QDesignerPropertySheetExtension
-include/qt4/QtDesigner/QDesignerResourceBrowserInterface
-include/qt4/QtDesigner/QDesignerTaskMenuExtension
-include/qt4/QtDesigner/QDesignerWidgetBoxInterface
-include/qt4/QtDesigner/QDesignerWidgetDataBaseInterface
-include/qt4/QtDesigner/QDesignerWidgetDataBaseItemInterface
-include/qt4/QtDesigner/QDesignerWidgetFactoryInterface
-include/qt4/QtDesigner/QExtensionFactory
-include/qt4/QtDesigner/QExtensionManager
-include/qt4/QtDesigner/QFormBuilder
-include/qt4/QtDesigner/QtDesigner
-include/qt4/QtDesigner/abstractactioneditor.h
-include/qt4/QtDesigner/abstractbrushmanager.h
-include/qt4/QtDesigner/abstractdnditem.h
-include/qt4/QtDesigner/abstractformbuilder.h
-include/qt4/QtDesigner/abstractformeditor.h
-include/qt4/QtDesigner/abstractformeditorplugin.h
-include/qt4/QtDesigner/abstractformwindow.h
-include/qt4/QtDesigner/abstractformwindowcursor.h
-include/qt4/QtDesigner/abstractformwindowmanager.h
-include/qt4/QtDesigner/abstractformwindowtool.h
-include/qt4/QtDesigner/abstracticoncache.h
-include/qt4/QtDesigner/abstractintegration.h
-include/qt4/QtDesigner/abstractlanguage.h
-include/qt4/QtDesigner/abstractmetadatabase.h
-include/qt4/QtDesigner/abstractobjectinspector.h
-include/qt4/QtDesigner/abstractpromotioninterface.h
-include/qt4/QtDesigner/abstractpropertyeditor.h
-include/qt4/QtDesigner/abstractresourcebrowser.h
-include/qt4/QtDesigner/abstractwidgetbox.h
-include/qt4/QtDesigner/abstractwidgetdatabase.h
-include/qt4/QtDesigner/abstractwidgetfactory.h
-include/qt4/QtDesigner/container.h
-include/qt4/QtDesigner/customwidget.h
-include/qt4/QtDesigner/default_extensionfactory.h
-include/qt4/QtDesigner/dynamicpropertysheet.h
-include/qt4/QtDesigner/extension.h
-include/qt4/QtDesigner/extension_global.h
-include/qt4/QtDesigner/extrainfo.h
-include/qt4/QtDesigner/formbuilder.h
-include/qt4/QtDesigner/layoutdecoration.h
-include/qt4/QtDesigner/membersheet.h
-include/qt4/QtDesigner/propertysheet.h
-include/qt4/QtDesigner/qdesigner_components.h
-include/qt4/QtDesigner/qdesigner_components_global.h
-include/qt4/QtDesigner/qdesignerexportwidget.h
-include/qt4/QtDesigner/qextensionmanager.h
-include/qt4/QtDesigner/sdk_global.h
-include/qt4/QtDesigner/taskmenu.h
-include/qt4/QtDesigner/uilib_global.h
-include/qt4/QtUiTools/QUiLoader
-include/qt4/QtUiTools/QtUiTools
-include/qt4/QtUiTools/quiloader.h
-lib/qt4/libQtDesigner.prl
-lib/qt4/libQtDesigner.so
-lib/qt4/libQtDesigner.so.4
-lib/qt4/libQtDesigner.so.%%SHLIB_SHVER%%
-lib/qt4/libQtDesigner.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtDesigner.so.%%SHLIB_VER%%.debug
-lib/qt4/libQtDesignerComponents.prl
-lib/qt4/libQtDesignerComponents.so
-lib/qt4/libQtDesignerComponents.so.4
-lib/qt4/libQtDesignerComponents.so.%%SHLIB_SHVER%%
-lib/qt4/libQtDesignerComponents.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtDesignerComponents.so.%%SHLIB_VER%%.debug
-lib/qt4/libQtUiTools.a
-lib/qt4/libQtUiTools.prl
-%%QT_PLUGINDIR_REL%%/designer/libphononwidgets.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libphononwidgets.so.debug
-%%QT_PLUGINDIR_REL%%/designer/libqdeclarativeview.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqdeclarativeview.so.debug
-%%QT_PLUGINDIR_REL%%/designer/libqt3supportwidgets.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqt3supportwidgets.so.debug
-%%QT_PLUGINDIR_REL%%/designer/libqwebview.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqwebview.so.debug
+%%QT_BINDIR%%/designer-qt4
+%%DEBUG%%%%QT_BINDIR%%/designer-qt4.debug
+%%QT_INCDIR%%/QtDesigner/QAbstractExtensionFactory
+%%QT_INCDIR%%/QtDesigner/QAbstractExtensionManager
+%%QT_INCDIR%%/QtDesigner/QAbstractFormBuilder
+%%QT_INCDIR%%/QtDesigner/QDesignerActionEditorInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerBrushManagerInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerComponents
+%%QT_INCDIR%%/QtDesigner/QDesignerContainerExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerCustomWidgetCollectionInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerCustomWidgetInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerDnDItemInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerDynamicPropertySheetExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerExportWidget
+%%QT_INCDIR%%/QtDesigner/QDesignerExtraInfoExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerFormEditorInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerFormEditorPluginInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerFormWindowCursorInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerFormWindowInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerFormWindowManagerInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerFormWindowToolInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerIconCacheInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerIntegrationInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerLanguageExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerLayoutDecorationExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerMemberSheetExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerMetaDataBaseInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerMetaDataBaseItemInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerObjectInspectorInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerPromotionInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerPropertyEditorInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerPropertySheetExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerResourceBrowserInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerTaskMenuExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerWidgetBoxInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerWidgetDataBaseInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerWidgetDataBaseItemInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerWidgetFactoryInterface
+%%QT_INCDIR%%/QtDesigner/QExtensionFactory
+%%QT_INCDIR%%/QtDesigner/QExtensionManager
+%%QT_INCDIR%%/QtDesigner/QFormBuilder
+%%QT_INCDIR%%/QtDesigner/QtDesigner
+%%QT_INCDIR%%/QtDesigner/abstractactioneditor.h
+%%QT_INCDIR%%/QtDesigner/abstractbrushmanager.h
+%%QT_INCDIR%%/QtDesigner/abstractdnditem.h
+%%QT_INCDIR%%/QtDesigner/abstractformbuilder.h
+%%QT_INCDIR%%/QtDesigner/abstractformeditor.h
+%%QT_INCDIR%%/QtDesigner/abstractformeditorplugin.h
+%%QT_INCDIR%%/QtDesigner/abstractformwindow.h
+%%QT_INCDIR%%/QtDesigner/abstractformwindowcursor.h
+%%QT_INCDIR%%/QtDesigner/abstractformwindowmanager.h
+%%QT_INCDIR%%/QtDesigner/abstractformwindowtool.h
+%%QT_INCDIR%%/QtDesigner/abstracticoncache.h
+%%QT_INCDIR%%/QtDesigner/abstractintegration.h
+%%QT_INCDIR%%/QtDesigner/abstractlanguage.h
+%%QT_INCDIR%%/QtDesigner/abstractmetadatabase.h
+%%QT_INCDIR%%/QtDesigner/abstractobjectinspector.h
+%%QT_INCDIR%%/QtDesigner/abstractpromotioninterface.h
+%%QT_INCDIR%%/QtDesigner/abstractpropertyeditor.h
+%%QT_INCDIR%%/QtDesigner/abstractresourcebrowser.h
+%%QT_INCDIR%%/QtDesigner/abstractwidgetbox.h
+%%QT_INCDIR%%/QtDesigner/abstractwidgetdatabase.h
+%%QT_INCDIR%%/QtDesigner/abstractwidgetfactory.h
+%%QT_INCDIR%%/QtDesigner/container.h
+%%QT_INCDIR%%/QtDesigner/customwidget.h
+%%QT_INCDIR%%/QtDesigner/default_extensionfactory.h
+%%QT_INCDIR%%/QtDesigner/dynamicpropertysheet.h
+%%QT_INCDIR%%/QtDesigner/extension.h
+%%QT_INCDIR%%/QtDesigner/extension_global.h
+%%QT_INCDIR%%/QtDesigner/extrainfo.h
+%%QT_INCDIR%%/QtDesigner/formbuilder.h
+%%QT_INCDIR%%/QtDesigner/layoutdecoration.h
+%%QT_INCDIR%%/QtDesigner/membersheet.h
+%%QT_INCDIR%%/QtDesigner/propertysheet.h
+%%QT_INCDIR%%/QtDesigner/qdesigner_components.h
+%%QT_INCDIR%%/QtDesigner/qdesigner_components_global.h
+%%QT_INCDIR%%/QtDesigner/qdesignerexportwidget.h
+%%QT_INCDIR%%/QtDesigner/qextensionmanager.h
+%%QT_INCDIR%%/QtDesigner/sdk_global.h
+%%QT_INCDIR%%/QtDesigner/taskmenu.h
+%%QT_INCDIR%%/QtDesigner/uilib_global.h
+%%QT_INCDIR%%/QtUiTools/QUiLoader
+%%QT_INCDIR%%/QtUiTools/QtUiTools
+%%QT_INCDIR%%/QtUiTools/quiloader.h
+%%QT_LIBDIR%%/libQtDesigner.prl
+%%QT_LIBDIR%%/libQtDesigner.so
+%%QT_LIBDIR%%/libQtDesigner.so.4
+%%QT_LIBDIR%%/libQtDesigner.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtDesigner.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtDesigner.so.%%FULLVER%%.debug
+%%QT_LIBDIR%%/libQtDesignerComponents.prl
+%%QT_LIBDIR%%/libQtDesignerComponents.so
+%%QT_LIBDIR%%/libQtDesignerComponents.so.4
+%%QT_LIBDIR%%/libQtDesignerComponents.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtDesignerComponents.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtDesignerComponents.so.%%FULLVER%%.debug
+%%QT_LIBDIR%%/libQtUiTools.a
+%%QT_LIBDIR%%/libQtUiTools.prl
+%%QT_PLUGINDIR%%/designer/libqdeclarativeview.so
+%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqdeclarativeview.so.debug
+%%QT_PLUGINDIR%%/designer/libqt3supportwidgets.so
+%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqt3supportwidgets.so.debug
+%%QT_PLUGINDIR%%/designer/libqwebview.so
+%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebview.so.debug
libdata/pkgconfig/QtDesigner.pc
libdata/pkgconfig/QtDesignerComponents.pc
libdata/pkgconfig/QtUiTools.pc
share/pixmaps/designer-qt4.png
- at dirrmtry %%QT_PLUGINDIR_REL%%/designer
- at dirrmtry %%QT_PLUGINDIR_REL%%
- at dirrmtry lib/qt4
- at dirrm include/qt4/QtUiTools
- at dirrm include/qt4/QtDesigner
- at dirrmtry include/qt4
More information about the Midnightbsd-cvs
mailing list