Date: Sat, 15 Jan 2005 06:41:40 GMT From: Samy Al Bahra <samy@kerneled.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/76262: Update of graphics/fyre port Message-ID: <200501150641.j0F6feL4000632@www.freebsd.org> Resent-Message-ID: <200501150650.j0F6oGki096259@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 76262
>Category: ports
>Synopsis: Update of graphics/fyre port
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 15 06:50:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Samy Al Bahra
>Release:
>Organization:
Kerneled.org
>Environment:
>Description:
fyre 0.7 is avaiable with OpenEXR and GNET support. Both of these are forced library depends due to the current configure framework, next release this will be fixed and PORTREVISION will be bumped.
files/patch-Makefile is removed.
>How-To-Repeat:
>Fix:
diff -ruN fyre.orig/Makefile fyre/Makefile
--- fyre.orig/Makefile Wed Jan 12 01:17:03 2005
+++ fyre/Makefile Sat Jan 15 09:37:02 2005
@@ -6,22 +6,24 @@
#
PORTNAME= fyre
-PORTVERSION= 0.6
+PORTVERSION= 0.7
PORTREVISION= 1
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 +35,16 @@
.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 -ruN fyre.orig/distinfo fyre/distinfo
--- fyre.orig/distinfo Wed Jan 12 01:17:03 2005
+++ fyre/distinfo Wed Jan 12 01:18:59 2005
@@ -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 -ruN fyre.orig/files/patch-Makefile fyre/files/patch-Makefile
--- fyre.orig/files/patch-Makefile Wed Jan 12 01:17:03 2005
+++ fyre/files/patch-Makefile Thu Jan 1 03:00:00 1970
@@ -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 -ruN fyre.orig/files/patch-src::Makefile fyre/files/patch-src::Makefile
--- fyre.orig/files/patch-src::Makefile Thu Jan 1 03:00:00 1970
+++ fyre/files/patch-src::Makefile Sat Jan 15 02:35:49 2005
@@ -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 -ruN fyre.orig/pkg-plist fyre/pkg-plist
--- fyre.orig/pkg-plist Wed Jan 12 01:17:03 2005
+++ fyre/pkg-plist Sat Jan 15 02:36:03 2005
@@ -1,6 +1,9 @@
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%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200501150641.j0F6feL4000632>