Attachment 26124 Details for Bug 44556 – wmpuzzle.diff

[patch] wmpuzzle.diff

wmpuzzle.diff (text/plain), 7.16 KB, created by Erwin Lansing on 2002-10-28 09:00:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Erwin Lansing

Created: 2002-10-28 09:00:13 UTC

Size: 7.16 KB

patch

obsolete

>diff -ruN wmpuzzle/Makefile /dana/jail/lemur/usr/ports/games/wmpuzzle/Makefile
>--- wmpuzzle/Makefile	Mon Aug 26 03:07:47 2002
>+++ /dana/jail/lemur/usr/ports/games/wmpuzzle/Makefile	Mon Oct 28 09:41:24 2002
>@@ -6,13 +6,13 @@
> #
> 
> PORTNAME=	wmpuzzle
>-PORTVERSION=	0.1.1
>+PORTVERSION=	0.2.0
> CATEGORIES=	games windowmaker afterstep
>-MASTER_SITES=	http://wwwtcs.inf.tu-dresden.de/~godisch/debian/wmpuzzle/ \
>+MASTER_SITES=	http://www.godisch.de/debian/wmpuzzle/ \
> 		${MASTER_SITE_LOCAL:S/$/:bsdpics/}
> MASTER_SITE_SUBDIR=	petef/:bsdpics
> DISTFILES=	wmpuzzle_${PORTVERSION}.orig${EXTRACT_SUFX} \
>-		daemon.gif:bsdpics daemon.xpm:bsdpics
>+		daemon.xpm:bsdpics
> DIST_SUBDIR=	wmpuzzle
> EXTRACT_ONLY=	wmpuzzle_${PORTVERSION}.orig${EXTRACT_SUFX}
> 
>@@ -20,6 +20,9 @@
> 
> LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
> 
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ENV=	CFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
>+		LIBS="-L${LOCALBASE}/lib -lgnugetopt"
> USE_GMAKE=	yes
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
> USE_X_PREFIX=	yes
>@@ -27,11 +30,11 @@
> 
> MAN6=		wmpuzzle.6
> 
>-BSDIMAGES=	daemon.gif daemon.xpm
>+BSDIMAGES=	daemon.xpm
> 
> post-extract:
> .for i in ${BSDIMAGES}
>-	${CP} ${DISTDIR}/${DIST_SUBDIR}/$i ${WRKSRC}/xpm
>+	${CP} ${DISTDIR}/${DIST_SUBDIR}/$i ${WRKSRC}/
> .endfor
> 
> do-install:
>diff -ruN wmpuzzle/distinfo /dana/jail/lemur/usr/ports/games/wmpuzzle/distinfo
>--- wmpuzzle/distinfo	Mon Aug 26 03:07:47 2002
>+++ /dana/jail/lemur/usr/ports/games/wmpuzzle/distinfo	Mon Oct 28 09:43:00 2002
>@@ -1,3 +1,2 @@
>-MD5 (wmpuzzle/wmpuzzle_0.1.1.orig.tar.gz) = 9d3ce8638068ecb7202e77429c9b3867
>-MD5 (wmpuzzle/daemon.gif) = 08659de4c16b7f0e4e874eece1ef56fa
>+MD5 (wmpuzzle/wmpuzzle_0.2.0.orig.tar.gz) = 09605c3d33ba04c019b0ddc2c4bb86d4
> MD5 (wmpuzzle/daemon.xpm) = 2822c63820f67a68702fe8627b0ae688
>diff -ruN wmpuzzle/files/patch-Makefile /dana/jail/lemur/usr/ports/games/wmpuzzle/files/patch-Makefile
>--- wmpuzzle/files/patch-Makefile	Mon Aug 26 03:07:47 2002
>+++ /dana/jail/lemur/usr/ports/games/wmpuzzle/files/patch-Makefile	Thu Jan  1 01:00:00 1970
>@@ -1,61 +0,0 @@
>-$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
>diff -ruN wmpuzzle/files/patch-wmpuzzle.6 /dana/jail/lemur/usr/ports/games/wmpuzzle/files/patch-wmpuzzle.6
>--- wmpuzzle/files/patch-wmpuzzle.6	Mon Aug 26 03:07:47 2002
>+++ /dana/jail/lemur/usr/ports/games/wmpuzzle/files/patch-wmpuzzle.6	Thu Jan  1 01:00:00 1970
>@@ -1,14 +0,0 @@
>-$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
>diff -ruN wmpuzzle/files/patch-wmpuzzle.c /dana/jail/lemur/usr/ports/games/wmpuzzle/files/patch-wmpuzzle.c
>--- wmpuzzle/files/patch-wmpuzzle.c	Mon Aug 26 03:07:47 2002
>+++ /dana/jail/lemur/usr/ports/games/wmpuzzle/files/patch-wmpuzzle.c	Sun Oct 27 17:28:37 2002
>@@ -1,30 +1,13 @@
>-$FreeBSD: ports/games/wmpuzzle/files/patch-wmpuzzle.c,v 1.1 2002/08/26 01:07:47 petef Exp $
>-
>---- wmpuzzle.c.orig	Thu Apr 18 00:13:52 2002
>-+++ wmpuzzle.c	Wed May 15 21:21:20 2002
>-@@ -22,6 +22,7 @@
>- #include "xpm/eagle.xpm"
>- #include "xpm/earth.xpm"
>- #include "xpm/linux.xpm"
>-+#include "xpm/daemon.xpm"
>+--- 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");
>diff -ruN wmpuzzle/files/patch-wmpuzzle.h /dana/jail/lemur/usr/ports/games/wmpuzzle/files/patch-wmpuzzle.h
>--- wmpuzzle/files/patch-wmpuzzle.h	Thu Jan  1 01:00:00 1970
>+++ /dana/jail/lemur/usr/ports/games/wmpuzzle/files/patch-wmpuzzle.h	Sun Oct 27 17:28:32 2002
>@@ -0,0 +1,11 @@
>+--- wmpuzzle.h.orig	Mon Oct 21 21:20:19 2002
>++++ wmpuzzle.h	Sun Oct 27 17:28:09 2002
>+@@ -8,7 +8,7 @@
>+ #define WMPUZZLE_H_INCLUDED
>+ 
>+ #include <config.h>
>+-#include <linux.xpm>
>++#include <daemon.xpm>
>+ 
>+ #define EINTERNAL 200
>+ #define EINVALXPM 201
>diff -ruN wmpuzzle/pkg-descr /dana/jail/lemur/usr/ports/games/wmpuzzle/pkg-descr
>--- wmpuzzle/pkg-descr	Mon Aug 26 03:07:47 2002
>+++ /dana/jail/lemur/usr/ports/games/wmpuzzle/pkg-descr	Mon Oct 28 09:47:13 2002
>@@ -3,4 +3,4 @@
> Now includes special BSD Daemon skin not present in original
> distribution!
> 
>-WWW: http://wwwtcs.inf.tu-dresden.de/~godisch/debian/wmpuzzle/
>+WWW: http://www.godisch.de/debian/wmpuzzle/

Actions: View | Diff

Attachments on bug 44556: 26124