Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Nov 2013 15:13:26 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334425 - in head/www/wsmake: . files
Message-ID:  <201311201513.rAKFDQEi045218@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Wed Nov 20 15:13:26 2013
New Revision: 334425
URL: http://svnweb.freebsd.org/changeset/ports/334425

Log:
  - Fix build on modern compilers
  - STAGE-clean
  - Add OPTIONS for DOCS
  - Convert to USES=gmake

Added:
  head/www/wsmake/files/patch-src-libwsmake_wsLoader.cpp   (contents, props changed)
  head/www/wsmake/files/patch-src-libwsmake_wsParser.ypp   (contents, props changed)
Modified:
  head/www/wsmake/Makefile   (contents, props changed)
  head/www/wsmake/pkg-plist   (contents, props changed)

Modified: head/www/wsmake/Makefile
==============================================================================
--- head/www/wsmake/Makefile	Wed Nov 20 14:56:22 2013	(r334424)
+++ head/www/wsmake/Makefile	Wed Nov 20 15:13:26 2013	(r334425)
@@ -9,19 +9,19 @@ MASTER_SITES=	SF/${PORTNAME}/OldFiles
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Software for production and maintenance of web sites
 
+OPTIONS_DEFINE=	DOCS
+
+USES=		gmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gwsmake=no --enable-iswmake=no
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(NOPORTDOCS)
-CONFIGURE_ARGS+=	--enable-docs=no
-.else
+.if ${PORT_OPTIONS:MDOCS}
 INFO=	wsmake iwsmake gwsmake
-MAN1=	wsmake.1
+.else
+CONFIGURE_ARGS+=	--enable-docs=no
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/www/wsmake/files/patch-src-libwsmake_wsLoader.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/wsmake/files/patch-src-libwsmake_wsLoader.cpp	Wed Nov 20 15:13:26 2013	(r334425)
@@ -0,0 +1,10 @@
+--- src/libwsmake/wsLoader.cpp.orig	2013-11-20 16:09:13.000000000 +0100
++++ src/libwsmake/wsLoader.cpp	2013-11-20 16:09:22.000000000 +0100
+@@ -24,6 +24,7 @@
+ 
+ #include "osa.h"
+ 
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+ 

Added: head/www/wsmake/files/patch-src-libwsmake_wsParser.ypp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/wsmake/files/patch-src-libwsmake_wsParser.ypp	Wed Nov 20 15:13:26 2013	(r334425)
@@ -0,0 +1,10 @@
+--- src/libwsmake/wsParser.ypp.orig	2013-11-20 16:10:55.000000000 +0100
++++ src/libwsmake/wsParser.ypp	2013-11-20 16:10:42.000000000 +0100
+@@ -21,6 +21,7 @@
+  * mike@wsmake.org                                                     *
+  ***********************************************************************/
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include "wsLoader.h"
+ #include "wsSite.h"

Modified: head/www/wsmake/pkg-plist
==============================================================================
--- head/www/wsmake/pkg-plist	Wed Nov 20 14:56:22 2013	(r334424)
+++ head/www/wsmake/pkg-plist	Wed Nov 20 15:13:26 2013	(r334425)
@@ -10,5 +10,6 @@ bin/wsmake
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%man/man1/wsmake.1.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
 %%PORTDOCS%%@dirrm %%DOCSDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311201513.rAKFDQEi045218>