4 files changed, 7 insertions, 215 deletions
diff --git a/www/wsmake/Makefile b/www/wsmake/Makefile
index c4f958c09479..351196089e33 100644
--- a/www/wsmake/Makefile
+++ b/www/wsmake/Makefile
@@ -8,11 +8,7 @@
 PORTNAME=	wsmake
 PORTVERSION=	0.6.4
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	wsmake
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} examples.tar.gz
-DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	SFE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Software for production and maintenance of web sites
@@ -20,29 +16,9 @@ COMMENT=	Software for production and maintenance of web sites
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
-.if !defined(NOPORTDOCS)
-DISTFILES+=	user-manual-html.tar.gz
-.endif
-
-.include <bsd.port.pre.mk>
+PLIST_FILES=	bin/wsmake
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,void\*,char\*,g' ${WRKSRC}/libwsmake/wsUtil.cpp
 
-# Install examples and optional documentation.
-post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${EXAMPLESDIR} && \
-		 ${TAR} -xzf ${_DISTDIR}/examples.tar.gz --exclude '*/CVS/*'
-.for ex in 1 2 3 4 5 6 7 8 9 10 11 12 13
-	@${MV} ${EXAMPLESDIR}/examples/ex${ex} ${EXAMPLESDIR}
-.endfor
-	@${RM} -rf ${EXAMPLESDIR}/examples
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${DOCSDIR} && \
-		${TAR} -xzf ${_DISTDIR}/user-manual-html.tar.gz
-	${LN} ${DOCSDIR}/user-manual/book1.html ${DOCSDIR}/user-manual/index.html
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/wsmake/distinfo b/www/wsmake/distinfo
index 446350bf45f5..eb6ad236b59b 100644
--- a/www/wsmake/distinfo
+++ b/www/wsmake/distinfo
@@ -1,9 +1,3 @@
-MD5 (wsmake/wsmake-0.6.4.tar.bz2) = 92a32f066ce2629c83b5ce1f22229282
-SHA256 (wsmake/wsmake-0.6.4.tar.bz2) = 884ca4e635d454776888526cf94f6af6639f76b317aa10f9f6d651d9208188d6
-SIZE (wsmake/wsmake-0.6.4.tar.bz2) = 351688
-MD5 (wsmake/examples.tar.gz) = 0823e8bb08d8bb94ae5308cb53e2e158
-SHA256 (wsmake/examples.tar.gz) = b68dff460d2da9c7d85e041639825448a37f01f77d1751515e4af70737de5a9b
-SIZE (wsmake/examples.tar.gz) = 26755
-MD5 (wsmake/user-manual-html.tar.gz) = 72978fbf7906ff15c5cc054c57029b52
-SHA256 (wsmake/user-manual-html.tar.gz) = 057811ebd1c579ebab57d815621c6f38972e67e7b32bc07aa12410d6a7decdb1
-SIZE (wsmake/user-manual-html.tar.gz) = 73189
+MD5 (wsmake-0.6.4.tar.bz2) = 92a32f066ce2629c83b5ce1f22229282
+SHA256 (wsmake-0.6.4.tar.bz2) = 884ca4e635d454776888526cf94f6af6639f76b317aa10f9f6d651d9208188d6
+SIZE (wsmake-0.6.4.tar.bz2) = 351688
diff --git a/www/wsmake/pkg-descr b/www/wsmake/pkg-descr
index d147b286bb6d..4169cc5515aa 100644
--- a/www/wsmake/pkg-descr
+++ b/www/wsmake/pkg-descr
@@ -6,4 +6,4 @@ website separate from the design.
 Wsmake supports a model where the contents of the website are statically
 generated from sources.
 
