4 files changed, 20 insertions, 33 deletions
diff --git a/x11-clocks/wmbday/Makefile b/x11-clocks/wmbday/Makefile
index 0cef729123c7..43c9d638eb0b 100644
--- a/x11-clocks/wmbday/Makefile
+++ b/x11-clocks/wmbday/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	wmbday
-PORTVERSION=	0.2a
+PORTVERSION=	0.3
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://buzzinhornetz.ath.cx/wmbday/files/
 
@@ -15,14 +15,13 @@ COMMENT=	Window Maker dock app that will remind you of birthdays
 BUILD_DEPENDS=	${X11BASE}/bin/xmessage:${X_CLIENTS_PORT}
 
 HAS_CONFIGURE=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
+MAKEFILE=	BSDmakefile
 
 MAN1=		wmbday.1
+MANCOMPRESSED=	yes
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmbday ${PREFIX}/bin
-.if !defined(NO_INSTALL_MANPAGES)
-	${INSTALL_MAN} ${WRKSRC}/wmbday.1 ${PREFIX}/man/man1
-.endif
+post-extract:
+	@${CP} ${FILESDIR}/BSDmakefile ${WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/wmbday/distinfo b/x11-clocks/wmbday/distinfo
index 290ebb250207..0ff7140a00e2 100644
--- a/x11-clocks/wmbday/distinfo
+++ b/x11-clocks/wmbday/distinfo
@@ -1,2 +1,2 @@
-MD5 (wmbday-0.2a.tar.gz) = b4c1062e5db18c4dc2c6cf2896dc7b7b
-SIZE (wmbday-0.2a.tar.gz) = 16884
+MD5 (wmbday-0.3.tar.gz) = 0bfa927ef0784d9619db11aa01c26bee
+SIZE (wmbday-0.3.tar.gz) = 18835
diff --git a/x11-clocks/wmbday/files/BSDmakefile b/x11-clocks/wmbday/files/BSDmakefile
new file mode 100644
index 000000000000..2bd25e5b012a
--- /dev/null
+++ b/x11-clocks/wmbday/files/BSDmakefile
@@ -0,0 +1,12 @@
+PROG=	wmbday
+SRCS=	date.c main.c ring.c
+
+PREFIX?=  ${X11BASE}
+
+BINDIR=   ${PREFIX}/bin
+SHAREDIR= ${PREFIX}
+CFLAGS+=  -I/usr/X11R6/include
+LDFLAGS+= -L/usr/X11R6/lib
+LDADD=    -lX11 -lXext -lXpm
+
+.include <bsd.prog.mk>
diff --git a/x11-clocks/wmbday/files/patch-Makefile b/x11-clocks/wmbday/files/patch-Makefile
deleted file mode 100644
index 33f5cdad0b4d..000000000000
--- a/x11-clocks/wmbday/files/patch-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	Sun Jul 27 15:11:38 2003
-+++ Makefile	Tue Jan  6 00:39:09 2004
-@@ -1,16 +1,15 @@
--CC 				= gcc
- OBJS			= date.c ring.c main.c
--INCDIR			= -I/usr/X11R6/include
--LIBDIR			= -L/usr/X11R6/lib
-+INCDIR			= -I$(X11BASE)/include
-+LIBDIR			= -L$(X11BASE)/lib
- LIBS			= -lX11 -lXext
--BIN_DESTDIR 	= /usr/local/bin
--MAN_DESTDIR		= /usr/local/man/man1
-+BIN_DESTDIR 	= $(PREFIX)/local/bin
-+MAN_DESTDIR		= $(PREFIX)/man/man1
- PACKAGE 		= wmbday
- VERSION 		= 0.1
- 
- 
- all:
--	$(CC) $(OBJS) -o wmbday -Wall $(LIBDIR) $(LIBS) $(INCDIR)
-+	$(CC) $(CFLAGS) $(OBJS) -o wmbday -Wall $(LIBDIR) $(LIBS) $(INCDIR)
- 
- debug:
- 	$(CC) -g $(OBJS) -o wmbday -Wall $(LIBDIR) $(LIBS) $(INCDIR)