- Update to 0.3.2

PR:		130468
Submitted by:	Ports Fury

3 files changed, 20 insertions, 56 deletions

diff --git a/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile
index f42e307e8de8..1ca2628e0b85 100644
--- a/graphics/meshviewer/Makefile
+++ b/graphics/meshviewer/Makefile
@@ -6,41 +6,36 @@
 # $FreeBSD$
 
 PORTNAME=	meshviewer
-PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTVERSION=	0.3.2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	mview
+MASTER_SITES=	SF/mview
 DISTNAME=	mview-src-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mesh Viewer
 
-USE_QT_VER=	3
-USE_GL=		yes
-USE_GMAKE=	yes
-MAKE_ENV=	MOC="${MOC}" \
-		QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
-		QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}"
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib gui opengl moc_build qmake_build
+
+PORTDOCS=	*
+PLIST_FILES=	bin/mview
+
+post-extract:
+	@${RM} -f ${WRKSRC}/qt4/*.moc.cpp
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|^INCPATH +=.*$$|INCPATH += $${QTCPPFLAGS}|g ; \
-		 s|^LIBPATH =|#LIBPATH =|g ; \
-		 s|^LIBPATH +=.*$$|LIBPATH += $${QTCFGLIBS}|g ; \
-		 s|=g\+\+|=$${CXX}|g ; \
-		 s|^MOC=|#MOC=|g ; \
-		 s|-O2|$${CXXFLAGS}|g ; \
-		 s|make |$$(MAKE) |g' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e \
-		's|<values\.h>|<climits>|g' ${WRKSRC}/mesh/mesh.cpp
+	@${ECHO_CMD} "QT += opengl" >> ${WRKSRC}/mview.pro
+	@${REINPLACE_CMD} -e 's|<values.h>|<cmath>|g' ${WRKSRC}/mesh/mesh.cpp
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${QMAKE} -spec ${QMAKESPEC} GUI="QT4"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mview ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/Documentation && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	@(cd ${WRKSRC}/Documentation && ${COPYTREE_SHARE} . ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/meshviewer/distinfo b/graphics/meshviewer/distinfo
index f73fe66ee892..97cbd1319593 100644
--- a/graphics/meshviewer/distinfo
+++ b/graphics/meshviewer/distinfo
@@ -1,3 +1,3 @@
-MD5 (mview-src-0.3.1.tar.gz) = 6a573dd8bd7f50216618f42fe790f2d9
-SHA256 (mview-src-0.3.1.tar.gz) = 92be875a1e99460da8ae3ebdbe7f1e3c03aac4f3e52a6e73a419483d6fda0867
-SIZE (mview-src-0.3.1.tar.gz) = 450508
+MD5 (mview-src-0.3.2.tar.gz) = 1d76ba66a6fbd87b1b33028776ae0fb4
+SHA256 (mview-src-0.3.2.tar.gz) = 1ccc024f7ab33ae42b5479394b56f8a1ada28db9f099a1efd61d95fad9880a65
+SIZE (mview-src-0.3.2.tar.gz) = 455124
diff --git a/graphics/meshviewer/pkg-plist b/graphics/meshviewer/pkg-plist
deleted file mode 100644
index 5ab54ec7c798..000000000000
--- a/graphics/meshviewer/pkg-plist
+++ /dev/null
@@ -1,31 +0,0 @@
-bin/mview
-%%PORTDOCS%%%%DOCSDIR%%/build.html
-%%PORTDOCS%%%%DOCSDIR%%/bunny.html
-%%PORTDOCS%%%%DOCSDIR%%/calc_text_map.html
-%%PORTDOCS%%%%DOCSDIR%%/castle.html
-%%PORTDOCS%%%%DOCSDIR%%/changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/formats.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/mummy.html
-%%PORTDOCS%%%%DOCSDIR%%/pics/bigben_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/bunny.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/bunny_normals.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/bunny_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/bunny_solid.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/bunny_wire.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/castle.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/castle_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/castle_solid.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/castle_text1.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/castle_text2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/mapping1.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/mapping2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/mesh_title.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/mummy.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/mummy_points.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/mummy_text.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/mummy_wire.jpg
-%%PORTDOCS%%%%DOCSDIR%%/pics/totem_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pics
-%%PORTDOCS%%@dirrm %%DOCSDIR%%