summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/wmpuzzle/Makefile21
-rw-r--r--games/wmpuzzle/distinfo3
-rw-r--r--games/wmpuzzle/files/patch-Makefile.in17
-rw-r--r--games/wmpuzzle/files/patch-wmpuzzle.c13
-rw-r--r--games/wmpuzzle/files/patch-wmpuzzle.h11
5 files changed, 13 insertions, 52 deletions
diff --git a/games/wmpuzzle/Makefile b/games/wmpuzzle/Makefile
index d6c6d8b8f12a..d26e1c62aa24 100644
--- a/games/wmpuzzle/Makefile
+++ b/games/wmpuzzle/Makefile
@@ -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@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 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
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 --git a/games/wmpuzzle/distinfo b/games/wmpuzzle/distinfo
index dcbb1a306019..32d99300f111 100644
--- a/games/wmpuzzle/distinfo
+++ b/games/wmpuzzle/distinfo
@@ -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 --git a/games/wmpuzzle/files/patch-Makefile.in b/games/wmpuzzle/files/patch-Makefile.in
index 7545f58bacc9..c4aeae6e6fd1 100644
--- a/games/wmpuzzle/files/patch-Makefile.in
+++ b/games/wmpuzzle/files/patch-Makefile.in
@@ -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 --git a/games/wmpuzzle/files/patch-wmpuzzle.c b/games/wmpuzzle/files/patch-wmpuzzle.c
deleted file mode 100644
index d48ae9e0e8b9..000000000000
--- a/games/wmpuzzle/files/patch-wmpuzzle.c
+++ /dev/null
@@ -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 --git a/games/wmpuzzle/files/patch-wmpuzzle.h b/games/wmpuzzle/files/patch-wmpuzzle.h
deleted file mode 100644
index e9c147348c11..000000000000
--- a/games/wmpuzzle/files/patch-wmpuzzle.h
+++ /dev/null
@@ -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