ports/113254: maintainer update: math/qtiplot and dependencies (part 3)

Sat Jun 2 13:20:04 UTC 2007

>Number:         113254
>Category:       ports
>Synopsis:       maintainer update: math/qtiplot and dependencies (part 3)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 02 13:20:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
FreeBSD luna.dio.ru 6.2-STABLE FreeBSD 6.2-STABLE #1: Sun Apr 29 09:40:21 MSD 2007     root at luna:/usr/obj/usr/src/sys/LUNA  i386
>Description:
Update QtiPlot to 0.9-rc2. Changes:
Migrate from Qt 3 to Qt 4.2.
Added support for antialiasing.
It is now possible to plot only a partial row range of a data column.
More symbols for text labels.
Improved printing and export of 2D plots to PDF, EPS and PS.
Full import of Origin 7.5 project files.
Lots of bug fixes and improvements.
-----------------------------------------
Update liborigin to 20070529. Changes:
Full support of 7.5 projects.
Support Origins's standdalone file formats: *.ogw (worksheet) and *.ogm (matrix).
-----------------------------------------
New port qwtplot3d-qt4-0.2.6 - qt4 version of qwtplot3d.
-----------------------------------------
Switch qwt-devel from qt3 to qt4.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN --exclude=CVS /usr/ports/x11-toolkits/qwt-devel/Makefile /home/makc/porting/ports/x11-toolkits/qwt-devel/Makefile

--- /usr/ports/x11-toolkits/qwt-devel/Makefile	Sun May 20 00:31:56 2007
+++ /home/makc/porting/ports/x11-toolkits/qwt-devel/Makefile	Tue May 29 01:34:07 2007
@@ -7,7 +7,7 @@
 
 PORTNAME=	qwt
 PORTVERSION=	5.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-devel
@@ -15,39 +15,42 @@
 MAINTAINER=	makc at issp.ac.ru
 COMMENT=	Qt Widgets for Technical Applications
 
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-
 CONFLICTS=	qwt-4.*
 
-USE_QT_VER=	3
+USE_QT_VER=	4
+QT_COMPONENTS=	gui moc qmake
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	QTDIR="${QT_PREFIX}"
+HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS=	DESIGNER_PLUGIN "Install plugin for Qt Designer" on
 
-QMAKE=		qmake
-QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-PLUGINDIR=	${PREFIX}/lib/kde3/plugins/designer
+PLUGINDIR=	${PREFIX}/lib/plugins/designer
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.man>
 
+QPRO_DIRS=	src
 .if !defined(WITHOUT_DESIGNER_PLUGIN)
+QPRO_DIRS+=	designer
+#QT_COMPONENTS+=	designer xml
+LIB_DEPENDS+=	QtXml:${PORTSDIR}/textproc/qt4-xml \
+		QtDesigner:${PORTSDIR}/devel/qt4-designer
 PLIST_SUB+=	DESIGNER_PLUGIN=""
 .else
 PLIST_SUB+=	DESIGNER_PLUGIN="@comment "
 .endif
 
-QPRO_DIRS=	src
-.if !defined(WITHOUT_DESIGNER_PLUGIN)
-QPRO_DIRS+=	designer
-.endif
+do-configure:
+.for d in ${QPRO_DIRS}
+	(cd ${WRKSRC}/${d} && ${SETENV} ${CONFIGURE_ENV} \
+		${QMAKE} -unix PREFIX=${PREFIX})
+.endfor
 
-do-build:
+post-configure:
 .for d in ${QPRO_DIRS}
-	(cd ${WRKSRC}/${d} && ${QMAKE} -spec ${QMAKESPEC} && \
+	(cd ${WRKSRC}/${d} && \
 	${REINPLACE_CMD} -e \
 		's|^CC .*|CC=${CC}|; \
 		 s|^CXX .*|CXX=${CXX}|; \
@@ -55,23 +58,27 @@
 		 s|-pipe||; \
 		 s|^\(CFLAGS .*= \)|\1${CFLAGS}|; \
 		 s|^\(CXXFLAGS = \)|\1${CXXFLAGS}|' \
-		${WRKSRC}/${d}/Makefile && \
-	${SETENV} ${MAKE_ENV} ${GMAKE})
+		${WRKSRC}/${d}/Makefile)
+.endfor
+
+do-build:
+.for d in ${QPRO_DIRS}
+	(cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${GMAKE})
 .endfor
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/libqwt.so.5.0.0 ${PREFIX}/lib/libqwt.so.5
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqwt.so.5.0.0 ${PREFIX}/lib/libqwt.so.5
 	${LN} -fs ${PREFIX}/lib/libqwt.so.5 ${PREFIX}/lib/libqwt.so
-	${MKDIR} ${PREFIX}/include/qwt && \
-	${INSTALL_DATA} ${WRKSRC}/src/*.h ${PREFIX}/include/qwt
+	#${MKDIR} ${PREFIX}/include/qwt && \
+	#${INSTALL_DATA} ${WRKSRC}/src/*.h ${PREFIX}/include/qwt
+	(cd ${WRKSRC}/src/ && ${COPYTREE_SHARE} '*.h' ${PREFIX}/include/${PORTNAME})
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/Qwt* ${PREFIX}/man/man3
 .if !defined(WITHOUT_DESIGNER_PLUGIN)
 	${MKDIR} ${PLUGINDIR} && \
-	${INSTALL_DATA} ${WRKSRC}/designer/plugins/designer/libqwtplugin.so ${PLUGINDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/designer/plugins/designer/libqwt_designer_plugin.so ${PLUGINDIR}
 .endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/qwt && \
-	${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/qwt
+	(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/qwt-devel/pkg-plist /home/makc/porting/ports/x11-toolkits/qwt-devel/pkg-plist
--- /usr/ports/x11-toolkits/qwt-devel/pkg-plist	Sun Jan 28 20:42:32 2007
+++ /home/makc/porting/ports/x11-toolkits/qwt-devel/pkg-plist	Tue May 29 00:57:53 2007
@@ -66,7 +66,7 @@
 include/qwt/qwt_wheel.h
 lib/libqwt.so
 lib/libqwt.so.5
-%%DESIGNER_PLUGIN%%lib/kde3/plugins/designer/libqwtplugin.so
+%%DESIGNER_PLUGIN%%lib/plugins/designer/libqwt_designer_plugin.so
 %%PORTDOCS%%%%DOCSDIR%%/analogclock.png
 %%PORTDOCS%%%%DOCSDIR%%/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_scale-members.html
@@ -902,7 +902,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/tabs.css
 %%PORTDOCS%%%%DOCSDIR%%/todo.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DESIGNER_PLUGIN%%@dirrmtry lib/kde3/plugins/designer/
-%%DESIGNER_PLUGIN%%@dirrmtry lib/kde3/plugins/
-%%DESIGNER_PLUGIN%%@dirrmtry lib/kde3/
+%%DESIGNER_PLUGIN%%@dirrmtry lib/plugins/designer
+%%DESIGNER_PLUGIN%%@dirrmtry lib/plugins
 @dirrm include/qwt


>Release-Note:
>Audit-Trail:
>Unformatted:

