Attachment #134024 for bug #178600

View | Details | Raw Unified | Return to bug 178600
Collapse All | Expand All





PORTNAME=	fireflies
PORTVERSION=	2.07
PORTREVISION=	5
CATEGORIES=	x11
MASTER_SITES=	http://somewhere.fscked.org/proj/fireflies/files/

MAINTAINER=	umeno@rr.iij4u.or.jp
COMMENT=	Extension of xscreensaver

LIB_DEPENDS=	gfx:${PORTSDIR}/graphics/libgfx

GNU_CONFIGURE=	yes
USE_GMAKE=	yes
USE_GL=		yes
EXTRACT_AFTER_ARGS=--exclude '${DISTNAME}/libgfx*'
MAKE_JOBS_SAFE=	yes

CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/GL
LDFLAGS+=	-L${LOCALBASE}/lib

		CONFIGURE_SCRIPT=${CONFIGURE_SCRIPT:Q} \
		CONFIGURE_ARGS=${CONFIGURE_ARGS:Q}

post-extract:
	@(cd ${WRKSRC};  ${TAR} zxpf libgfx-1.0.1.tar.gz)

post-patch:
	@${REINPLACE_CMD} -e 's|fltk|ignored-&|' ${WRKSRC}/libgfx/configure

.include <bsd.port.mk>

Lines 6-13 Link Here

(-)files/patch-Make.include.in (-2 / +2 lines)
6		6
7	-CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@	7	-CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@
8	-LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@	8	-LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@
9	+CFLAGS = -Wall -I$(LOCALBASE)/include -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@	9	+CFLAGS = -Wall -I$(LOCALBASE)/include $(SDL_CFLAGS) @CFLAGS@
10	+LIBS = ../libgfx/src/libgfx.a $(SDL_LIBS) $(OPT_LIBS) -L$(LOCALBASE)/lib $(GL_LIBS) @LIBS@	10	+LIBS = $(SDL_LIBS) $(OPT_LIBS) -L$(LOCALBASE)/lib -lgfx $(GL_LIBS) @LIBS@ -lX11
11		11
12	OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@	12	OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@
13	PROGRAM = @PROGRAM@	13	PROGRAM = @PROGRAM@




--- Makefile	Tue May  6 15:00:40 2003
+++ Makefile	Tue Dec  5 16:44:03 2006
@@ -1,4 +1,4 @@
-include Make.include

 
 DISTFILES=\
 add-xscreensaver \
@@ -21,6 +21,6 @@
 win32/
 
-all:	libgfx/src/libgfx.a
-	cd src && make
+all:
+	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_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} && 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)




--- src/main.cc	2003-06-23 16:55:04.000000000 -0400
+++ src/main.cc	2013-05-13 14:24:28.000000000 -0400
@@ -15,8 +15,10 @@
 #ifdef WIN32
 #include <windows.h>

 // mingw doesn't have argp. implement half-assed version
 
 #define OPTION_HIDDEN 1
@@ -187,7 +189,7 @@
 #define OPT_FPS 2
 #define OPT_FASTFORWARD 3
 
-char *mode_help =
+const char *mode_help =
 "\n"
 "Per-swarm modes and their default probabilities:\n"
 "  1: normal                                         p=20\n"




--- src/canvas_sdl.h	2003-04-26 14:01:42.000000000 -0400
+++ src/canvas_sdl.h	2013-05-13 14:28:04.000000000 -0400
@@ -10,11 +10,11 @@
 protected:
     SDL_Surface *surface;
-    char *wm_title;
-    char *wm_class;
+    const char *wm_title;
+    const char *wm_class;
 
     // create the window (either SDL or GLX)
     virtual int create_window();
 public:
-    CanvasSDL(Scene *s, bool full_screen, int mspf, char *wm_title, char *wm_class);
+    CanvasSDL(Scene *s, bool full_screen, int mspf, const char *wm_title, const char *wm_class);
     virtual ~CanvasSDL() {}
 
