6 files changed, 12 insertions, 51 deletions

diff --git a/deskutils/wmpinboard/Makefile b/deskutils/wmpinboard/Makefile
index 7314affc168f..721efc52a478 100644
--- a/deskutils/wmpinboard/Makefile
+++ b/deskutils/wmpinboard/Makefile
@@ -8,18 +8,23 @@
 PORTNAME=	wmpinboard
 PORTVERSION=	1.0
 CATEGORIES=	deskutils afterstep windowmaker
-MASTER_SITES=	http://www.tu-ilmenau.de/~gomar/stuff/wmpinboard/ \
-		http://soupnazi.org/FreeBSD/ports/distfiles/
+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Post-it notes for the WindowMaker dock or AfterStep Wharf
 
-USE_BZIP2=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
+
 USE_XPM=	yes
+USE_GETOPT_LONG=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-
-INSTALL_TARGET=	install-strip
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
 
 MAN1=		wmpinboard.1
 
+PLIST_FILES=	bin/wmpinboard
+
 .include <bsd.port.mk>
diff --git a/deskutils/wmpinboard/distinfo b/deskutils/wmpinboard/distinfo
index 7f007f049f2d..57ca03ddea88 100644
--- a/deskutils/wmpinboard/distinfo
+++ b/deskutils/wmpinboard/distinfo
@@ -1,2 +1,2 @@
-MD5 (wmpinboard-1.0.tar.bz2) = 5a270397f7765b3416abae43d020a0c9
-SIZE (wmpinboard-1.0.tar.bz2) = 112267
+MD5 (wmpinboard_1.0.orig.tar.gz) = b5940439704ea7ae368b382d7f9ff3ed
+SIZE (wmpinboard_1.0.orig.tar.gz) = 132912
diff --git a/deskutils/wmpinboard/files/patch-src::Makefile.in b/deskutils/wmpinboard/files/patch-src::Makefile.in
deleted file mode 100644
index eaec98af446f..000000000000
--- a/deskutils/wmpinboard/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Wed Apr 18 13:15:59 2001
-+++ src/Makefile.in	Wed Apr 18 13:16:06 2001
-@@ -86,7 +86,7 @@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--wmpinboard_OBJECTS =  misc.o notes.o wmpinboard.o xmisc.o
-+wmpinboard_OBJECTS =  misc.o notes.o wmpinboard.o xmisc.o getopt.o getopt1.o
- wmpinboard_LDADD = $(LDADD)
- wmpinboard_DEPENDENCIES = 
- wmpinboard_LDFLAGS = 
diff --git a/deskutils/wmpinboard/files/patch-src::getopt.c b/deskutils/wmpinboard/files/patch-src::getopt.c
deleted file mode 100644
index 6bc5c28e2cca..000000000000
--- a/deskutils/wmpinboard/files/patch-src::getopt.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- getopt.c.orig	Wed Sep  1 17:49:35 1999
-+++ src/getopt.c	Wed Apr 18 13:26:19 2001
-@@ -73,9 +73,9 @@
- 
- #ifdef VMS
- #include <unixlib.h>
--#if HAVE_STRING_H - 0
--#include <string.h>
- #endif
-+#if HAVE_STRING_H
-+#include <string.h>
- #endif
- 
- #if defined (WIN32) && !defined (__CYGWIN32__)
-@@ -650,6 +650,7 @@
- 				else
- 				{
- 					if (opterr)
-+					{
- 						if (argv[optind - 1][1] == '-')
- 							/* --option */
- 							fprintf(stderr,
-@@ -660,6 +661,7 @@
- 							fprintf(stderr,
- 								_("%s: option `%c%s' doesn't allow an argument\n"),
- 								argv[0], argv[optind - 1][0], pfound->name);
-+					}
- 
- 					nextchar += strlen(nextchar);
- 
diff --git a/deskutils/wmpinboard/pkg-descr b/deskutils/wmpinboard/pkg-descr
index eba447059b0e..7cbf87a397f9 100644
--- a/deskutils/wmpinboard/pkg-descr
+++ b/deskutils/wmpinboard/pkg-descr
@@ -1,5 +1,3 @@
 Post-it notes for the WindowMaker dock or AfterStep Wharf.
 
-WWW: http://www.tu-ilmenau.de/~gomar/stuff/wmpinboard/
-
 - Jim <jim@FreeBSD.org>
diff --git a/deskutils/wmpinboard/pkg-plist b/deskutils/wmpinboard/pkg-plist
deleted file mode 100644
index f263750af77b..000000000000
--- a/deskutils/wmpinboard/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/wmpinboard