5 files changed, 42 insertions, 9 deletions

diff --git a/www/yaws/Makefile b/www/yaws/Makefile
index 1391020cfdff..589bb214b2cc 100644
--- a/www/yaws/Makefile
+++ b/www/yaws/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	yaws
-PORTVERSION=	1.57
+PORTVERSION=	1.58
 CATEGORIES=	www
 MASTER_SITES=	http://yaws.hyber.org/download/
+DISTNAME=	yaws-${PORTVERSION}pre
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A webserver for dynamic content written in Erlang
@@ -20,7 +21,7 @@ PLIST_SUB=	VERSION="${PORTVERSION}"
 
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
+WRKSRC=		${WRKDIR}/yaws-${PORTVERSION}
 
 MAN1=		yaws.1
 MAN5=		yaws.conf.5 yaws_api.5
@@ -30,7 +31,7 @@ APPDIR=${PREFIX}/lib/erlang/lib/yaws-${PORTVERSION}
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
+BROKEN=		Does not compile on !i386
 .endif
 
 post-extract:
diff --git a/www/yaws/distinfo b/www/yaws/distinfo
index 78919f284fac..1e6f7ebe4cf3 100644
--- a/www/yaws/distinfo
+++ b/www/yaws/distinfo
@@ -1,3 +1,3 @@
-MD5 (yaws-1.57.tar.gz) = 23b0e422a85396cda0cce9ca8cbcad9e
-SHA256 (yaws-1.57.tar.gz) = 604bd2942da32d5ca5b6c19f8733823bdaa3a81d9d158973d1f31d84b051c47c
-SIZE (yaws-1.57.tar.gz) = 680082
+MD5 (yaws-1.58pre.tar.gz) = 5c8cee63a28a3c540902765582b38ef7
+SHA256 (yaws-1.58pre.tar.gz) = 6c6aed3cd2bf140c9041283398be8fe3df9a44f1b6ef9d8196c3e199ad7997d5
+SIZE (yaws-1.58pre.tar.gz) = 689536
diff --git a/www/yaws/files/patch-c__src_Makefile b/www/yaws/files/patch-c__src_Makefile
new file mode 100644
index 000000000000..0065073d9e69
--- /dev/null
+++ b/www/yaws/files/patch-c__src_Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- c_src/Makefile.orig
++++ c_src/Makefile
+@@ -7,7 +7,7 @@
+ ifdef WIN32
+ 	PRIV_FILES=../priv/.foo
+ else
+-	PRIV_FILES= ../priv/setuid_drv.$(DLL)  ../priv/epam
++	PRIV_FILES= ../priv/setuid_drv.$(DLL)
+ endif
+ 
+ 
diff --git a/www/yaws/files/patch-src_yaws__sup.erl b/www/yaws/files/patch-src_yaws__sup.erl
new file mode 100644
index 000000000000..f57ba2804e1e
--- /dev/null
+++ b/www/yaws/files/patch-src_yaws__sup.erl
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- src/yaws_sup.erl.orig
++++ src/yaws_sup.erl
+@@ -46,10 +46,8 @@
+ 
+     YawsRSS = {yaws_rss, {yaws_rss, start_link, []},
+ 	       permanent, 5000, worker, [yaws_rss]},
+-    Pam = {yaws_pam, {yaws_pam, start_link, ["system-auth", false, false]},
+-	       permanent, 5000, worker, [yaws_pam]},
+ 
+-    {ok,{{one_for_all,0,300}, [YawsLog, YawsRSS, YawsServ, Sess, Pam]}}.
++    {ok,{{one_for_all,0,300}, [YawsLog, YawsRSS, YawsServ, Sess]}}.
+ 
+ %%----------------------------------------------------------------------
+ %%----------------------------------------------------------------------
diff --git a/www/yaws/pkg-plist b/www/yaws/pkg-plist
index cc4606496028..9801a4b39942 100644
--- a/www/yaws/pkg-plist
+++ b/www/yaws/pkg-plist
@@ -1,6 +1,5 @@
 bin/yaws
 etc/yaws.conf.sample
-lib/erlang/lib/yaws-%%VERSION%%/ebin/dav.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/mime_type_c.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/mime_types.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws.app
@@ -12,11 +11,13 @@ lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_cgi.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_compile.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_config.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ctl.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_dav.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_debug.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_html.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_log.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_log_file_h.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ls.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_pam.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_revproxy.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_rss.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_server.beam
@@ -30,7 +31,6 @@ lib/erlang/lib/yaws-%%VERSION%%/include/yaws_api.hrl
 lib/erlang/lib/yaws-%%VERSION%%/include/yaws_dav.hrl
 lib/erlang/lib/yaws-%%VERSION%%/priv/mime.types
 lib/erlang/lib/yaws-%%VERSION%%/priv/setuid_drv.so
-lib/erlang/lib/yaws-%%VERSION%%/src/dav.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/mime_type_c.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/mime_types.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws.erl
@@ -49,6 +49,7 @@ lib/erlang/lib/yaws-%%VERSION%%/src/yaws_html.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws_log.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws_log_file_h.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws_ls.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_pam.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws_revproxy.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws_rss.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws_server.erl
@@ -58,6 +59,7 @@ lib/erlang/lib/yaws-%%VERSION%%/src/yaws_sup.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws_ticker.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws_vsn.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws_zlib.erl
+%%PORTDOCS%%%%DOCSDIR%%/yaws.pdf
 www/yaws/END
 www/yaws/END2
 www/yaws/HEAD
@@ -259,7 +261,6 @@ www/yaws/urandom.yaws
 www/yaws/yaws-1.55_to_1.56.patch
 www/yaws/ybed.erl
 www/yaws/yman.yaws
-%%PORTDOCS%%%%DOCSDIR%%/yaws.pdf
 @dirrm www/yaws/ssi
 @dirrm www/yaws/shopingcart
 @dirrm www/yaws/icons/small