- Move to ${LOCALBASE}

- INSTALLS_SHLIB -> USE_LDCONFIG
- Use COPYTREE macro
- Use static pkg-plist

PR:		111730
Submitted by:	Max Brazhnikov<makc@issp.ac.ru> (maintainer)

4 files changed, 178 insertions, 20 deletions

diff --git a/math/qwtplot3d-qt4/Makefile b/math/qwtplot3d-qt4/Makefile
index 525a1f5f4643..98fa5be3c3cb 100644
--- a/math/qwtplot3d-qt4/Makefile
+++ b/math/qwtplot3d-qt4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	qwtplot3d
 PORTVERSION=	0.2.6
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,11 +20,9 @@ COMMENT=	A 3D plotting widget for scientific data and mathematical expressions
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
 USE_QT_VER=	3
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
-MAKE_ENV=	QTDIR=${QT_PREFIX} \
-		MOC=${MOC}
-INSTALLS_SHLIB=	yes
+MAKE_ENV=	QTDIR=${QT_PREFIX}
+USE_LDCONFIG=	yes
 
 pre-build:
 	@cd ${WRKSRC}; qmake -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ ${PORTNAME}.pro
@@ -34,12 +33,8 @@ do-install:
 	${LN} -fs ${PREFIX}/lib/libqwtplot3d.so.${PORTVERSION} ${PREFIX}/lib/libqwtplot3d.so.0
 	${LN} -fs ${PREFIX}/lib/libqwtplot3d.so.${PORTVERSION} ${PREFIX}/lib/libqwtplot3d.so
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
-	@${FIND} ${EXAMPLESDIR} ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/qwtplot3d-qt4/pkg-plist b/math/qwtplot3d-qt4/pkg-plist
index 9cc5eee175ef..7c9206dd4c52 100644
--- a/math/qwtplot3d-qt4/pkg-plist
+++ b/math/qwtplot3d-qt4/pkg-plist
@@ -29,3 +29,87 @@ include/qwt3d_volumeplot.h
 lib/libqwtplot3d.so
 lib/libqwtplot3d.so.0
 lib/libqwtplot3d.so.0.2.6
+%%PORTDOCS%%%%EXAMPLESDIR%%/autoswitch/autoswitch.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/autoswitch/autoswitch.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/autoswitch/autoswitch.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/axes.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axes.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axesmainwindow.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axesmainwindow.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axesmainwindowbase.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axesmainwindowbase4.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/main.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/box.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/common.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/dsp.bat
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/enrichments.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichmentmainwindow.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichmentmainwindow.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichmentmainwindowbase.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichmentmainwindowbase4.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichments.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichments.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/main.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/examples.dsw
+%%PORTDOCS%%%%EXAMPLESDIR%%/examples.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/examples.sln
+%%PORTDOCS%%%%EXAMPLESDIR%%/filecell.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/fileopen.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/filledmesh.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/floordata.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/floorempty.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/flooriso.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/floormesh.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/frame.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/grid.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/gridb.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/gridc.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/gridf.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/gridfr.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/gridl.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/gridr.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/hiddenline.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/icon.ico
+%%PORTDOCS%%%%EXAMPLESDIR%%/icon.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/icon.rc
+%%PORTDOCS%%%%EXAMPLESDIR%%/images.qrc
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/mesh2.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/colormapreader.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/colormapreader.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/designerworkaround.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/designerworkaround.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/femreader.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/functions.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlg.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlg.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlgbase.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlgbase4.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlgbaseimpl.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlgbaseimpl.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/main.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh2mainwindow.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh2mainwindow.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh2mainwindowbase.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh2mainwindowbase4.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/thesis.tex
+%%PORTDOCS%%%%EXAMPLESDIR%%/movie.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/nodata.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/none.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/normals.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/polygon.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/qwtplot.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/savecontent.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/scattered.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/simpleplot/simpleplot.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/simpleplot/simpleplot.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/wireframe.png
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/simpleplot
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mesh2/src
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mesh2
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/enrichments/src
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/enrichments
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/axes/src
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/axes
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/autoswitch
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/math/qwtplot3d/Makefile b/math/qwtplot3d/Makefile
index 525a1f5f4643..98fa5be3c3cb 100644
--- a/math/qwtplot3d/Makefile
+++ b/math/qwtplot3d/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	qwtplot3d
 PORTVERSION=	0.2.6
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,11 +20,9 @@ COMMENT=	A 3D plotting widget for scientific data and mathematical expressions
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
 USE_QT_VER=	3
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
-MAKE_ENV=	QTDIR=${QT_PREFIX} \
-		MOC=${MOC}
-INSTALLS_SHLIB=	yes
+MAKE_ENV=	QTDIR=${QT_PREFIX}
+USE_LDCONFIG=	yes
 
 pre-build:
 	@cd ${WRKSRC}; qmake -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ ${PORTNAME}.pro
