diff options
| -rw-r--r-- | x11-toolkits/qwt-devel/Makefile | 12 | ||||
| -rw-r--r-- | x11-toolkits/qwt-devel/pkg-plist | 2 | ||||
| -rw-r--r-- | x11-toolkits/qwt5/Makefile | 12 | ||||
| -rw-r--r-- | x11-toolkits/qwt5/pkg-plist | 2 | ||||
| -rw-r--r-- | x11-toolkits/qwt6/Makefile | 12 | ||||
| -rw-r--r-- | x11-toolkits/qwt6/pkg-plist | 2 |
6 files changed, 18 insertions, 24 deletions
diff --git a/x11-toolkits/qwt-devel/Makefile b/x11-toolkits/qwt-devel/Makefile index cccf7637d327..9efa16f43143 100644 --- a/x11-toolkits/qwt-devel/Makefile +++ b/x11-toolkits/qwt-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= qwt PORTVERSION= 5.0.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF PKGNAMESUFFIX= -devel @@ -17,7 +18,7 @@ COMMENT= Qt Widgets for Technical Applications CONFLICTS= qwt-4.* USE_QT_VER= 4 -QT_COMPONENTS= gui moc qmake +QT_COMPONENTS= gui moc_build qmake_build USE_BZIP2= yes USE_GMAKE= yes HAS_CONFIGURE= yes @@ -25,7 +26,7 @@ USE_LDCONFIG= yes OPTIONS= DESIGNER_PLUGIN "Install plugin for Qt Designer" on -PLUGINDIR= ${PREFIX}/lib/plugins/designer +PLUGINDIR= ${PREFIX}/lib/qt4/plugins/designer .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.man> @@ -33,7 +34,7 @@ PLUGINDIR= ${PREFIX}/lib/plugins/designer QPRO_DIRS= src .if !defined(WITHOUT_DESIGNER_PLUGIN) QPRO_DIRS+= designer -#QT_COMPONENTS+= designer xml rcc +#QT_COMPONENTS+= designer xml rcc_build BUILD_DEPENDS+= ${LOCALBASE}/bin/rcc:${PORTSDIR}/devel/qt4-rcc LIB_DEPENDS+= QtXml:${PORTSDIR}/textproc/qt4-xml \ QtDesigner:${PORTSDIR}/devel/qt4-designer @@ -54,10 +55,7 @@ post-configure: ${REINPLACE_CMD} -e \ 's|^CC .*|CC=${CC}|; \ s|^CXX .*|CXX=${CXX}|; \ - s|^LINK .*|LINK=${CXX}|; \ - s|-pipe||; \ - s|^\(CFLAGS .*= \)|\1${CFLAGS}|; \ - s|^\(CXXFLAGS = \)|\1${CXXFLAGS}|' \ + s|^LINK .*|LINK=${CXX}|' \ ${WRKSRC}/${d}/Makefile) .endfor diff --git a/x11-toolkits/qwt-devel/pkg-plist b/x11-toolkits/qwt-devel/pkg-plist index ea7d03b98497..a9da93c13fbb 100644 --- a/x11-toolkits/qwt-devel/pkg-plist +++ b/x11-toolkits/qwt-devel/pkg-plist @@ -66,7 +66,7 @@ include/qwt/qwt_valuelist.h include/qwt/qwt_wheel.h lib/libqwt.so lib/libqwt.so.5 -%%DESIGNER_PLUGIN%%lib/plugins/designer/libqwt_designer_plugin.so +%%DESIGNER_PLUGIN%%lib/qt4/plugins/designer/libqwt_designer_plugin.so %%PORTDOCS%%%%DOCSDIR%%/analogclock.png %%PORTDOCS%%%%DOCSDIR%%/annotated.html %%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_scale-members.html diff --git a/x11-toolkits/qwt5/Makefile b/x11-toolkits/qwt5/Makefile index cccf7637d327..9efa16f43143 100644 --- a/x11-toolkits/qwt5/Makefile +++ b/x11-toolkits/qwt5/Makefile @@ -7,6 +7,7 @@ PORTNAME= qwt PORTVERSION= 5.0.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF PKGNAMESUFFIX= -devel @@ -17,7 +18,7 @@ COMMENT= Qt Widgets for Technical Applications CONFLICTS= qwt-4.* USE_QT_VER= 4 -QT_COMPONENTS= gui moc qmake +QT_COMPONENTS= gui moc_build qmake_build USE_BZIP2= yes USE_GMAKE= yes HAS_CONFIGURE= yes @@ -25,7 +26,7 @@ USE_LDCONFIG= yes OPTIONS= DESIGNER_PLUGIN "Install plugin for Qt Designer" on -PLUGINDIR= ${PREFIX}/lib/plugins/designer +PLUGINDIR= ${PREFIX}/lib/qt4/plugins/designer .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.man> @@ -33,7 +34,7 @@ PLUGINDIR= ${PREFIX}/lib/plugins/designer QPRO_DIRS= src .if !defined(WITHOUT_DESIGNER_PLUGIN) QPRO_DIRS+= designer -#QT_COMPONENTS+= designer xml rcc +#QT_COMPONENTS+= designer xml rcc_build BUILD_DEPENDS+= ${LOCALBASE}/bin/rcc:${PORTSDIR}/devel/qt4-rcc LIB_DEPENDS+= QtXml:${PORTSDIR}/textproc/qt4-xml \ QtDesigner:${PORTSDIR}/devel/qt4-designer @@ -54,10 +55,7 @@ post-configure: ${REINPLACE_CMD} -e \ 's|^CC .*|CC=${CC}|; \ s|^CXX .*|CXX=${CXX}|; \ - s|^LINK .*|LINK=${CXX}|; \ - s|-pipe||; \ - s|^\(CFLAGS .*= \)|\1${CFLAGS}|; \ - s|^\(CXXFLAGS = \)|\1${CXXFLAGS}|' \ + s|^LINK .*|LINK=${CXX}|' \ ${WRKSRC}/${d}/Makefile) .endfor diff --git a/x11-toolkits/qwt5/pkg-plist b/x11-toolkits/qwt5/pkg-plist index ea7d03b98497..a9da93c13fbb 100644 --- a/x11-toolkits/qwt5/pkg-plist +++ b/x11-toolkits/qwt5/pkg-plist @@ -66,7 +66,7 @@ include/qwt/qwt_valuelist.h include/qwt/qwt_wheel.h lib/libqwt.so lib/libqwt.so.5 -%%DESIGNER_PLUGIN%%lib/plugins/designer/libqwt_designer_plugin.so +%%DESIGNER_PLUGIN%%lib/qt4/plugins/designer/libqwt_designer_plugin.so %%PORTDOCS%%%%DOCSDIR%%/analogclock.png %%PORTDOCS%%%%DOCSDIR%%/annotated.html %%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_scale-members.html diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile index cccf7637d327..9efa16f43143 100644 --- a/x11-toolkits/qwt6/Makefile +++ b/x11-toolkits/qwt6/Makefile @@ -7,6 +7,7 @@ PORTNAME= qwt PORTVERSION= 5.0.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF PKGNAMESUFFIX= -devel @@ -17,7 +18,7 @@ COMMENT= Qt Widgets for Technical Applications CONFLICTS= qwt-4.* USE_QT_VER= 4 -QT_COMPONENTS= gui moc qmake +QT_COMPONENTS= gui moc_build qmake_build USE_BZIP2= yes USE_GMAKE= yes HAS_CONFIGURE= yes @@ -25,7 +26,7 @@ USE_LDCONFIG= yes OPTIONS= DESIGNER_PLUGIN "Install plugin for Qt Designer" on -PLUGINDIR= ${PREFIX}/lib/plugins/designer +PLUGINDIR= ${PREFIX}/lib/qt4/plugins/designer .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.man> @@ -33,7 +34,7 @@ PLUGINDIR= ${PREFIX}/lib/plugins/designer QPRO_DIRS= src .if !defined(WITHOUT_DESIGNER_PLUGIN) QPRO_DIRS+= designer -#QT_COMPONENTS+= designer xml rcc +#QT_COMPONENTS+= designer xml rcc_build BUILD_DEPENDS+= ${LOCALBASE}/bin/rcc:${PORTSDIR}/devel/qt4-rcc LIB_DEPENDS+= QtXml:${PORTSDIR}/textproc/qt4-xml \ QtDesigner:${PORTSDIR}/devel/qt4-designer @@ -54,10 +55,7 @@ post-configure: ${REINPLACE_CMD} -e \ 's|^CC .*|CC=${CC}|; \ s|^CXX .*|CXX=${CXX}|; \ - s|^LINK .*|LINK=${CXX}|; \ - s|-pipe||; \ - s|^\(CFLAGS .*= \)|\1${CFLAGS}|; \ - s|^\(CXXFLAGS = \)|\1${CXXFLAGS}|' \ + s|^LINK .*|LINK=${CXX}|' \ ${WRKSRC}/${d}/Makefile) .endfor diff --git a/x11-toolkits/qwt6/pkg-plist b/x11-toolkits/qwt6/pkg-plist index ea7d03b98497..a9da93c13fbb 100644 --- a/x11-toolkits/qwt6/pkg-plist +++ b/x11-toolkits/qwt6/pkg-plist @@ -66,7 +66,7 @@ include/qwt/qwt_valuelist.h include/qwt/qwt_wheel.h lib/libqwt.so lib/libqwt.so.5 -%%DESIGNER_PLUGIN%%lib/plugins/designer/libqwt_designer_plugin.so +%%DESIGNER_PLUGIN%%lib/qt4/plugins/designer/libqwt_designer_plugin.so %%PORTDOCS%%%%DOCSDIR%%/analogclock.png %%PORTDOCS%%%%DOCSDIR%%/annotated.html %%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_scale-members.html |