mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-20 08:27:15 +00:00
Code Issues Releases Activity

1. Chase latest update of Qt, install designer plugin into a new place

Browse Source 
2. Use buildtime qt-components switches
3. Bump PORTREVISION

PR:		116143
Submitted by:	Max Brazhnikov <makc@issp.ac.ru> (maintainer)
This commit is contained in:
Martin Wilke 2007-09-06 21:50:28 +00:00
parent 4b3d6b9593
commit 830f2ec52f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=198948
6 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x11-toolkits/qwt-devel/Makefile
View File

@ -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

2
x11-toolkits/qwt-devel/pkg-plist
View File

@ -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

12
x11-toolkits/qwt5/Makefile
View File

@ -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

2
x11-toolkits/qwt5/pkg-plist
View File

@ -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

12
x11-toolkits/qwt6/Makefile
View File

@ -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

2
x11-toolkits/qwt6/pkg-plist
View File

@ -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