Attachment #26124 for bug #44556

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

Lines 6-18 Link Here

(-)/dana/jail/lemur/usr/ports/games/wmpuzzle/Makefile (-5 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= wmpuzzle	8	PORTNAME= wmpuzzle
9	PORTVERSION= 0.1.1	9	PORTVERSION= 0.2.0
10	CATEGORIES= games windowmaker afterstep	10	CATEGORIES= games windowmaker afterstep
11	MASTER_SITES= http://wwwtcs.inf.tu-dresden.de/~godisch/debian/wmpuzzle/ \	11	MASTER_SITES= http://www.godisch.de/debian/wmpuzzle/ \
12	${MASTER_SITE_LOCAL:S/$/:bsdpics/}	12	${MASTER_SITE_LOCAL:S/$/:bsdpics/}
13	MASTER_SITE_SUBDIR= petef/:bsdpics	13	MASTER_SITE_SUBDIR= petef/:bsdpics
14	DISTFILES= wmpuzzle_${PORTVERSION}.orig${EXTRACT_SUFX} \	14	DISTFILES= wmpuzzle_${PORTVERSION}.orig${EXTRACT_SUFX} \
15	daemon.gif:bsdpics daemon.xpm:bsdpics	15	daemon.xpm:bsdpics
16	DIST_SUBDIR= wmpuzzle	16	DIST_SUBDIR= wmpuzzle
17	EXTRACT_ONLY= wmpuzzle_${PORTVERSION}.orig${EXTRACT_SUFX}	17	EXTRACT_ONLY= wmpuzzle_${PORTVERSION}.orig${EXTRACT_SUFX}
18		18
Lines 20-25 Link Here
20		20
21	LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt	21	LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
22		22
		23	GNU_CONFIGURE= yes
		24	CONFIGURE_ENV= CFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
		25	LIBS="-L${LOCALBASE}/lib -lgnugetopt"
23	USE_GMAKE= yes	26	USE_GMAKE= yes
24	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src	27	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
25	USE_X_PREFIX= yes	28	USE_X_PREFIX= yes
Lines 27-37 Link Here
27		30
28	MAN6= wmpuzzle.6	31	MAN6= wmpuzzle.6
29		32
30	BSDIMAGES= daemon.gif daemon.xpm	33	BSDIMAGES= daemon.xpm
31		34
32	post-extract:	35	post-extract:
33	.for i in ${BSDIMAGES}	36	.for i in ${BSDIMAGES}
34	${CP} ${DISTDIR}/${DIST_SUBDIR}/$i ${WRKSRC}/xpm	37	${CP} ${DISTDIR}/${DIST_SUBDIR}/$i ${WRKSRC}/
35	.endfor	38	.endfor
36		39
37	do-install:	40	do-install:

Lines 1-3 Link Here

(-)/dana/jail/lemur/usr/ports/games/wmpuzzle/distinfo (-2 / +1 lines)
1	MD5 (wmpuzzle/wmpuzzle_0.1.1.orig.tar.gz) = 9d3ce8638068ecb7202e77429c9b3867	1	MD5 (wmpuzzle/wmpuzzle_0.2.0.orig.tar.gz) = 09605c3d33ba04c019b0ddc2c4bb86d4
2	MD5 (wmpuzzle/daemon.gif) = 08659de4c16b7f0e4e874eece1ef56fa
3	MD5 (wmpuzzle/daemon.xpm) = 2822c63820f67a68702fe8627b0ae688	2	MD5 (wmpuzzle/daemon.xpm) = 2822c63820f67a68702fe8627b0ae688




$FreeBSD: ports/games/wmpuzzle/files/patch-Makefile,v 1.1 2002/08/26 01:07:47 petef Exp $

--- Makefile.orig	Wed Mar 13 23:09:33 2002
+++ Makefile	Wed May 15 20:32:38 2002
@@ -1,45 +1,18 @@
-# $Id: Makefile,v 1.11 2002/03/13 17:09:33 godisch Exp $
+CC ?= gcc
+CFLAGS += -c -Wall -pedantic
+INCDIR = -I${X11BASE}/include -I/usr/local/include
+LIBDIR = -L${X11BASE}/lib -L/usr/local/lib
+LIBS   = -lXpm -lXext -lX11 -lgnugetopt
+OBJS =  wmpuzzle.o wmgeneral.o
 
-prefix      = /usr/local
-exec_prefix = ${prefix}
-bindir      = ${exec_prefix}/bin
-mandir      = ${prefix}/share/man
+.c.o:
+	${CC} ${CFLAGS} ${INCDIR} $< -o $*.o
 
-DESTDIR     =
-
-CFLAGS      = -O2 -Wall -pedantic
-LIBS        = -L/usr/X11R6/lib -lX11 -lXpm -lXext
-XPMS        = xpm/debian.xpm xpm/eagle.xpm xpm/earth.xpm xpm/linux.xpm
+wmpuzzle: $(OBJS)
+	${CC} -o wmpuzzle $^ ${LIBDIR} ${LIBS}
 
 all: wmpuzzle
 
-wmpuzzle: wmpuzzle.o wmgeneral.o
-	$(CC) $(LIBS) -o $@ $^
-
-wmpuzzle.o: wmpuzzle.c wmpuzzle.h $(XPMS)
-wmgeneral.o: wmgeneral.c wmgeneral.h
-
-install: install-bin install-doc
-
-install-bin: wmpuzzle
-	install -D -s -m 755 $< $(DESTDIR)$(bindir)/wmpuzzle
-
-install-doc: wmpuzzle.6
-	install -D -m 644 $< $(DESTDIR)$(mandir)/man6/wmpuzzle.6
-
-uninstall: uninstall-bin uninstall-doc
-
-uninstall-bin:
-	rm -f $(DESTDIR)$(bindir)/wmpuzzle
-
-uninstall-doc:
-	rm -f $(DESTDIR)$(mandir)/man6/wmpuzzle.6
-
 clean:
 	rm -f *.o
-
-distclean: clean
-	rm -f wmpuzzle
-
-.PHONY: all clean dist-clean install install-bin install-doc \
-	uninstall uninstall-bin uninstall-doc
+	rm -f wmpuzzle core




$FreeBSD: ports/games/wmpuzzle/files/patch-wmpuzzle.6,v 1.1 2002/08/26 01:07:47 petef Exp $

--- wmpuzzle.6.orig	Wed Mar 13 23:09:33 2002
+++ wmpuzzle.6	Wed May 15 21:22:41 2002
@@ -26,7 +26,8 @@
 .TP
 \fB\-i\fP, \fB\-\-image=\fIimage\fP
 the image which shall be shown.
-Valid images are \fIdebian\fP, \fIeagle\fP, \fIearth\fP, and \fIlinux\fP.
+Valid images are \fIdebian\fP, \fIeagle\fP, \fIearth\fP, \fIlinux\fP,
+and \fIdaemon\fP.
 Other images will be included on request.
 .TP
 \fB\-k\fP, \fB\-\-keyboard\fP




--- wmpuzzle.c.orig	Mon Oct 21 22:26:35 2002
+++ wmpuzzle.c	Sun Oct 27 17:28:07 2002
@@ -254,8 +254,8 @@
 		}
 	}
 	if (image == NULL) {
-		image = strdup("linux");
-		*wmpuzzle = linux_xpm;
+		image = strdup("daemon");
+		*wmpuzzle = daemon_xpm;
 	}
 }
 
 #define PROGRAM_NAME     "wmpuzzle"
 #define PROGRAM_VERSION  "0.1.1"
