7 files changed, 50 insertions, 37 deletions

diff --git a/www/wsmake/Makefile b/www/wsmake/Makefile
index 351196089e33..e0334a232ddb 100644
--- a/www/wsmake/Makefile
+++ b/www/wsmake/Makefile
@@ -6,19 +6,25 @@
 #
 
 PORTNAME=	wsmake
-PORTVERSION=	0.6.4
+PORTVERSION=	0.7.901
 CATEGORIES=	www
 MASTER_SITES=	SFE
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Software for production and maintenance of web sites
 
 USE_BZIP2=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-gwsmake=no --enable-iswmake=no
 
-PLIST_FILES=	bin/wsmake
+.include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,void\*,char\*,g' ${WRKSRC}/libwsmake/wsUtil.cpp
+.if defined(NOPORTDOCS)
+CONFIGURE_ARGS+=	--enable-docs=no
+.else
+INFO=	wsmake iwsmake gwsmake
+MAN1=	wsmake.1
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/wsmake/distinfo b/www/wsmake/distinfo
index eb6ad236b59b..e6ddcaa67dbd 100644
--- a/www/wsmake/distinfo
+++ b/www/wsmake/distinfo
@@ -1,3 +1,3 @@
-MD5 (wsmake-0.6.4.tar.bz2) = 92a32f066ce2629c83b5ce1f22229282
-SHA256 (wsmake-0.6.4.tar.bz2) = 884ca4e635d454776888526cf94f6af6639f76b317aa10f9f6d651d9208188d6
-SIZE (wsmake-0.6.4.tar.bz2) = 351688
+MD5 (wsmake-0.7.901.tar.bz2) = 0ef13a7e6119aaefd9ef18347b56dda9
+SHA256 (wsmake-0.7.901.tar.bz2) = 0a01c7ee2fd56931d0790ca7fbc6b50298116257114699492f158633f6a99d44
+SIZE (wsmake-0.7.901.tar.bz2) = 460962
diff --git a/www/wsmake/files/patch-Makefile.in b/www/wsmake/files/patch-Makefile.in
new file mode 100644
index 000000000000..56c2b06efb7f
--- /dev/null
+++ b/www/wsmake/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2008-06-03 21:19:34.000000000 +0200
++++ Makefile.in	2008-06-03 21:20:28.000000000 +0200
+@@ -154,7 +154,7 @@
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
+ 			config.log config.status $(AUX_DIST)
+ 
+-EXTRA_INSTALL = README NEWS ChangeLog TODO THANKS
++@DOCS_TRUE@EXTRA_INSTALL = README NEWS ChangeLog TODO THANKS
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/www/wsmake/files/patch-libwsmake_wsUtil.cpp b/www/wsmake/files/patch-libwsmake_wsUtil.cpp
deleted file mode 100644
index 77ad62ed2db5..000000000000
--- a/www/wsmake/files/patch-libwsmake_wsUtil.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- libwsmake/wsUtil.cpp.orig	Sat Sep  1 20:09:13 2001
-+++ libwsmake/wsUtil.cpp	Thu Sep 15 12:38:48 2005
-@@ -709,12 +709,12 @@
-   }
- }
- 
--void std::__wsmake_print_it(FILE *out, const char *output, const va_list *ap)
-+void std::__wsmake_print_it(FILE *out, const char *output, va_list *ap)
- {
-   if(__wsmake_quiet) return;
- 
-   vfprintf(out,output,*ap);
--  va_end((void*&)*ap);
-+  va_end(*ap);
- }
- 
- #ifdef DEBUG
diff --git a/www/wsmake/files/patch-libwsmake_wsUtil.h b/www/wsmake/files/patch-libwsmake_wsUtil.h
deleted file mode 100644
index 886da452339c..000000000000
--- a/www/wsmake/files/patch-libwsmake_wsUtil.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwsmake/wsUtil.h.orig	Thu Sep 15 09:39:51 2005
-+++ libwsmake/wsUtil.h	Thu Sep 15 09:38:34 2005
-@@ -77,7 +77,7 @@ namespace std
-   void __wsmake_print_error(const char *, ...);
-   void __wsmake_print(const char *, ...);
-   void __wsmake_print(int, const char *, ...);
--  void __wsmake_print_it(FILE *, const char *, const va_list *);
-+  void __wsmake_print_it(FILE *, const char *, va_list *);
- }
- 
- #endif /* __WSUTIL_H__ */
diff --git a/www/wsmake/files/patch-src-libwsmake_wsLoader.h b/www/wsmake/files/patch-src-libwsmake_wsLoader.h
new file mode 100644
index 000000000000..18e79d7a5a2d
--- /dev/null
+++ b/www/wsmake/files/patch-src-libwsmake_wsLoader.h
@@ -0,0 +1,10 @@
+--- src/libwsmake/wsLoader.h.orig	2008-06-03 21:00:24.000000000 +0200
++++ src/libwsmake/wsLoader.h	2008-06-03 21:00:19.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <list>
+ #include <string>
+ #include <stdio.h>
++using namespace std;
+ 
+ namespace wsmake
+ {
diff --git a/www/wsmake/pkg-plist b/www/wsmake/pkg-plist
new file mode 100644
index 000000000000..09101f70f142
--- /dev/null
+++ b/www/wsmake/pkg-plist
@@ -0,0 +1,14 @@
+bin/wsmake
+%%PORTDOCS%%%%DOCSDIR%%/wsmake.html
+%%PORTDOCS%%%%DOCSDIR%%/iwsmake.html
+%%PORTDOCS%%%%DOCSDIR%%/gwsmake.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/wsmake.dvi
+%%PORTDOCS%%%%DOCSDIR%%/manual/wsmake.ps
+%%PORTDOCS%%%%DOCSDIR%%/manual/wsmake.pdf
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
+%%PORTDOCS%%@dirrm %%DOCSDIR%%