- Update to version 2.0.20 and provide working master sites

- Define LICENSE (GPLv2) and no longer require GNU make(1)
- Install some documentation and a sample configuration file
- Amend features and project URL in port description text

4 files changed, 34 insertions, 18 deletions

diff --git a/x11-wm/oroborus/Makefile b/x11-wm/oroborus/Makefile
index bbebf3cf4d1d..06c1028ce6c0 100644
--- a/x11-wm/oroborus/Makefile
+++ b/x11-wm/oroborus/Makefile
@@ -2,20 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	oroborus
-PORTVERSION=	2.0.18
-PORTREVISION=	1
+PORTVERSION=	2.0.20
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://www.oroborus.org/debian/dists/sid/main/source/x11/ \
-		http://matt.peterson.org/FreeBSD/ports/
+MASTER_SITES=	DEBIAN/pool/main/o/${PORTNAME} GENTOO
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	matt@peterson.org
 COMMENT=	Small and simple GNOME-compatible window manager
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+LICENSE=	GPLv2
 
-USE_XORG=	xpm
-USES=		gmake
 GNU_CONFIGURE=	yes
+USE_XORG=	xpm
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+PORTDOCS=	AUTHORS ChangeLog README TODO
+
+OPTIONS_DEFINE=	DOCS
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/example.oroborusrc \
+		${STAGEDIR}${ETCDIR}rc.sample
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-wm/oroborus/distinfo b/x11-wm/oroborus/distinfo
index d0917beb67c5..c6f9e8e26a2b 100644
--- a/x11-wm/oroborus/distinfo
+++ b/x11-wm/oroborus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (oroborus_2.0.18.tar.gz) = f2fe8a76f6b3136119b1d8d9c2b0776d8e6f4483f2451ab18f3b09d32f611242
-SIZE (oroborus_2.0.18.tar.gz) = 671465
+SHA256 (oroborus_2.0.20.tar.gz) = 5220a540bcf6812c6773fbe583d9ea3f54f452cbac55bedcaadeba8c3a9a7b89
+SIZE (oroborus_2.0.20.tar.gz) = 335099
diff --git a/x11-wm/oroborus/pkg-descr b/x11-wm/oroborus/pkg-descr
index 6b79d766f0b4..9971019c905a 100644
--- a/x11-wm/oroborus/pkg-descr
+++ b/x11-wm/oroborus/pkg-descr
@@ -1,13 +1,17 @@
-Oroborus is a small and simple window manager for X which has the following
-features:
+Oroborus is a small and simple window manager for X11 which has the
+following features:
 
- o Themeable appearance
- o Virtual desktops
- o Full keyboard control
- o Works with GNOME
+  - Good default key bindings
+  - Windows are moveable by keyboard
+  - Highly configurable
+  - XPM-themable
+  - GNOME compatible
+  - NET_WM compatible
+  - Sort of KDE compatible
+  - And many, many more...
 
 Oroborus doesn't provide any kind of dock, toolbar, program launcher,
-background changer or root menu as these functions can be provided by separate
-applications.
+background changer or root menu as these functions can be provided by
+separate applications.
 
-WWW: http://www.dreamind.de/oroborus.shtml
+WWW: http://www.oroborus.org/
diff --git a/x11-wm/oroborus/pkg-plist b/x11-wm/oroborus/pkg-plist
index 44263f436331..4cf950527915 100644
--- a/x11-wm/oroborus/pkg-plist
+++ b/x11-wm/oroborus/pkg-plist
@@ -1,4 +1,5 @@
 bin/oroborus
+@sample etc/oroborusrc.sample
 %%DATADIR%%/defaults
 %%DATADIR%%/schemes/beos
 %%DATADIR%%/schemes/blue