7 files changed, 19 insertions, 111 deletions

diff --git a/misc/wmpal/Makefile b/misc/wmpal/Makefile
index b01f42b6973c..be49b8b8026f 100644
--- a/misc/wmpal/Makefile
+++ b/misc/wmpal/Makefile
@@ -6,21 +6,29 @@
 #
 
 PORTNAME=	wmpal
-PORTVERSION=	0.5
-PORTREVISION=	4
+PORTVERSION=	0.6
 CATEGORIES=	misc windowmaker
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A one of the most useless dockapps in the world
 
-LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
-
-USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
+USE_XORG=	xpm
+USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
 
+PORTDOCS=	README
+PLIST_FILES=	bin/wmpal
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|"dino"|"daemon"|g' ${WRKSRC}/wmpal.c
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/misc/wmpal/distinfo b/misc/wmpal/distinfo
index ad2570371baf..0bf968695348 100644
--- a/misc/wmpal/distinfo
+++ b/misc/wmpal/distinfo
@@ -1,3 +1,3 @@
-MD5 (wmpal-0.5.tar.gz) = 68dcfdda7306a267319fbbc38fc2f85d
-SHA256 (wmpal-0.5.tar.gz) = 1dc40c6c9a13f09ee4bd4f6a5a78e5e858e2922f5e13b9f4494dcde3069b38b9
-SIZE (wmpal-0.5.tar.gz) = 135310
+MD5 (wmpal-0.6.tar.gz) = f9df8bc8afc2cb9f729932f16269b610
+SHA256 (wmpal-0.6.tar.gz) = 0c0e10d5ed4e9872586264dbf9df95cec58e3e7f8b779d920db12c6352a1e63d
+SIZE (wmpal-0.6.tar.gz) = 183210
diff --git a/misc/wmpal/files/patch-Makefile.in b/misc/wmpal/files/patch-Makefile.in
deleted file mode 100644
index 64da9ae1399e..000000000000
--- a/misc/wmpal/files/patch-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in	2001/04/20 12:18:18	1.1
-+++ Makefile.in	2001/04/20 12:18:51
-@@ -3,18 +3,18 @@
- all:	wmpal
- 
- wmpal:
--	cd src && make wmpal
-+	cd src && $(MAKE) wmpal
- 
- clean:
- 	rm -f *~ *.o core
--	cd src && make clean
-+	cd src && $(MAKE) clean
- 
- distclean:	clean
- 	rm -f config.status config.log Makefile config.cache
--	cd src && make distclean
-+	cd src && $(MAKE) distclean
- 
- install:
--	cd src && make install
-+	cd src && $(MAKE) install
- 
- uninstall:
--	cd src && make uninstall
-+	cd src && $(MAKE) uninstall
diff --git a/misc/wmpal/files/patch-configure b/misc/wmpal/files/patch-configure
deleted file mode 100644
index 91906181f14a..000000000000
--- a/misc/wmpal/files/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Fri Apr 20 03:56:43 2001
-+++ configure	Fri Apr 20 15:14:17 2001
-@@ -1205,7 +1205,8 @@
- fi
- 
- 
--LDFLAGS=`gtk-config --cflags`
-+CFLAGS="${CFLAGS} `${GTK_CONFIG} --cflags`"
-+LDFLAGS="${LDFLAGS} `${GTK_CONFIG} --libs`"
- 
- 
- 
diff --git a/misc/wmpal/files/patch-src::Makefile.in b/misc/wmpal/files/patch-src::Makefile.in
deleted file mode 100644
index b77484dd0b29..000000000000
--- a/misc/wmpal/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.in.orig	Fri Apr 20 03:56:43 2001
-+++ src/Makefile.in	Fri Apr 20 15:19:46 2001
-@@ -5,7 +5,7 @@
- SRCS = wmpal.c xsay.c
- OBJS = $(SRCS:.c=.o)
- 
--CFLAGS = -Wall -O2 -I.
-+CFLAGS = @CFLAGS@ @CPPFLAGS@ -Wall -I.
- 
- LDFLAGS = @LDFLAGS@
- 
-@@ -17,18 +17,13 @@
- 	$(CC) $(LDFLAGS) $(CFLAGS) -c $< -o $*.o
- 
- install:	all
--	if test ! -d $(PREFIX); then mkdir -p $(PREFIX); fi
--
--	if test ! -d $(PREFIX)/bin; then mkdir -p $(PREFIX)/bin; fi
--
--	@INSTALL@ -c -m 755 -s wmpal $(PREFIX)/bin
--
--	@INSTALL@ -c -m 755 -s xsay $(PREFIX)/bin
-+	$(BSD_INSTALL_PROGRAM) wmpal $(PREFIX)/bin
-+	$(BSD_INSTALL_PROGRAM) xsay $(PREFIX)/bin
- 
- wmpal:	        $(IFLAGS)
--	gcc -g -o wmpal wmpal.c $(LIBS) $(CFLAGS)
--	gcc -DHAVE_CONFIG_H -g xsay.c -g -O2 -Wall $(LDFLAGS) -c xsay.c
--	gcc  -g -O2 -Wall $(LDFLAGS) -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm -o xsay xsay.o
-+	$(CC) $(CFLAGS) -o wmpal wmpal.c $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -c -DHAVE_CONFIG_H xsay.c -o xsay.o
-+	$(CC) $(CFLAGS) -o xsay xsay.o $(LDFLAGS) $(LIBS)
- 	strip wmpal
- 	strip xsay
- 
diff --git a/misc/wmpal/files/patch-src::config.h.in b/misc/wmpal/files/patch-src::config.h.in
deleted file mode 100644
index 5fb947aa6b08..000000000000
--- a/misc/wmpal/files/patch-src::config.h.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- src/config.h.in	2001/04/20 12:24:15	1.1
-+++ src/config.h.in	2001/04/20 12:24:31
-@@ -5,8 +5,8 @@
- 
- /* Choose one pal and remove the slash-star from both ends */
- 
--#define DINO
--/* #define DEMON */
-+/* #define DINO */
-+#define DEMON
- /* #define GRAPE */
- /* #define PEAR */
- /* #define SUN */
diff --git a/misc/wmpal/pkg-plist b/misc/wmpal/pkg-plist
deleted file mode 100644
index a8f6fd4d9be2..000000000000
--- a/misc/wmpal/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/wmpal
-bin/xsay