@@ -34,12 +33,8 @@ do-install:
 	${LN} -fs ${PREFIX}/lib/libqwtplot3d.so.${PORTVERSION} ${PREFIX}/lib/libqwtplot3d.so.0
 	${LN} -fs ${PREFIX}/lib/libqwtplot3d.so.${PORTVERSION} ${PREFIX}/lib/libqwtplot3d.so
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
-	@${FIND} ${EXAMPLESDIR} ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/qwtplot3d/pkg-plist b/math/qwtplot3d/pkg-plist
index 9cc5eee175ef..7c9206dd4c52 100644
--- a/math/qwtplot3d/pkg-plist
+++ b/math/qwtplot3d/pkg-plist
@@ -29,3 +29,87 @@ include/qwt3d_volumeplot.h
 lib/libqwtplot3d.so
 lib/libqwtplot3d.so.0
 lib/libqwtplot3d.so.0.2.6
+%%PORTDOCS%%%%EXAMPLESDIR%%/autoswitch/autoswitch.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/autoswitch/autoswitch.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/autoswitch/autoswitch.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/axes.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axes.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axesmainwindow.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axesmainwindow.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axesmainwindowbase.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/axesmainwindowbase4.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/axes/src/main.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/box.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/common.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/dsp.bat
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/enrichments.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichmentmainwindow.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichmentmainwindow.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichmentmainwindowbase.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichmentmainwindowbase4.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichments.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/enrichments.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/enrichments/src/main.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/examples.dsw
+%%PORTDOCS%%%%EXAMPLESDIR%%/examples.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/examples.sln
+%%PORTDOCS%%%%EXAMPLESDIR%%/filecell.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/fileopen.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/filledmesh.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/floordata.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/floorempty.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/flooriso.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/floormesh.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/frame.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/grid.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/gridb.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/gridc.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/gridf.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/gridfr.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/gridl.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/gridr.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/hiddenline.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/icon.ico
+%%PORTDOCS%%%%EXAMPLESDIR%%/icon.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/icon.rc
+%%PORTDOCS%%%%EXAMPLESDIR%%/images.qrc
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/mesh2.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/colormapreader.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/colormapreader.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/designerworkaround.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/designerworkaround.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/femreader.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/functions.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlg.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlg.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlgbase.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlgbase4.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlgbaseimpl.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/lightingdlgbaseimpl.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/main.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh2mainwindow.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh2mainwindow.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh2mainwindowbase.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/mesh2mainwindowbase4.ui
+%%PORTDOCS%%%%EXAMPLESDIR%%/mesh2/src/thesis.tex
+%%PORTDOCS%%%%EXAMPLESDIR%%/movie.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/nodata.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/none.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/normals.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/polygon.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/qwtplot.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/savecontent.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/scattered.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/simpleplot/simpleplot.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/simpleplot/simpleplot.pro
+%%PORTDOCS%%%%EXAMPLESDIR%%/wireframe.png
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/simpleplot
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mesh2/src
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mesh2
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/enrichments/src
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/enrichments
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/axes/src
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/axes
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/autoswitch
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%