- Update to 0.3.2

PR:		ports/101596
Submitted by:	KATO Tsuguru <tkato432(at)yahoo.com>
Approved by:	krion (mentor)

3 files changed, 29 insertions, 53 deletions

diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile
index 12b1091dbd3..6a331779cd9 100644
--- a/graphics/fracplanet/Makefile
+++ b/graphics/fracplanet/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fracplanet
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,40 +14,48 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An interactive generator of planets and terrain
 
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake \
+		bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	boost_program_options.3:${PORTSDIR}/devel/boost
 
-USE_GL=		yes
-USE_QT_VER=	3
-USE_X_PREFIX=	yes
-MAKE_ENV=	QTDIR="${X11BASE}" QMAKESPEC="${QMAKESPEC}" VERSION_NUMBER="${PORTVERSION}"
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-QMAKE?=		${LOCALBASE}/bin/qmake
-QMAKESPEC?=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+USE_X_PREFIX=	yes
+USE_QT_VER=	3
+USE_GL=		yes
+USE_GMAKE=	yes
+MAKE_ENV=	QTDIR="${QT_PREFIX}" \
+		QMAKESPEC="${QMAKESPEC}" \
+		VERSION_NUMBER="${PORTVERSION}"
 
-PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	fracplanet.htm fracplanet.css
+PLIST_FILES=	bin/${PORTNAME}
+
+BASH?=		${LOCALBASE}/bin/bash
+QMAKE?=		${LOCALBASE}/bin/qmake
+QMAKESPEC?=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=		"Does not build on FreeBSD 4.x"
+BROKEN=		Does not build on FreeBSD 4.x
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|%%PREFIX%%|${PREFIX}|g; s|%%DOCSDIR%%|${DOCSDIR}|g' \
-		${WRKSRC}/${PORTNAME}.pro
+.for file in VERSION configure
+	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!${BASH}|g' ${WRKSRC}/${file}
+.endfor
 
 do-configure:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE}
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BASH} ./configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-
-.ifndef (NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/fracplanet/distinfo b/graphics/fracplanet/distinfo
index 58b5ec2c941..7cc7e0ebaed 100644
--- a/graphics/fracplanet/distinfo
+++ b/graphics/fracplanet/distinfo
@@ -1,3 +1,3 @@
-MD5 (fracplanet-0.2.0.tar.gz) = 16c2a59fc1614f1f1c69eff16d10a39e
-SHA256 (fracplanet-0.2.0.tar.gz) = fc9f0b411446d15992e72ba1e71ef191b725e52490e6bc606b80ff7f450cc8da
-SIZE (fracplanet-0.2.0.tar.gz) = 68440
+MD5 (fracplanet-0.3.2.tar.gz) = 3742656730f033081746d2da04c253ac
+SHA256 (fracplanet-0.3.2.tar.gz) = 5183793df54c0669b0119b040bde91b8b7aed5704c81c41e6e6cfc00819faed6
+SIZE (fracplanet-0.3.2.tar.gz) = 97730
diff --git a/graphics/fracplanet/files/patch-fracplanet.pro b/graphics/fracplanet/files/patch-fracplanet.pro
deleted file mode 100644
index 4d0350ba7f0..00000000000
--- a/graphics/fracplanet/files/patch-fracplanet.pro
+++ /dev/null
@@ -1,32 +0,0 @@
---- fracplanet.pro.orig
-+++ fracplanet.pro
-@@ -1,15 +1,15 @@
- TEMPLATE = app
- 
- # append debug or release
--CONFIG+= qt opengl debug # release
-+CONFIG+= qt opengl release # debug
- 
- #######################################
- # Installation 
- 
- INSTALLS += executable documentation
--executable.path = /usr/local/bin
-+executable.path = %%PREFIX%%/bin
- executable.files = fracplanet 
--documentation.path = /usr/local/share/doc/fracplanet
-+documentation.path = %%DOCSDIR%%
- documentation.files = fracplanet.htm fracplanet.css
- 
- ##################
-@@ -17,8 +17,8 @@
- # Now leaving these ON for general distribution
- # -funroll-loops unproven 
- 
--QMAKE_CXXFLAGS_RELEASE -= -O2
--QMAKE_CXXFLAGS_RELEASE += -O3 -fomit-frame-pointer -ffast-math 
-+#QMAKE_CXXFLAGS_RELEASE -= -O2
-+#QMAKE_CXXFLAGS_RELEASE += -O3 -fomit-frame-pointer -ffast-math 
- 
- ##################
- # Architecture specific optimisations