6 files changed, 72 insertions, 10 deletions

diff --git a/www/linbot/Makefile b/www/linbot/Makefile
index a2a6ab74655e..e41899f6f48f 100644
--- a/www/linbot/Makefile
+++ b/www/linbot/Makefile
@@ -7,17 +7,15 @@
 
 PORTNAME=	linbot
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/www/misc
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	billf@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
-
-NO_BUILD=	yeah
+RUN_DEPENDS=	python:${PORTSDIR}/lang/python15
 
 do-install:
 	${MKDIR} ${PREFIX}/share/linbot
@@ -28,5 +26,15 @@ do-install:
 	${CP} ${WRKSRC}/${d}/*.py ${PREFIX}/share/linbot/${d}
 .endfor
 	${LN} -sf ${PREFIX}/share/linbot/linbot.py ${PREFIX}/bin/linbot
+.ifndef NOPORTDOCS
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/USAGE ${DOCSDIR}
+
+do-build:
+	${AWK} '/^Running Linbot/ { output=1 } output' \
+		< ${WRKSRC}/INSTALL > ${WRKSRC}/USAGE
+.else
+NO_BUILD=	yeah
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/linbot/files/patch-usage b/www/linbot/files/patch-usage
new file mode 100644
index 000000000000..4d004c10f2bd
--- /dev/null
+++ b/www/linbot/files/patch-usage
@@ -0,0 +1,21 @@
+This patch simply fixes a few typos. The author clearly did not care to
+run a spell-checker :)
+
+	-mi
+
+--- INSTALL	Thu Mar 11 23:56:00 1999
++++ INSTALL	Thu Jul 12 02:30:50 2001
+@@ -31 +31 @@
+-It is simple t run Linbot.
++It is simple to run Linbot.
+@@ -71 +71 @@
+-internal documents. An exampel would be a main server
++internal documents. An example would be a main server
+@@ -148,2 +148,2 @@
+- locationThis specifies the hosts pointed to that are to be considered
+-         internal. By default Linbot only consideres urls pointing to the
++ location This specifies the hosts pointed to that are to be considered
++         internal. By default Linbot only considers URLs pointing to the
+@@ -185 +185 @@
+-concering bug reports.
++concerning bug reports.
diff --git a/www/linbot/pkg-plist b/www/linbot/pkg-plist
index 8fe33fa58873..451fa0247d7b 100644
--- a/www/linbot/pkg-plist
+++ b/www/linbot/pkg-plist
@@ -23,6 +23,8 @@ share/linbot/schemes/filelink.py
 share/linbot/schemes/ftplink.py
 share/linbot/schemes/httplink.py
 share/linbot/version.py
+%%PORTDOCS%%share/doc/linbot/USAGE
+%%PORTDOCS%%@dirrm share/doc/linbot/
 @dirrm share/linbot/plugins
 @dirrm share/linbot/schemes
 @dirrm share/linbot
diff --git a/www/webcheck/Makefile b/www/webcheck/Makefile
index a2a6ab74655e..e41899f6f48f 100644
--- a/www/webcheck/Makefile
+++ b/www/webcheck/Makefile
@@ -7,17 +7,15 @@
 
 PORTNAME=	linbot
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/www/misc
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	billf@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
-
-NO_BUILD=	yeah
+RUN_DEPENDS=	python:${PORTSDIR}/lang/python15
 
 do-install:
 	${MKDIR} ${PREFIX}/share/linbot
@@ -28,5 +26,15 @@ do-install:
 	${CP} ${WRKSRC}/${d}/*.py ${PREFIX}/share/linbot/${d}
 .endfor
 	${LN} -sf ${PREFIX}/share/linbot/linbot.py ${PREFIX}/bin/linbot
+.ifndef NOPORTDOCS
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/USAGE ${DOCSDIR}
+
+do-build:
+	${AWK} '/^Running Linbot/ { output=1 } output' \
+		< ${WRKSRC}/INSTALL > ${WRKSRC}/USAGE
+.else
+NO_BUILD=	yeah
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/webcheck/files/patch-usage b/www/webcheck/files/patch-usage
new file mode 100644
index 000000000000..4d004c10f2bd
--- /dev/null
+++ b/www/webcheck/files/patch-usage
@@ -0,0 +1,21 @@
+This patch simply fixes a few typos. The author clearly did not care to
+run a spell-checker :)
+
+	-mi
+
+--- INSTALL	Thu Mar 11 23:56:00 1999
++++ INSTALL	Thu Jul 12 02:30:50 2001
+@@ -31 +31 @@
+-It is simple t run Linbot.
++It is simple to run Linbot.
+@@ -71 +71 @@
+-internal documents. An exampel would be a main server
++internal documents. An example would be a main server
+@@ -148,2 +148,2 @@
+- locationThis specifies the hosts pointed to that are to be considered
+-         internal. By default Linbot only consideres urls pointing to the
++ location This specifies the hosts pointed to that are to be considered
++         internal. By default Linbot only considers URLs pointing to the
+@@ -185 +185 @@
+-concering bug reports.
++concerning bug reports.
diff --git a/www/webcheck/pkg-plist b/www/webcheck/pkg-plist
index 8fe33fa58873..451fa0247d7b 100644
--- a/www/webcheck/pkg-plist
+++ b/www/webcheck/pkg-plist
@@ -23,6 +23,8 @@ share/linbot/schemes/filelink.py
 share/linbot/schemes/ftplink.py
 share/linbot/schemes/httplink.py
 share/linbot/version.py
+%%PORTDOCS%%share/doc/linbot/USAGE
+%%PORTDOCS%%@dirrm share/doc/linbot/
 @dirrm share/linbot/plugins
 @dirrm share/linbot/schemes
 @dirrm share/linbot