Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Apr 2014 12:19:53 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r352412 - head/graphics/fyre
Message-ID:  <201404271219.s3RCJrrx022052@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Sun Apr 27 12:19:53 2014
New Revision: 352412
URL: http://svnweb.freebsd.org/changeset/ports/352412
QAT: https://qat.redports.org/buildarchive/r352412/

Log:
  - Add staging support
  - Convert to USES, options helpers

Modified:
  head/graphics/fyre/Makefile
  head/graphics/fyre/pkg-plist

Modified: head/graphics/fyre/Makefile
==============================================================================
--- head/graphics/fyre/Makefile	Sun Apr 27 12:05:37 2014	(r352411)
+++ head/graphics/fyre/Makefile	Sun Apr 27 12:19:53 2014	(r352412)
@@ -3,55 +3,42 @@
 
 PORTNAME=	fyre
 PORTVERSION=	1.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://releases.navi.cx/fyre/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Chaos map rendering system with GTK+-2 interface
 
-OPTIONS_DEFINE=	OPTIMIZED_CFLAGS OPENEXR GNET DOCS
-OPTIONS_DEFAULT=	OPENEXR GNET
-OPENEXR_DESC=	Enable OpenEXR suport
-GNET_DESC=	Enable GNet support
-
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-USES=		gmake pkgconfig
-USE_BZIP2=	yes
-USE_GNOME=	desktopfileutils libglade2
-USE_GMAKE=	yes
+USES=		desktop-file-utils gmake pkgconfig shared-mime-info tar:bzip2
+USE_GNOME=	libglade2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=		OPTIMIZED_CFLAGS OPENEXR GNET DOCS
+OPTIONS_DEFAULT=	OPENEXR GNET
+
+OPENEXR_CONFIGURE_ENABLE=	openexr
+OPENEXR_LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+
+GNET_DESC=		Networking support via GNet
+GNET_CONFIGURE_ENABLE=	gnet	
+GNET_LIB_DEPENDS=	libgnet-2.0.so:${PORTSDIR}/net/gnet2
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386" && !empty(PORT_OPTIONS:MOPT_CFLAGS)
 CFLAGS+=	-march=native -O3 -ffast-math -fomit-frame-pointer
 .endif
 
-.if ${PORT_OPTIONS:MOPENEXR}
-LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR
-.else
-CONFIGURE_ARGS+=--disable-openexr
-.endif
-
-.if ${PORT_OPTIONS:MGNET}
-LIB_DEPENDS+=	gnet-2.0.0:${PORTSDIR}/net/gnet2
-.else
-CONFIGURE_ARGS+=--disable-gnet
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/-O3/s|^|#|g' ${WRKSRC}/configure
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-	@-update-desktop-database
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>

Modified: head/graphics/fyre/pkg-plist
==============================================================================
--- head/graphics/fyre/pkg-plist	Sun Apr 27 12:05:37 2014	(r352411)
+++ head/graphics/fyre/pkg-plist	Sun Apr 27 12:19:53 2014	(r352412)
@@ -10,11 +10,6 @@ share/icons/hicolor/22x22/apps/fyre.png
 share/icons/hicolor/24x24/apps/fyre.png
 share/icons/hicolor/48x48/mimetypes/application-x-fyre-animation.png
 share/icons/hicolor/scalable/apps/fyre.svg
-share/mime/application/x-fyre-animation.xml
 share/mime/packages/fyre.xml
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true



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