--- src/canvas_sdl.cc	2004-02-05 16:58:24.000000000 -0500
+++ src/canvas_sdl.cc	2013-05-13 14:27:03.000000000 -0400
@@ -10,5 +10,5 @@
 using namespace std;
 
-CanvasSDL::CanvasSDL(Scene *s, bool fs, int m, char *t, char *c)
+CanvasSDL::CanvasSDL(Scene *s, bool fs, int m, const char *t, const char *c)
     : CanvasBase(s, fs, m), wm_title(t), wm_class(c)
 {
--- src/vroot.h	2005-12-08 22:07:30.000000000 -0500
+++ src/vroot.h	2013-05-13 14:30:56.000000000 -0400
@@ -82,4 +82,5 @@
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
+#include <stdio.h>	/* For sscanf */
 
 static Window
@@ -96,7 +97,6 @@
 		Display *dpy = DisplayOfScreen(screen);
 		Atom __SWM_VROOT = None;
-		int i;
 		Window rootReturn, parentReturn, *children;
-		unsigned int numChildren;
+		unsigned int i, numChildren;
 
     /* first check for a hex or decimal window ID in the environment */

Return to bug 178600

Lines 3-20 Link Here

(-)Makefile (-9 / +4 lines)
3		3
4	PORTNAME= fireflies	4	PORTNAME= fireflies
5	PORTVERSION= 2.07	5	PORTVERSION= 2.07
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= x11	7	CATEGORIES= x11
8	MASTER_SITES= http://somewhere.fscked.org/proj/fireflies/files/	8	MASTER_SITES= http://somewhere.fscked.org/proj/fireflies/files/
9		9
10	MAINTAINER= umeno@rr.iij4u.or.jp	10	MAINTAINER= umeno@rr.iij4u.or.jp
11	COMMENT= Extension of xscreensaver	11	COMMENT= Extension of xscreensaver
12		12
13	CONFLICTS= png-[0-9]*	13	LIB_DEPENDS= gfx:${PORTSDIR}/graphics/libgfx
14		14
15	GNU_CONFIGURE= yes	15	GNU_CONFIGURE= yes
16	USE_GMAKE= yes
17	USE_GL= yes	16	USE_GL= yes
		17	EXTRACT_AFTER_ARGS=--exclude '${DISTNAME}/libgfx*'
		18	MAKE_JOBS_SAFE= yes
18		19
19	CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/GL	20	CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/GL
20	LDFLAGS+= -L${LOCALBASE}/lib	21	LDFLAGS+= -L${LOCALBASE}/lib
Lines 26-35 Link Here
26	CONFIGURE_SCRIPT=${CONFIGURE_SCRIPT:Q} \	27	CONFIGURE_SCRIPT=${CONFIGURE_SCRIPT:Q} \
27	CONFIGURE_ARGS=${CONFIGURE_ARGS:Q}	28	CONFIGURE_ARGS=${CONFIGURE_ARGS:Q}
28		29
29	post-extract:
30	@(cd ${WRKSRC}; ${TAR} zxpf libgfx-1.0.1.tar.gz)
31
32	post-patch:
33	@${REINPLACE_CMD} -e 's\|fltk\|ignored-&\|' ${WRKSRC}/libgfx/configure
34
35	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-4 Link Here

(-)files/patch-Makefile (-18 / +4 lines)
1	--- Makefile.orig Tue May 6 15:00:40 2003	1	--- Makefile Tue May 6 15:00:40 2003
2	+++ Makefile Tue Dec 5 16:44:03 2006	2	+++ Makefile Tue Dec 5 16:44:03 2006
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-include Make.include	4	-include Make.include
Lines 6-31 Link Here
6		6
7	DISTFILES=\	7	DISTFILES=\
8	add-xscreensaver \	8	add-xscreensaver \
9	@@ -21,18 +21,17 @@	9	@@ -21,6 +21,6 @@
10	win32/	10	win32/
11		11
12	all: libgfx/src/libgfx.a	12	-all: libgfx/src/libgfx.a
13	- cd src && make	13	- cd src && make
		14	+all:
14	+ cd src && ${MAKE}	15	+ cd src && ${MAKE}
15		16
16	libgfx/src/libgfx.a:	17	libgfx/src/libgfx.a:
17	- gunzip -c libgfx-1.0.1.tar.gz \| tar x
18	- cd libgfx && ./configure && cd src && make
19	+ cd libgfx && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} && cd src && ${MAKE}
20
21	install: all
22	sh ./installit $(DESTDIR)
23
24	clean:
25	- make -C src clean
26	- make -C win32 clean
27	+ ${MAKE} -C src clean
28	+ ${MAKE} -C win32 clean
29
30	dist:
31	rm -rf fireflies-$(VERSION)

