5 files changed, 29 insertions, 62 deletions

diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile
index c6509cb63cbb..46b1e941c656 100644
--- a/graphics/fyre/Makefile
+++ b/graphics/fyre/Makefile
@@ -6,22 +6,23 @@
 #
 
 PORTNAME=	fyre
-PORTVERSION=	0.6
-PORTREVISION=	1
+PORTVERSION=	0.7
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.kerneled.org/files/FreeBSD-ports/ \
-		http://navi.cx/releases/
+MASTER_SITES=	http://navi.cx/releases/
 
 MAINTAINER=	samy@kerneled.org
 COMMENT=	Chaos map rendering system with GTK+-2 interface
 
+LIB_DEPENDS=	Half:${PORTSDIR}/graphics/OpenEXR \
+		gnet-2.0:${PORTSDIR}/net/gnet2
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	libglade2
 USE_GETOPT_LONG=yes
 
 USE_GMAKE=	yes
-ALL_TARGET=	${PORTNAME}
+GNU_CONFIGURE=	yes
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.pre.mk>
@@ -33,20 +34,16 @@ CPPFLAGS+=	-march=i686 -O3 -ffast-math \
 .else
 pre-everything::
 	@${ECHO_CMD} ""
-	@${ECHO_CMD} "Define WITH_OPTIMIZED_CFLAGS to enable"
-	@${ECHO_CMD} "compiler optimizations."
+	@${ECHO_CMD} "The following options are available:"
+	@${ECHO_CMD} "  WITH_OPTIMIZED_CFLAGS    - build port with optimization support"
 	@${ECHO_CMD} ""
 .endif
 .endif
 
-do-install:
-	@${MKDIR} ${PREFIX}/share/gnome/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/data/*.glade \
-		${PREFIX}/share/gnome/${PORTNAME}
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/graphics/fyre/distinfo b/graphics/fyre/distinfo
index d4de81785937..95985c181cec 100644
--- a/graphics/fyre/distinfo
+++ b/graphics/fyre/distinfo
@@ -1,2 +1,2 @@
-MD5 (fyre-0.6.tar.bz2) = 63a1570d44a5e3600a2348a2bceb87a4
-SIZE (fyre-0.6.tar.bz2) = 61440
+MD5 (fyre-0.7.tar.bz2) = 3fe716ee70eed18ad2fd9bfe9551c3e6
+SIZE (fyre-0.7.tar.bz2) = 230390
diff --git a/graphics/fyre/files/patch-Makefile b/graphics/fyre/files/patch-Makefile
deleted file mode 100644
index b266606fee07..000000000000
--- a/graphics/fyre/files/patch-Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
---- Makefile.orig	Sun Jul 11 02:26:40 2004
-+++ Makefile	Mon Jul 12 08:52:21 2004
-@@ -1,21 +1,21 @@
- # -march=i686 speeds this up quite a bit on my machine (even more so
- # than -march=athlon-xp) so if this looks like a recent x86 machine,
- # stick that in CFLAGS
--CFLAGS  += $(shell if grep mmx /proc/cpuinfo > /dev/null; then echo -march=i686; fi)
-+#CFLAGS  += $(shell if grep mmx /proc/cpuinfo > /dev/null; then echo -march=i686; fi)
- 
- # -O3 and -ffast-math should make it go much faster on any system
--ifeq ($(CC),icc)
--	CFLAGS  += -O3
--else
--	CFLAGS  += -O3 -ffast-math
--endif
-+#ifeq ($(CC),icc)
-+#	CFLAGS  += -O3
-+#else
-+#	CFLAGS  += -O3 -ffast-math
-+#endif
- 
- # Disable glibc versions of functions that have faster versions
- # as gcc inlines. This should speed up trig on some systems.
--CFLAGS  += -D__NO_INLINE__
-+#CFLAGS  += -D__NO_INLINE__
- 
- PKGS    += libglade-2.0 gtk+-2.0
--CFLAGS  += '-DGLADEDIR="data"'
-+CFLAGS  += '-DGLADEDIR="${PREFIX}/share/gnome/fyre"'
- CFLAGS  += $(shell pkg-config --cflags $(PKGS))
- LIBS    += $(shell pkg-config --libs $(PKGS))
- 
-@@ -47,10 +47,10 @@
- 
- 
- $(BIN): $(OBJS)
--	$(CC) -o $@ $(OBJS) $(LIBS)
-+	$(CC) -o $@ $(OBJS) $(LIBS) $(LDFLAGS)
- 
- %.o: %.c src/*.h
--	$(CC) -c -o $@ $< $(CFLAGS)
-+	$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS)
- 
- clean:
- 	rm -f $(BIN) src/*.o
diff --git a/graphics/fyre/files/patch-src::Makefile b/graphics/fyre/files/patch-src::Makefile
new file mode 100644
index 000000000000..287b4716a90b
--- /dev/null
+++ b/graphics/fyre/files/patch-src::Makefile
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Sat Jan 15 02:34:43 2005
++++ src/Makefile.in	Sat Jan 15 02:35:29 2005
+@@ -86,7 +86,7 @@
+ 	$(PACKAGE_CFLAGS)		\
+ 	$(EXR_CFLAGS)			\
+ 	$(GNET_CFLAGS)			\
+-	'-DFYRE_DATADIR="data"'
++	'-DFYRE_DATADIR="${PREFIX}/share/fyre/"'
+ 
+ 
+ fyre_LDADD = \
diff --git a/graphics/fyre/pkg-plist b/graphics/fyre/pkg-plist
index 46fb3221f7ee..4cc853c919e6 100644
--- a/graphics/fyre/pkg-plist
+++ b/graphics/fyre/pkg-plist
@@ -1,6 +1,10 @@
 bin/fyre
 %%PORTDOCS%%%%DOCSDIR%%/README
-share/gnome/fyre/animation-render.glade
-share/gnome/fyre/explorer.glade
-@dirrm share/gnome/fyre
+share/applications/fyre.desktop
+share/fyre/animation-render.glade
+share/fyre/explorer.glade
+share/fyre/metadata-emblem.png
+share/fyre/wicker-shoelace.png
+@dirrm share/fyre
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rmdir %D/share/applications 2> /dev/null || true