-WWW: http://www.wsmake.org/
+WWW: http://sourceforge.net/projects/wsmake
diff --git a/www/wsmake/pkg-plist b/www/wsmake/pkg-plist
deleted file mode 100644
index 0f5574504b13..000000000000
--- a/www/wsmake/pkg-plist
+++ /dev/null
@@ -1,178 +0,0 @@
-bin/wsmake
-%%EXAMPLESDIR%%/ex1/README
-%%EXAMPLESDIR%%/ex1/ex1.final.ws
-%%EXAMPLESDIR%%/ex1/ex1.ws
-%%EXAMPLESDIR%%/ex1/docs/.cvsignore
-%%EXAMPLESDIR%%/ex1/docs/.keepme
-%%EXAMPLESDIR%%/ex1/html/about.html
-%%EXAMPLESDIR%%/ex1/html/help.html
-%%EXAMPLESDIR%%/ex1/html/index.html
-%%EXAMPLESDIR%%/ex2/README
-%%EXAMPLESDIR%%/ex2/ex2.final.ws
-%%EXAMPLESDIR%%/ex2/ex2.ws
-%%EXAMPLESDIR%%/ex2/html/about.html
-%%EXAMPLESDIR%%/ex2/html/help.html
-%%EXAMPLESDIR%%/ex2/html/index.html
-%%EXAMPLESDIR%%/ex3/README
-%%EXAMPLESDIR%%/ex3/ex3.final.ws
-%%EXAMPLESDIR%%/ex3/ex3.ws
-%%EXAMPLESDIR%%/ex3/html/about.html
-%%EXAMPLESDIR%%/ex3/html/help.html
-%%EXAMPLESDIR%%/ex3/html/index.html
-%%EXAMPLESDIR%%/ex4/README
-%%EXAMPLESDIR%%/ex4/ex4.final.ws
-%%EXAMPLESDIR%%/ex4/ex4.ws
-%%EXAMPLESDIR%%/ex4/html/about.html
-%%EXAMPLESDIR%%/ex4/html/help.html
-%%EXAMPLESDIR%%/ex4/html/index.html
-%%EXAMPLESDIR%%/ex4/templates/footer.html
-%%EXAMPLESDIR%%/ex4/templates/header.html
-%%EXAMPLESDIR%%/ex5/README
-%%EXAMPLESDIR%%/ex5/ex5.final.ws
-%%EXAMPLESDIR%%/ex5/ex5.ws
-%%EXAMPLESDIR%%/ex5/html/about.html
-%%EXAMPLESDIR%%/ex5/html/help.html
-%%EXAMPLESDIR%%/ex5/html/index.html
-%%EXAMPLESDIR%%/ex5/html/linuxlinks.txt
-%%EXAMPLESDIR%%/ex5/html/mikeslinks.txt
-%%EXAMPLESDIR%%/ex5/html/incdirtest/index.html
-%%EXAMPLESDIR%%/ex5/includes/linuxlinks.txt
-%%EXAMPLESDIR%%/ex5/templates/footer.html
-%%EXAMPLESDIR%%/ex5/templates/header.html
-%%EXAMPLESDIR%%/ex6/README
-%%EXAMPLESDIR%%/ex6/ex6.ws
-%%EXAMPLESDIR%%/ex6/html/about.html
-%%EXAMPLESDIR%%/ex6/html/help.html
-%%EXAMPLESDIR%%/ex6/html/index.html
-%%EXAMPLESDIR%%/ex6/html/linuxlinks.txt
-%%EXAMPLESDIR%%/ex6/templates/footer.html
-%%EXAMPLESDIR%%/ex6/templates/header.html
-%%EXAMPLESDIR%%/ex6/templates/menu.html
-%%EXAMPLESDIR%%/ex7/README
-%%EXAMPLESDIR%%/ex7/ex7-2.ws
-%%EXAMPLESDIR%%/ex7/ex7.ws
-%%EXAMPLESDIR%%/ex7/html/about.html
-%%EXAMPLESDIR%%/ex7/html/help.html
-%%EXAMPLESDIR%%/ex7/html/index.html
-%%EXAMPLESDIR%%/ex7/html/linuxlinks.txt
-%%EXAMPLESDIR%%/ex7/templates/footer.html
-%%EXAMPLESDIR%%/ex7/templates/header.html
-%%EXAMPLESDIR%%/ex7/templates/menu.html
-%%EXAMPLESDIR%%/ex8/README
-%%EXAMPLESDIR%%/ex8/ex8.ws
-%%EXAMPLESDIR%%/ex8/html/index.cgi
-%%EXAMPLESDIR%%/ex8/templates/footer.html
-%%EXAMPLESDIR%%/ex8/templates/header.html
-%%EXAMPLESDIR%%/ex9/README
-%%EXAMPLESDIR%%/ex9/ex9.ws
-%%EXAMPLESDIR%%/ex9/myparser.pl
-%%EXAMPLESDIR%%/ex9/html/about.html
-%%EXAMPLESDIR%%/ex9/html/binary.file
-%%EXAMPLESDIR%%/ex9/html/help.html
-%%EXAMPLESDIR%%/ex9/html/index.html
-%%EXAMPLESDIR%%/ex10/README
-%%EXAMPLESDIR%%/ex10/ex10.ws
-%%EXAMPLESDIR%%/ex10/html/index.html
-%%EXAMPLESDIR%%/ex10/templates/header.html
-%%EXAMPLESDIR%%/ex11/README
-%%EXAMPLESDIR%%/ex11/ex11.ws
-%%EXAMPLESDIR%%/ex11/html/external.html
-%%EXAMPLESDIR%%/ex11/html/external2.html
-%%EXAMPLESDIR%%/ex11/html/news/archive.html
-%%EXAMPLESDIR%%/ex11/html/news/index.html
-%%EXAMPLESDIR%%/ex11/html/news/search.html
-%%EXAMPLESDIR%%/ex11/templates/footer.html
-%%EXAMPLESDIR%%/ex11/templates/header.html
-%%EXAMPLESDIR%%/ex12/README
-%%EXAMPLESDIR%%/ex12/depend1.txt
-%%EXAMPLESDIR%%/ex12/ex12.ws
-%%EXAMPLESDIR%%/ex12/html/about.html
-%%EXAMPLESDIR%%/ex12/html/depend2.txt
-%%EXAMPLESDIR%%/ex12/html/help.html
-%%EXAMPLESDIR%%/ex12/html/index.html
-%%EXAMPLESDIR%%/ex13/README
-%%EXAMPLESDIR%%/ex13/ex13.ws
-%%EXAMPLESDIR%%/ex13/pagegroup.wsc
-%%EXAMPLESDIR%%/ex13/pagegroup_config.wsc
-%%EXAMPLESDIR%%/ex13/pages.wsc
-%%EXAMPLESDIR%%/ex13/website.wsc
-%%EXAMPLESDIR%%/ex13/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/book1.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/ln55.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/f57.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/c76.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x103.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/c181.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x386.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/c459.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x504.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/c1021.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x1028.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x1032.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x1036.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x1040.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x1045.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x1049.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x1053.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x1059.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x1063.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x1067.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x1071.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/x1075.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/c1079.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/docbook.css
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/stylesheet-images/caution.gif
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/stylesheet-images/home.gif
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/stylesheet-images/important.gif
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/stylesheet-images/next.gif
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/stylesheet-images/note.gif
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/stylesheet-images/prev.gif
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/stylesheet-images/tip.gif
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/stylesheet-images/toc-blank.gif
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/stylesheet-images/toc-minus.gif
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/stylesheet-images/toc-plus.gif
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/stylesheet-images/up.gif
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/stylesheet-images/warning.gif
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/configlayout.jpg
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/index.html
-@dirrm %%EXAMPLESDIR%%/ex1/docs
-@dirrm %%EXAMPLESDIR%%/ex1/html
-@dirrm %%EXAMPLESDIR%%/ex1
-@dirrm %%EXAMPLESDIR%%/ex2/html
-@dirrm %%EXAMPLESDIR%%/ex2
-@dirrm %%EXAMPLESDIR%%/ex3/html
-@dirrm %%EXAMPLESDIR%%/ex3
-@dirrm %%EXAMPLESDIR%%/ex4/html
-@dirrm %%EXAMPLESDIR%%/ex4/templates
-@dirrm %%EXAMPLESDIR%%/ex4
-@dirrm %%EXAMPLESDIR%%/ex5/html/incdirtest
-@dirrm %%EXAMPLESDIR%%/ex5/html
-@dirrm %%EXAMPLESDIR%%/ex5/includes
-@dirrm %%EXAMPLESDIR%%/ex5/templates
-@dirrm %%EXAMPLESDIR%%/ex5
-@dirrm %%EXAMPLESDIR%%/ex6/html
-@dirrm %%EXAMPLESDIR%%/ex6/templates
-@dirrm %%EXAMPLESDIR%%/ex6
-@dirrm %%EXAMPLESDIR%%/ex7/html
-@dirrm %%EXAMPLESDIR%%/ex7/templates
-@dirrm %%EXAMPLESDIR%%/ex7
-@dirrm %%EXAMPLESDIR%%/ex8/html
-@dirrm %%EXAMPLESDIR%%/ex8/templates
-@dirrm %%EXAMPLESDIR%%/ex8
-@dirrm %%EXAMPLESDIR%%/ex9/html
-@dirrm %%EXAMPLESDIR%%/ex9
-@dirrm %%EXAMPLESDIR%%/ex10/html
-@dirrm %%EXAMPLESDIR%%/ex10/templates
-@dirrm %%EXAMPLESDIR%%/ex10
-@dirrm %%EXAMPLESDIR%%/ex11/html/news
-@dirrm %%EXAMPLESDIR%%/ex11/html
-@dirrm %%EXAMPLESDIR%%/ex11/templates
-@dirrm %%EXAMPLESDIR%%/ex11
-@dirrm %%EXAMPLESDIR%%/ex12/html
-@dirrm %%EXAMPLESDIR%%/ex12
-@dirrm %%EXAMPLESDIR%%/ex13/html
-@dirrm %%EXAMPLESDIR%%/ex13
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/user-manual/stylesheet-images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/user-manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%