5 files changed, 26 insertions, 32 deletions

diff --git a/x11-wm/matwm2/Makefile b/x11-wm/matwm2/Makefile
index 584679295ee8..f85a2a5b958f 100644
--- a/x11-wm/matwm2/Makefile
+++ b/x11-wm/matwm2/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	matwm2
-PORTVERSION=	0.0.90
+PORTVERSION=	0.1.0
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://www.gatorgitter.com/~maties/
+MASTER_SITES=	http://www.squidjam.com/matwm/pub/
 
 MAINTAINER=	sic_zer0@hotmail.com
 COMMENT=	A minimalistic, yet functional window manager for x11
 
-USE_XORG=	x11 xext
-PLIST_FILES=	bin/matwm2
+USE_XORG=	x11 xext xinerama xft
+
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--cc=${CC} --prefix=${PREFIX} --mandir=${MANPREFIX}/man
 
-MAN1=		matwm2.1
+PLIST_FILES=	bin/matwm2
+MAN1=	matwm2.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/matwm2/distinfo b/x11-wm/matwm2/distinfo
index 983b871b3ccb..08e02fed8ff6 100644
--- a/x11-wm/matwm2/distinfo
+++ b/x11-wm/matwm2/distinfo
@@ -1,3 +1,3 @@
-MD5 (matwm2-0.0.90.tar.gz) = c62ec58842164801e5bc4b9bf08f9998
-SHA256 (matwm2-0.0.90.tar.gz) = a6d1f8b280c13ad4305bf3193c9603ff96745369db9bb3e349c1cd20d70e226a
-SIZE (matwm2-0.0.90.tar.gz) = 42471
+MD5 (matwm2-0.1.0.tar.gz) = fa05a0802bbd063ab5274a58e34d97af
+SHA256 (matwm2-0.1.0.tar.gz) = 20eba08cf0ee0611de3ee6c3de75e57c56b27d4066a7a026bce0c9dc76bd920e
+SIZE (matwm2-0.1.0.tar.gz) = 63713
diff --git a/x11-wm/matwm2/files/patch-Makefile b/x11-wm/matwm2/files/patch-Makefile
deleted file mode 100644
index ea6fa57cb44e..000000000000
--- a/x11-wm/matwm2/files/patch-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig	2009-11-25 01:51:50.000000000 +0100
-+++ Makefile	2009-11-25 01:53:45.000000000 +0100
-@@ -1,7 +1,4 @@
--PREFIX    = /usr/local
--MANPREFIX = /usr/local
--XROOT     = /usr/X11R6
--CC        = cc
-+XROOT     = ${LOCALBASE}
- RM        = rm -f
- 
- CFLAGS    += -DSHAPE # comment out this line to disable shape support
-@@ -26,9 +23,8 @@
- 	./makeheader *.c > all.h
- 
- install: matwm2
--	mkdir -p $(PREFIX)/bin $(MANPREFIX)/man/man1
--	install -s matwm2 $(PREFIX)/bin
--	install matwm2.1 $(MANPREFIX)/man/man1
-+	${BSD_INSTALL_PROGRAM} -s matwm2 $(PREFIX)/bin
-+	${BSD_INSTALL_MAN} matwm2.1 $(MANPREFIX)/man/man1
- 
- deinstall:
- 	rm -f $(PREFIX)/bin/matwm2 $(MANPREFIX)/man/man1/matwm2.1* $(MANPREFIX)/man/cat1/matwm2.1*
diff --git a/x11-wm/matwm2/files/patch-Makefile.in b/x11-wm/matwm2/files/patch-Makefile.in
new file mode 100644
index 000000000000..61da53272bc1
--- /dev/null
+++ b/x11-wm/matwm2/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+--- Makefile.in.old	2010-01-30 00:39:35.000000000 +0100
++++ Makefile.in	2010-01-30 00:39:56.000000000 +0100
+@@ -23,9 +23,8 @@
+ 	$(RM) matwm2 *.o
+ 
+ install: matwm2
+-	mkdir -p $(PREFIX)/bin $(MANDIR)/man1
+-	install -s matwm2 $(PREFIX)/bin
+-	install matwm2.1 $(MANDIR)/man1
++	${BSD_INSTALL_PROGRAM} matwm2 $(PREFIX)/bin
++	${BSD_INSTALL_MAN} matwm2.1 $(MANDIR)/man1
+ 
+ deinstall:
+ 	$(RM) $(PREFIX)/bin/matwm2 $(MANDIR)/man1/matwm2.1* $(MANDIR)/cat1/matwm2.1*
diff --git a/x11-wm/matwm2/pkg-descr b/x11-wm/matwm2/pkg-descr
index b6da8c7f47be..ddb83a58d27a 100644
--- a/x11-wm/matwm2/pkg-descr
+++ b/x11-wm/matwm2/pkg-descr
@@ -1,4 +1,4 @@
 matwm2 is a simple window manager for x11.
 It aims to be small, fast, stable and usable.
 
-WWW: http://www.gatorgitter.com/~maties/
+WWW: http://www.squidjam.com/matwm/