From a6111dc9241842cad63bfa3840cdd66ca08da340 Mon Sep 17 00:00:00 2001
From: pav <pav@FreeBSD.org>
Date: Sun, 7 May 2006 17:47:32 +0000
Subject: fireflies is a extention of xscreensaver.

WWW: http://somewhere.fscked.org/fireflies/

PR:		ports/93352
Submitted by:	UMENO Takashi <umeno@rr.iij4u.or.jp>
---
 x11/fireflies/files/patch-Make.include.in | 13 +++++++++++++
 x11/fireflies/files/patch-Makefile        | 25 +++++++++++++++++++++++++
 x11/fireflies/files/patch-src-main.cc     | 22 ++++++++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 x11/fireflies/files/patch-Make.include.in
 create mode 100644 x11/fireflies/files/patch-Makefile
 create mode 100644 x11/fireflies/files/patch-src-main.cc

(limited to 'x11/fireflies/files')

diff --git a/x11/fireflies/files/patch-Make.include.in b/x11/fireflies/files/patch-Make.include.in
new file mode 100644
index 000000000000..9369f93aefad
--- /dev/null
+++ b/x11/fireflies/files/patch-Make.include.in
@@ -0,0 +1,13 @@
+--- Make.include.in.orig	Thu Apr 17 14:02:52 2003
++++ Make.include.in	Sat Feb 11 15:17:29 2006
+@@ -5,8 +5,8 @@
+ GL_LIBS = @GL_LIBS@
+ OPT_LIBS = @OPT_LIBS@
+ 
+-CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@
+-LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@
++CFLAGS = -Wall -I$(X11BASE)/include -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@
++LIBS = ../libgfx/src/libgfx.a $(SDL_LIBS) $(OPT_LIBS) -L$(X11BASE)/lib $(GL_LIBS) @LIBS@ 
+ 
+ OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@
+ PROGRAM = @PROGRAM@
diff --git a/x11/fireflies/files/patch-Makefile b/x11/fireflies/files/patch-Makefile
new file mode 100644
index 000000000000..91be8db140be
--- /dev/null
+++ b/x11/fireflies/files/patch-Makefile
@@ -0,0 +1,25 @@
+--- Makefile.orig	Tue May  6 16:00:40 2003
++++ Makefile	Sat Feb 11 14:38:36 2006
+@@ -21,18 +21,17 @@
+ win32/
+ 
+ all:	libgfx/src/libgfx.a
+-	cd src && make
++	cd src && ${MAKE}
+ 
+ libgfx/src/libgfx.a:
+-	gunzip -c libgfx-1.0.1.tar.gz | tar x
+-	cd libgfx && ./configure && cd src && make
++	cd libgfx && ./configure && cd src && ${MAKE}
+ 
+ install: all
+ 	sh ./installit $(DESTDIR)
+ 
+ clean:
+-	make -C src clean
+-	make -C win32 clean
++	${MAKE} -C src clean
++	${MAKE} -C win32 clean
+ 
+ dist:
+ 	rm -rf fireflies-$(VERSION)
diff --git a/x11/fireflies/files/patch-src-main.cc b/x11/fireflies/files/patch-src-main.cc
new file mode 100644
index 000000000000..ac5a0404043b
--- /dev/null
+++ b/x11/fireflies/files/patch-src-main.cc
@@ -0,0 +1,22 @@
+--- src/main.cc.orig	Tue Jun 24 05:55:04 2003
++++ src/main.cc	Wed Feb 15 02:32:39 2006
+@@ -15,8 +15,10 @@
+ #ifdef WIN32
+ #include <windows.h>
+ #else
++#ifdef HAVE_ARGP_H
+ #include <argp.h>
+ #endif
++#endif
+ 
+ CanvasBase *canvas;
+ Scene scene;
+@@ -26,7 +28,7 @@
+ int mspf = 1000/30;
+ bool full_screen = false;
+ 
+-#ifdef WIN32
++#if defined(WIN32) || !defined (HAVE_ARGP_H)
+ // mingw doesn't have argp. implement half-assed version
+ 
+ #define OPTION_HIDDEN 1
-- 
cgit