ports/51700: Update port: games/wmpuzzle to 0.4.0

[KATO Tsuguru]

>Number:         51700
>Category:       ports
>Synopsis:       Update port: games/wmpuzzle to 0.4.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 02 16:10:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.4.0

Remove file:
files/patch-wmpuzzle.c
files/patch-wmpuzzle.h

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/games/wmpuzzle/Makefile games/wmpuzzle/Makefile
--- /usr/ports/games/wmpuzzle/Makefile	Fri May  2 19:43:54 2003
+++ games/wmpuzzle/Makefile	Fri May  2 20:46:31 2003
@@ -6,20 +6,14 @@
 #
 
 PORTNAME=	wmpuzzle
-PORTVERSION=	0.2.0
+PORTVERSION=	0.4.0
 CATEGORIES=	games windowmaker afterstep
-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.xpm:bsdpics
-DIST_SUBDIR=	wmpuzzle
-EXTRACT_ONLY=	wmpuzzle_${PORTVERSION}.orig${EXTRACT_SUFX}
+MASTER_SITES=	http://www.godisch.de/debian/wmpuzzle/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A dockable puzzle game for WindowMaker and AfterStep
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
@@ -31,14 +25,7 @@
 
 MAN6=		wmpuzzle.6
 
-BSDIMAGES=	daemon.xpm
-
-CPPFLAGS=	-I${X11BASE}/include 
+CPPFLAGS=	-I${X11BASE}/include -DBSD
 LDFLAGS=	-L${X11BASE}/lib
-
-post-extract:
-.for i in ${BSDIMAGES}
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${i} ${WRKSRC}/
-.endfor
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/wmpuzzle/distinfo games/wmpuzzle/distinfo
--- /usr/ports/games/wmpuzzle/distinfo	Fri Nov  1 21:53:53 2002
+++ games/wmpuzzle/distinfo	Fri May  2 17:07:59 2003
@@ -1,2 +1 @@
-MD5 (wmpuzzle/wmpuzzle_0.2.0.orig.tar.gz) = 09605c3d33ba04c019b0ddc2c4bb86d4
-MD5 (wmpuzzle/daemon.xpm) = 2822c63820f67a68702fe8627b0ae688
+MD5 (wmpuzzle-0.4.0.tar.gz) = 891f82a7ef0cf855816529fa43fff019
diff -urN /usr/ports/games/wmpuzzle/files/patch-Makefile.in games/wmpuzzle/files/patch-Makefile.in
--- /usr/ports/games/wmpuzzle/files/patch-Makefile.in	Sun Feb  2 23:16:39 2003
+++ games/wmpuzzle/files/patch-Makefile.in	Fri May  2 17:04:09 2003
@@ -1,24 +1,23 @@
---- Makefile.in.orig	Tue Oct 22 04:56:02 2002
-+++ Makefile.in	Fri Jan 24 03:36:00 2003
-@@ -8,10 +8,13 @@
- mandir      = @mandir@
+--- Makefile.in.orig	Tue Feb 18 01:34:38 2003
++++ Makefile.in	Fri May  2 17:03:57 2003
+@@ -9,9 +9,12 @@
  
  CC          = @CC@
+ CFLAGS      = -I. @CFLAGS@
 +CPPFLAGS    = @CPPFLAGS@
- CFLAGS      = -I. -Wall @CFLAGS@
  LDFLAGS     = @LDFLAGS@
  LIBS        = @LIBS@
  INSTALL     = @INSTALL@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA    = @INSTALL_DATA@
- LN_S        = @LN_S@
++INSTALL_DATA = @INSTALL_DATA@
  
  all: wmpuzzle
-@@ -23,8 +26,8 @@
+ 
+@@ -22,8 +25,8 @@
  wmgeneral.o: wmgeneral.c wmgeneral.h
  
  install: wmpuzzle wmpuzzle.6
--	$(INSTALL) -D -s -m 755 wmpuzzle $(DESTDIR)$(bindir)/wmpuzzle
+-	$(INSTALL) -D -m 755 wmpuzzle $(DESTDIR)$(bindir)/wmpuzzle
 -	$(INSTALL) -D -m 644 wmpuzzle.6 $(DESTDIR)$(mandir)/man6/wmpuzzle.6
 +	$(INSTALL_PROGRAM) wmpuzzle $(DESTDIR)$(bindir)/wmpuzzle
 +	$(INSTALL_DATA) wmpuzzle.6 $(DESTDIR)$(mandir)/man6/wmpuzzle.6
diff -urN /usr/ports/games/wmpuzzle/files/patch-wmpuzzle.c games/wmpuzzle/files/patch-wmpuzzle.c
--- /usr/ports/games/wmpuzzle/files/patch-wmpuzzle.c	Fri Nov  1 21:53:53 2002
+++ games/wmpuzzle/files/patch-wmpuzzle.c	Thu Jan  1 09:00:00 1970
@@ -1,13 +0,0 @@
---- 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;
- 	}
- }
- 
diff -urN /usr/ports/games/wmpuzzle/files/patch-wmpuzzle.h games/wmpuzzle/files/patch-wmpuzzle.h
--- /usr/ports/games/wmpuzzle/files/patch-wmpuzzle.h	Tue Oct 29 01:55:22 2002
+++ games/wmpuzzle/files/patch-wmpuzzle.h	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- 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
>Release-Note:
>Audit-Trail:
>Unformatted: