ports/116143: maintainer fix: x11-toolkits/qwt-devel

[Max Brazhnikov]

>Number:         116143
>Category:       ports
>Synopsis:       maintainer fix: x11-toolkits/qwt-devel
>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:   Thu Sep 06 07:40:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
FreeBSD lqc.issp.ac.ru 6.2-STABLE FreeBSD 6.2-STABLE #0: Thu Aug  9 04:28:24 MSD 2007     makc at lqc.issp.ac.ru:/usr/obj/usr/src/sys/LQC  i386
>Description:
1. Chase latest update of Qt, install designer plugin into a new place
2. Use buildtime qt-components switches
>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	2007-07-30 22:04:47.000000000 +0400
+++ /home/makc/porting/ports/x11-toolkits/qwt-devel/Makefile	2007-09-04 21:34:57.000000000 +0400
@@ -7,6 +7,7 @@
 
 PORTNAME=	qwt
 PORTVERSION=	5.0.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-devel
@@ -17,7 +18,7 @@
 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 @@
 
 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 @@
 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 @@
 	${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 -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	2007-06-15 13:35:03.000000000 +0400
+++ /home/makc/porting/ports/x11-toolkits/qwt-devel/pkg-plist	2007-09-04 20:45:37.000000000 +0400
@@ -66,7 +66,7 @@
 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


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