ports/173542: [PATCH] graphics/fracplanet: take maintainership, Makefile changed, OptionsNG, added Desktop entries, doxygen

Thu Jun 6 11:20:01 UTC 2013

The following reply was made to PR ports/173542; it has been noted by GNATS.

From: nemysis <nemysis at gmx.ch>
To: bug-followup at FreeBSD.org
Cc: jpaetzel at freebsd.org
Subject: Re: ports/173542: [PATCH] graphics/fracplanet: take maintainership,
 Makefile changed, OptionsNG, added Desktop entries, doxygen
Date: Thu, 6 Jun 2013 13:14:13 +0200

 --MP_/2LnVDOdf5fPKPI5JcBiyJZz
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline

 - Bump portrevision
 - Trim master sites
 - Add Icons
 - Trim comment
 - Add license
 - Trim docs
 - Add HTML LATEX Options
 - Add dependency for devel/doxygen
 - Add Desktop entry file
 - Use REINPLACE_CMD instead of simple patches
 - Remove files/patch-fracplanet.pro
 - Trim pkg-descr
 - Add pkg-plist

 Added file(s):
 - pkg-plist

 Removed file(s):
 - files/patch-fracplanet.pro

 Build log

 https://redports.org/buildarchive/20130606095700-13721/
 --MP_/2LnVDOdf5fPKPI5JcBiyJZz
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=fracplanet.diff

 ===> Generating patch
 ===> Viewing diff with more
 diff -ruN /usr/ports/graphics/fracplanet/Makefile ./Makefile
 --- /usr/ports/graphics/fracplanet/Makefile	2013-06-02 18:53:05.000000000 +0200
 +++ ./Makefile	2013-06-06 11:29:39.000000000 +0200
 @@ -3,12 +3,17 @@

  PORTNAME=	fracplanet
  PORTVERSION=	0.4.0
 -PORTREVISION=	4
 +PORTREVISION=	5
  CATEGORIES=	graphics
 -MASTER_SITES=	SF
 +MASTER_SITES=	SF \
 +		SF/nemysisfreebsdp/:icons
 +DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 +		${PORTNAME}_icons.tar.gz:icons

 -MAINTAINER=	ports at FreeBSD.org
 -COMMENT=	An interactive generator of planets and terrain
 +MAINTAINER=	nemysis at 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:${PORTSDIR}/devel/boost-libs
 @@ -16,8 +21,7 @@
  WRKSRC=		${WRKDIR}/${PORTNAME}

  USE_GL=		glu
 -USE_QT4=	corelib gui opengl \
 -		moc_build qmake_build
 +USE_QT4=	corelib moc_build qmake_build gui opengl
  QT_NONSTANDARD=	yes
  HAS_CONFIGURE=	yes
  CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 @@ -25,23 +29,68 @@
  USE_GMAKE=	yes

  MAN1=		${PORTNAME}.1
 -PORTDOCS=	${PORTNAME}.css ${PORTNAME}.htm
 -PLIST_FILES=	bin/${PORTNAME}
 +
 +PORTDOCS=	*
 +
 +DOCSRCDIR1=	${WRKSRC}
 +DOC_FILES1=	 BUGS NEWS README THANKS TODO ${PORTNAME}.css ${PORTNAME}.htm
 +
 +INSTALLS_ICONS=	yes
 +ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
 +
 +DESKTOP_ENTRIES="Fracplanet" "${COMMENT}" "${PORTNAME}" \
 +		"${PORTNAME}" "Graphics;" false
 +
 +OPTIONS_GROUP=	DOXYGEN
 +
 +OPTIONS_GROUP_DOXYGEN=	HTML LATEX
 +
 +OPTIONS_DEFAULT=	HTML
 +
 +HTML_DESC=	Install HTML Doxygen files
 +LATEX_DESC=	Install LaTeX Doxygen files
 +
 +.include <bsd.port.options.mk>
 +
 +.if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX}
 +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
 +	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' \
 +		${WRKSRC}/${f}
  .endfor
 +	@${REINPLACE_CMD} -e 's|-lboost_program_options|-lboost_program_options -lGLU|' \
 +		${WRKSRC}/fracplanet.pro

  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}
 +
 +post-install:
 +.for s in ${ICON_SIZES}
 +	${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
 +	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
 +		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
  .endfor
 +	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps
 +
 +.if ${PORT_OPTIONS:MDOCS}
 +	@${MKDIR} ${DOCSDIR}
 +	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
 +.endif
 +
 +.if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX}
 +	@cd ${WRKSRC} && doxygen .
 +.endif
 +
 +.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MHTML}
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${DOCSDIR})
 +.endif
 +
 +.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MLATEX}
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} latex ${DOCSDIR})
  .endif

  .include <bsd.port.mk>
 diff -ruN /usr/ports/graphics/fracplanet/distinfo ./distinfo
 --- /usr/ports/graphics/fracplanet/distinfo	2013-06-02 18:53:05.000000000 +0200
 +++ ./distinfo	2013-06-06 11:07:05.000000000 +0200
 @@ -1,2 +1,4 @@
  SHA256 (fracplanet-0.4.0.tar.gz) = 38d56aba3c5cf19d4f2c218bece471d3860b161d2210a24ba94550356723482a
  SIZE (fracplanet-0.4.0.tar.gz) = 101700
 +SHA256 (fracplanet_icons.tar.gz) = 99eeb8ed62d45083138402c41b2af79a4b432bfcb8e63cbe83090bb2d235063b
 +SIZE (fracplanet_icons.tar.gz) = 51712
 diff -ruN /usr/ports/graphics/fracplanet/files/patch-fracplanet.pro ./files/patch-fracplanet.pro
 --- /usr/ports/graphics/fracplanet/files/patch-fracplanet.pro	2013-06-02 18:53:05.000000000 +0200
 +++ ./files/patch-fracplanet.pro	1970-01-01 01:00:00.000000000 +0100
 @@ -1,11 +0,0 @@
 ---- fracplanet.pro~	2012-05-19 23:50:08.000000000 -0300
 -+++ fracplanet.pro	2012-05-19 23:50:19.000000000 -0300
 -@@ -8,7 +8,7 @@
 - 
 - HEADERS += $$system(ls *.h)
 - SOURCES += $$system(ls *.cpp)
 --LIBS += -lboost_program_options
 -+LIBS += -lboost_program_options -lGLU
 - 
 - DEFINES += QT_DLL
 - 
 diff -ruN /usr/ports/graphics/fracplanet/pkg-descr ./pkg-descr
 --- /usr/ports/graphics/fracplanet/pkg-descr	2013-06-02 18:53:05.000000000 +0200
 +++ ./pkg-descr	2013-06-06 10:28:03.000000000 +0200
 @@ -3,4 +3,4 @@
  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/
 diff -ruN /usr/ports/graphics/fracplanet/pkg-plist ./pkg-plist
 --- /usr/ports/graphics/fracplanet/pkg-plist	1970-01-01 01:00:00.000000000 +0100
 +++ ./pkg-plist	2013-03-29 00:57:04.000000000 +0100
 @@ -0,0 +1,7 @@
 +bin/fracplanet
 +share/icons/hicolor/32x32/apps/fracplanet.png
 +share/icons/hicolor/48x48/apps/fracplanet.png
 +share/icons/hicolor/64x64/apps/fracplanet.png
 +share/icons/hicolor/72x72/apps/fracplanet.png
 +share/icons/hicolor/96x96/apps/fracplanet.png
 +share/pixmaps/fracplanet.png
 ===> Done

 --MP_/2LnVDOdf5fPKPI5JcBiyJZz--