Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Nov 2012 00:41:00 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/173542: [PATCH] graphics/fracplanet: take maintainership, Makefile changed, OptionsNG, added Desktop entries, doxygen
Message-ID:  <20121110234104.756E9DE4@hub.freebsd.org>
Resent-Message-ID: <201211102350.qAANo1GW050658@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         173542
>Category:       ports
>Synopsis:       [PATCH] graphics/fracplanet: take maintainership, Makefile changed, OptionsNG, added Desktop entries, doxygen
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 10 23:50:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

- Take maintainership

Makefile changed:
+MASTER_SITES=	SF \
+		SF/nemysisfreebsdp/:icons
+DISTFILES=
+LICENSE=	GPLv2
+PLIST_FILES=	bin/${PORTNAME} \
+		share/pixmaps/${PORTNAME}.png
+PORTDOCS=	*
+DOCSRCDIR1=
+DOC_FILES1=
+DESKTOP_ENTRIES=
+OPTIONS_DEFINE=	DOXYGEN HTML LATEX
+.include <bsd.port.options.mk>
+post-install:
-WWW:	

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:

portlint -A
looks fine.

port test: clean

Can't give build log, because RedPorts not works at the time.

>Fix:

--- fracplanet-0.4.0_4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/fracplanet/Makefile ./Makefile
--- /usr/ports/graphics/fracplanet/Makefile	2012-06-06 08:43:51.000000000 +0200
+++ ./Makefile	2012-11-11 00:28:47.000000000 +0100
@@ -7,21 +7,27 @@
 
 PORTNAME=	fracplanet
 PORTVERSION=	0.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
-MASTER_SITES=	SF
+MASTER_SITES=	SF \
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An interactive generator of planets and terrain
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	Interactive tool for creating random fractal planets and terrain
+
+LICENSE=	GPLv2
 
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	boost_program_options.4:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	boost_filesystem:${PORTSDIR}/devel/boost-libs
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GL=		glu
-USE_QT4=	corelib gui opengl \
-		moc_build qmake_build
+USE_QT4=	moc_build qmake_build corelib gui opengl
 QT_NONSTANDARD=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
@@ -29,23 +35,57 @@
 USE_GMAKE=	yes
 
 MAN1=		${PORTNAME}.1
-PORTDOCS=	${PORTNAME}.css ${PORTNAME}.htm
-PLIST_FILES=	bin/${PORTNAME}
+
+PLIST_FILES=	bin/${PORTNAME} \
+		share/pixmaps/${PORTNAME}.png
+
+PORTDOCS=	*
+
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	 BUGS NEWS README THANKS TODO ${PORTNAME}.css ${PORTNAME}.htm
+
+DESKTOP_ENTRIES="Fracplanet" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Application;Graphics;" ${FALSE}
+
+OPTIONS_DEFINE=	DOXYGEN HTML LATEX
+
+HTML_DESC=	Install HTML Doxygen files
+LATEX_DESC=	Install LaTeX Doxygen files
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOXYGEN}
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+.endif
 
 post-patch:
-.for file in BUILD VERSION configure
-	@${REINPLACE_CMD} -e \
-		'/^#!/s|/.*bash|/bin/sh|g' ${WRKSRC}/${file}
+.for f in BUILD VERSION configure mkdeb mktgz testtgz
+	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' \
+		${WRKSRC}/${f}
 .endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+
+post-install:
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MHTML} | ${PORT_OPTIONS:MLATEX}
+	@cd ${WRKSRC} && doxygen .
+.endif
+
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MHTML}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${DOCSDIR})
+.endif
+
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MLATEX}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} latex ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/fracplanet/distinfo ./distinfo
--- /usr/ports/graphics/fracplanet/distinfo	2011-07-03 16:11:12.000000000 +0200
+++ ./distinfo	2012-11-11 00:18:30.000000000 +0100
@@ -1,2 +1,4 @@
-SHA256 (fracplanet-0.4.0.tar.gz) = 38d56aba3c5cf19d4f2c218bece471d3860b161d2210a24ba94550356723482a
-SIZE (fracplanet-0.4.0.tar.gz) = 101700
+SHA256 (fracplanet/fracplanet-0.4.0.tar.gz) = 38d56aba3c5cf19d4f2c218bece471d3860b161d2210a24ba94550356723482a
+SIZE (fracplanet/fracplanet-0.4.0.tar.gz) = 101700
+SHA256 (fracplanet/fracplanet.png) = db52f37fe1cce2be28056f7b1ca51d8bf141113f4acbf66383455378df0b7e4f
+SIZE (fracplanet/fracplanet.png) = 5229
diff -ruN --exclude=CVS /usr/ports/graphics/fracplanet/pkg-descr ./pkg-descr
--- /usr/ports/graphics/fracplanet/pkg-descr	2009-12-21 03:16:58.000000000 +0100
+++ ./pkg-descr	2012-11-10 20:48:23.000000000 +0100
@@ -3,4 +3,5 @@
 interactively and the results displayed using OpenGL. The generated
 objects can be dumped in Pov-Ray format.
 
-WWW:	http://www.bottlenose.demon.co.uk/share/fracplanet
+WWW: http://www.bottlenose.demon.co.uk/share/fracplanet/
+WWW: http://sourceforge.net/projects/fracplanet/
--- fracplanet-0.4.0_4.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121110234104.756E9DE4>