@@ -203,6 +204,8 @@
 				*wmpuzzle = earth_xpm;
 			else if (!strcmp(optarg, "linux"))
 				*wmpuzzle = linux_xpm;
+			else if (!strcmp(optarg, "daemon"))
+				*wmpuzzle = daemon_xpm;
 			else {
 				fprintf(stderr, "%s: invalid image `%s'\n", PROGRAM_NAME, optarg);
 				exit(1);
@@ -224,7 +227,7 @@
 			printf("Usage: %s [-h] [-i <image>] [-k] [-s <count>] [-v]\n", PROGRAM_NAME);
 			printf("  -h, --help             displays this command line summary.\n");
 			printf("  -i, --image <image>    uses <image>, valid images are `debian', `eagle',\n");
-			printf("                         `earth', and `linux'.\n");
+			printf("                         `earth', `linux', and `daemon'.\n");
 			printf("  -k, --keyboard         enables the arrow keys on the keyboard.\n");
 			printf("  -s, --shuffle <count>  shuffles the image <count> times.\n");
 			printf("  -v, --version          displays the version number.\n");

Line 0 Link Here

(-)/dana/jail/lemur/usr/ports/games/wmpuzzle/files/patch-wmpuzzle.h (+11 lines)
	1	--- wmpuzzle.h.orig Mon Oct 21 21:20:19 2002
	2	+++ wmpuzzle.h Sun Oct 27 17:28:09 2002
	3	@@ -8,7 +8,7 @@
	4	#define WMPUZZLE_H_INCLUDED
	5
	6	#include <config.h>
	7	-#include <linux.xpm>
	8	+#include <daemon.xpm>
	9
	10	#define EINTERNAL 200
	11	#define EINVALXPM 201

Lines 3-6 Link Here

(-)/dana/jail/lemur/usr/ports/games/wmpuzzle/pkg-descr (-1 / +1 lines)
3	Now includes special BSD Daemon skin not present in original	3	Now includes special BSD Daemon skin not present in original
4	distribution!	4	distribution!
5		5
6	WWW: http://wwwtcs.inf.tu-dresden.de/~godisch/debian/wmpuzzle/	6	WWW: http://www.godisch.de/debian/wmpuzzle/

Return to bug 44556

Lines 1-61 Link Here

(-)/dana/jail/lemur/usr/ports/games/wmpuzzle/files/patch-Makefile (-61 lines)
1	$FreeBSD: ports/games/wmpuzzle/files/patch-Makefile,v 1.1 2002/08/26 01:07:47 petef Exp $
2
3	--- Makefile.orig Wed Mar 13 23:09:33 2002
4	+++ Makefile Wed May 15 20:32:38 2002
5	@@ -1,45 +1,18 @@
6	-# $Id: Makefile,v 1.11 2002/03/13 17:09:33 godisch Exp $
7	+CC ?= gcc
8	+CFLAGS += -c -Wall -pedantic
9	+INCDIR = -I${X11BASE}/include -I/usr/local/include
10	+LIBDIR = -L${X11BASE}/lib -L/usr/local/lib
11	+LIBS = -lXpm -lXext -lX11 -lgnugetopt
12	+OBJS = wmpuzzle.o wmgeneral.o
13
14	-prefix = /usr/local
15	-exec_prefix = ${prefix}
16	-bindir = ${exec_prefix}/bin
17	-mandir = ${prefix}/share/man
18	+.c.o:
19	+ ${CC} ${CFLAGS} ${INCDIR} $< -o $*.o
20
21	-DESTDIR =
22	-
23	-CFLAGS = -O2 -Wall -pedantic
24	-LIBS = -L/usr/X11R6/lib -lX11 -lXpm -lXext
25	-XPMS = xpm/debian.xpm xpm/eagle.xpm xpm/earth.xpm xpm/linux.xpm
26	+wmpuzzle: $(OBJS)
27	+ ${CC} -o wmpuzzle $^ ${LIBDIR} ${LIBS}
28
29	all: wmpuzzle
30
31	-wmpuzzle: wmpuzzle.o wmgeneral.o
32	- $(CC) $(LIBS) -o $@ $^
33	-
34	-wmpuzzle.o: wmpuzzle.c wmpuzzle.h $(XPMS)
35	-wmgeneral.o: wmgeneral.c wmgeneral.h
36	-
37	-install: install-bin install-doc
38	-
39	-install-bin: wmpuzzle
40	- install -D -s -m 755 $< $(DESTDIR)$(bindir)/wmpuzzle
41	-
42	-install-doc: wmpuzzle.6
43	- install -D -m 644 $< $(DESTDIR)$(mandir)/man6/wmpuzzle.6
44	-
45	-uninstall: uninstall-bin uninstall-doc
46	-
47	-uninstall-bin:
48	- rm -f $(DESTDIR)$(bindir)/wmpuzzle
49	-
50	-uninstall-doc:
51	- rm -f $(DESTDIR)$(mandir)/man6/wmpuzzle.6
52	-
53	clean:
54	rm -f *.o
55	-
56	-distclean: clean
57	- rm -f wmpuzzle
58	-
59	-.PHONY: all clean dist-clean install install-bin install-doc \
60	- uninstall uninstall-bin uninstall-doc
61	+ rm -f wmpuzzle core

Lines 1-14 Link Here

(-)/dana/jail/lemur/usr/ports/games/wmpuzzle/files/patch-wmpuzzle.6 (-14 lines)
1	$FreeBSD: ports/games/wmpuzzle/files/patch-wmpuzzle.6,v 1.1 2002/08/26 01:07:47 petef Exp $
2
3	--- wmpuzzle.6.orig Wed Mar 13 23:09:33 2002
4	+++ wmpuzzle.6 Wed May 15 21:22:41 2002
5	@@ -26,7 +26,8 @@
6	.TP
7	\fB\-i\fP, \fB\-\-image=\fIimage\fP
8	the image which shall be shown.
9	-Valid images are \fIdebian\fP, \fIeagle\fP, \fIearth\fP, and \fIlinux\fP.
10	+Valid images are \fIdebian\fP, \fIeagle\fP, \fIearth\fP, \fIlinux\fP,
11	+and \fIdaemon\fP.
12	Other images will be included on request.
13	.TP
14	\fB\-k\fP, \fB\-\-keyboard\fP

Lines 1-30 Link Here

(-)/dana/jail/lemur/usr/ports/games/wmpuzzle/files/patch-wmpuzzle.c (-29 / +12 lines)
1	$FreeBSD: ports/games/wmpuzzle/files/patch-wmpuzzle.c,v 1.1 2002/08/26 01:07:47 petef Exp $	1	--- wmpuzzle.c.orig Mon Oct 21 22:26:35 2002
2		2	+++ wmpuzzle.c Sun Oct 27 17:28:07 2002
3	--- wmpuzzle.c.orig Thu Apr 18 00:13:52 2002	3	@@ -254,8 +254,8 @@
4	+++ wmpuzzle.c Wed May 15 21:21:20 2002	4	}
5	@@ -22,6 +22,7 @@	5	}
6	#include "xpm/eagle.xpm"	6	if (image == NULL) {
7	#include "xpm/earth.xpm"	7	- image = strdup("linux");
8	#include "xpm/linux.xpm"	8	- *wmpuzzle = linux_xpm;
9	+#include "xpm/daemon.xpm"	9	+ image = strdup("daemon");
		10	+ *wmpuzzle = daemon_xpm;
		11	}
		12	}
10		13
11	#define PROGRAM_NAME "wmpuzzle"
12	#define PROGRAM_VERSION "0.1.1"
13	@@ -203,6 +204,8 @@
14	*wmpuzzle = earth_xpm;
15	else if (!strcmp(optarg, "linux"))
16	*wmpuzzle = linux_xpm;
17	+ else if (!strcmp(optarg, "daemon"))
18	+ *wmpuzzle = daemon_xpm;
19	else {
20	fprintf(stderr, "%s: invalid image `%s'\n", PROGRAM_NAME, optarg);
21	exit(1);
22	@@ -224,7 +227,7 @@
23	printf("Usage: %s [-h] [-i <image>] [-k] [-s <count>] [-v]\n", PROGRAM_NAME);
24	printf(" -h, --help displays this command line summary.\n");
25	printf(" -i, --image <image> uses <image>, valid images are `debian', `eagle',\n");
26	- printf(" `earth', and `linux'.\n");
27	+ printf(" `earth', `linux', and `daemon'.\n");
28	printf(" -k, --keyboard enables the arrow keys on the keyboard.\n");
29	printf(" -s, --shuffle <count> shuffles the image <count> times.\n");
30	printf(" -v, --version displays the version number.\n");