Lines 1-5 Link Here

(-)files/patch-src-main.cc (-2 / +11 lines)
1	--- src/main.cc.orig Tue Jun 24 05:55:04 2003	1	--- src/main.cc 2003-06-23 16:55:04.000000000 -0400
2	+++ src/main.cc Wed Feb 15 02:32:39 2006	2	+++ src/main.cc 2013-05-13 14:24:28.000000000 -0400
3	@@ -15,8 +15,10 @@	3	@@ -15,8 +15,10 @@
4	#ifdef WIN32	4	#ifdef WIN32
5	#include <windows.h>	5	#include <windows.h>
Lines 20-22 Link Here
20	// mingw doesn't have argp. implement half-assed version	20	// mingw doesn't have argp. implement half-assed version
21		21
22	#define OPTION_HIDDEN 1	22	#define OPTION_HIDDEN 1
		23	@@ -187,7 +189,7 @@
		24	#define OPT_FPS 2
		25	#define OPT_FASTFORWARD 3
		26
		27	-char *mode_help =
		28	+const char *mode_help =
		29	"\n"
		30	"Per-swarm modes and their default probabilities:\n"
		31	" 1: normal p=20\n"

Line 0 Link Here

(-)files/patch-warnings (+43 lines)
	1	--- src/canvas_sdl.h 2003-04-26 14:01:42.000000000 -0400
	2	+++ src/canvas_sdl.h 2013-05-13 14:28:04.000000000 -0400
	3	@@ -10,11 +10,11 @@
	4	protected:
	5	SDL_Surface *surface;
	6	- char *wm_title;
	7	- char *wm_class;
	8	+ const char *wm_title;
	9	+ const char *wm_class;
	10
	11	// create the window (either SDL or GLX)
	12	virtual int create_window();
	13	public:
	14	- CanvasSDL(Scene s, bool full_screen, int mspf, char wm_title, char *wm_class);
	15	+ CanvasSDL(Scene s, bool full_screen, int mspf, const char wm_title, const char *wm_class);
	16	virtual ~CanvasSDL() {}
	17
	18	--- src/canvas_sdl.cc 2004-02-05 16:58:24.000000000 -0500
	19	+++ src/canvas_sdl.cc 2013-05-13 14:27:03.000000000 -0400
	20	@@ -10,5 +10,5 @@
	21	using namespace std;
	22
	23	-CanvasSDL::CanvasSDL(Scene s, bool fs, int m, char t, char *c)
	24	+CanvasSDL::CanvasSDL(Scene s, bool fs, int m, const char t, const char *c)
	25	: CanvasBase(s, fs, m), wm_title(t), wm_class(c)
	26	{
	27	--- src/vroot.h 2005-12-08 22:07:30.000000000 -0500
	28	+++ src/vroot.h 2013-05-13 14:30:56.000000000 -0400
	29	@@ -82,4 +82,5 @@
	30	#include <X11/Xatom.h>
	31	#include <X11/Xlib.h>
	32	+#include <stdio.h> /* For sscanf */
	33
	34	static Window
	35	@@ -96,7 +97,6 @@
	36	Display *dpy = DisplayOfScreen(screen);
	37	Atom __SWM_VROOT = None;
	38	- int i;
	39	Window rootReturn, parentReturn, *children;
	40	- unsigned int numChildren;
	41	+ unsigned int i, numChildren;
	42
	43	/* first check for a hex or decimal window ID in the environment */