diff -u pekwm-orig/Makefile pekwm/Makefile
--- pekwm-orig/Makefile	Fri Sep 10 05:40:36 2004
+++ pekwm/Makefile	Fri Sep 10 05:42:56 2004
@@ -6,26 +6,34 @@
 #
 
 PORTNAME=	pekwm
-PORTVERSION=	0.1.3
-PORTREVISION=	2
+PORTVERSION=	20040828
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://pekwm.org/files/source/
+MASTER_SITES=	http://bsd-unix.org/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A windowmanager based on aewm++
 
+LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2 \
+		Xft.2:${PORTSDIR}/x11-fonts/libXft
+
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_GCC=	3.3
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+USE_X_PREFIX=	yes
+
+MAN1=		pekwm.1
+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--enable-shape --disable-xft --disable-xinerama \
-		--disable-debug --enable-menus --enable-keygrabber \
-		--enable-harbour --disable-pcre
+CONFIGURE_ARGS=	--enable-shape --enable-xinerama --enable-xrandr \
+		--disable-pcre --enable-xft --enable-imlib2 --disable-debug \
+		--enable-menus --enable-keygrabber --enable-harbour
 
-MAN1=		pekwm.1
+.include <bsd.port.pre.mk>
 
-post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/pekwm
+post-patch:
+	@${REINPLACE_CMD} -e 's|pkill|killall|' \
+		${WRKSRC}/data/scripts/pekwm_themeset.*
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -u pekwm-orig/distinfo pekwm/distinfo
--- pekwm-orig/distinfo	Fri Sep 10 05:40:36 2004
+++ pekwm/distinfo	Thu Sep  9 09:36:51 2004
@@ -1,2 +1,2 @@
-MD5 (pekwm-0.1.3.tar.bz2) = c0bd31ae08fa0067f6a6584270403675
-SIZE (pekwm-0.1.3.tar.bz2) = 1694563
+MD5 (pekwm-20040828.tar.bz2) = d4797f684bc083af2be70d0970fcccdc
+SIZE (pekwm-20040828.tar.bz2) = 249855
diff -u pekwm-orig/files/patch-aa pekwm/files/patch-aa
--- pekwm-orig/files/patch-aa	Fri Sep 10 05:40:36 2004
+++ pekwm/files/patch-aa	Wed Dec 31 17:00:00 1969
@@ -1,9 +0,0 @@
---- data/scripts/pekwm_themeset.pl.orig Wed Jun 18 21:15:56 2003
-+++ data/scripts/pekwm_themeset.pl      Wed Jun 18 21:16:16 2003
-@@ -46,5 +46,5 @@
- 	print(PKCONF @file);
- 	close(PKCONF);
-
--	system("pkill -HUP pekwm"); # Make pekwm re-read it's config
-+	system("killall -HUP pekwm"); # Make pekwm re-read it's config
- }
diff -u pekwm-orig/pkg-plist pekwm/pkg-plist
--- pekwm-orig/pkg-plist	Fri Sep 10 05:40:36 2004
+++ pekwm/pkg-plist	Thu Sep  9 09:30:31 2004
@@ -5,6 +5,9 @@
 etc/pekwm/menu
 etc/pekwm/mouse
 etc/pekwm/start
+share/pekwm/scripts/pekwm_themeset.pl
+share/pekwm/scripts/pekwm_themeset.sh
+share/pekwm/scripts/pekwm_ws_menu.pl
 share/pekwm/themes/default/b-bottom-c.xpm
 share/pekwm/themes/default/b-bottom-l.xpm
 share/pekwm/themes/default/b-bottom-r.xpm
@@ -19,14 +22,41 @@
 share/pekwm/themes/default/btn-b-right-fo.xpm
 share/pekwm/themes/default/btn-b-right-pr.xpm
 share/pekwm/themes/default/btn-b-right-un.xpm
+share/pekwm/themes/default/harbour.xpm
 share/pekwm/themes/default/sep-fo.xpm
 share/pekwm/themes/default/sep-un.xpm
-share/pekwm/themes/default/theme.in
+share/pekwm/themes/default/theme
 share/pekwm/themes/default/win-fo-sel.xpm
 share/pekwm/themes/default/win-fo.xpm
 share/pekwm/themes/default/win-un-sel.xpm
 share/pekwm/themes/default/win-un.xpm
-share/pekwm/themes/default/theme
+share/pekwm/themes/horizon/b-b.xpm
+share/pekwm/themes/horizon/b-bl.xpm
+share/pekwm/themes/horizon/b-br.xpm
+share/pekwm/themes/horizon/b-l.xpm
+share/pekwm/themes/horizon/b-r.xpm
+share/pekwm/themes/horizon/b-t.xpm
+share/pekwm/themes/horizon/b-tl.xpm
+share/pekwm/themes/horizon/b-tr.xpm
+share/pekwm/themes/horizon/btn-c-p.xpm
+share/pekwm/themes/horizon/btn-c-u.xpm
+share/pekwm/themes/horizon/btn-c.xpm
+share/pekwm/themes/horizon/btn-i-p.xpm
+share/pekwm/themes/horizon/btn-i-u.xpm
+share/pekwm/themes/horizon/btn-i.xpm
+share/pekwm/themes/horizon/btn-m-p.xpm
+share/pekwm/themes/horizon/btn-m-u.xpm
+share/pekwm/themes/horizon/btn-m.xpm
+share/pekwm/themes/horizon/h.xpm
+share/pekwm/themes/horizon/s-f-s.xpm
+share/pekwm/themes/horizon/s-f.xpm
+share/pekwm/themes/horizon/s-u-s.xpm
+share/pekwm/themes/horizon/s-u.xpm
+share/pekwm/themes/horizon/t-f-s.xpm
+share/pekwm/themes/horizon/t-f.xpm
+share/pekwm/themes/horizon/t-u-s.xpm
+share/pekwm/themes/horizon/t-u.xpm
+share/pekwm/themes/horizon/theme
 share/pekwm/themes/minimal/bd-hrz.xpm
 share/pekwm/themes/minimal/bd-vrt.xpm
 share/pekwm/themes/minimal/fo-bd-c.xpm
@@ -36,16 +66,17 @@
 share/pekwm/themes/minimal/fo-win.xpm
 share/pekwm/themes/minimal/harbour.xpm
 share/pekwm/themes/minimal/se-win.xpm
-share/pekwm/themes/minimal/theme.in
+share/pekwm/themes/minimal/theme
 share/pekwm/themes/minimal/un-bd-c.xpm
+share/pekwm/themes/minimal/un-btn-cl.xpm
+share/pekwm/themes/minimal/un-btn-ic.xpm
+share/pekwm/themes/minimal/un-btn-ma.xpm
 share/pekwm/themes/minimal/un-win.xpm
 share/pekwm/themes/minimal/unse-win.xpm
-share/pekwm/themes/minimal/theme
-share/pekwm/scripts/pekwm_themeset.pl
-share/pekwm/scripts/pekwm_ws_menu.pl
+@dirrm share/pekwm/scripts
 @dirrm share/pekwm/themes/default
+@dirrm share/pekwm/themes/horizon
 @dirrm share/pekwm/themes/minimal
 @dirrm share/pekwm/themes
-@dirrm share/pekwm/scripts
 @dirrm share/pekwm
 @dirrm etc/pekwm