8 files changed, 22 insertions, 34 deletions

diff --git a/devel/libslang2-devel/Makefile b/devel/libslang2-devel/Makefile
index 63c9fb657655..389ff4b35a0d 100644
--- a/devel/libslang2-devel/Makefile
+++ b/devel/libslang2-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libslang2
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	devel
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v2.0/ \
 		ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.0/ \
@@ -34,9 +34,7 @@ DATADIR=	${PREFIX}/share/slsh
 OPTIONS=	PCRE "Include pcre support" on \
 		PNG  "Include png support"  on
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-.endif
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/libslang2-devel/distinfo b/devel/libslang2-devel/distinfo
index 816e2bd64acc..9d5baf9a6ca8 100644
--- a/devel/libslang2-devel/distinfo
+++ b/devel/libslang2-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (slang-2.0.6.tar.bz2) = efb055000636f312d5c3de56f3c70d12
-SHA256 (slang-2.0.6.tar.bz2) = 22a4968591f88c686c9f142fac37faa6e4202128d13930b3fe5f3c34ddb78616
-SIZE (slang-2.0.6.tar.bz2) = 1057149
+MD5 (slang-2.0.7.tar.bz2) = 522d9075a721ebe235211dc96c7db2d1
+SHA256 (slang-2.0.7.tar.bz2) = 61402410b60d8c64c349c5f875bc6a69bf881074494c1a1351032d6873ad10f5
+SIZE (slang-2.0.7.tar.bz2) = 1085744
diff --git a/devel/libslang2-devel/files/patch-src-slinclud.h b/devel/libslang2-devel/files/patch-src-slinclud.h
deleted file mode 100644
index c939e13dd854..000000000000
--- a/devel/libslang2-devel/files/patch-src-slinclud.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/slinclud.h.orig	Mon May 16 16:11:14 2005
-+++ src/slinclud.h	Mon May 16 16:11:48 2005
-@@ -20,7 +20,7 @@
- # include <unistd.h>
- #endif
- 
--#ifdef HAVE_MALLOC_H
-+#if 0
- # include <malloc.h>
- #endif
- 
diff --git a/devel/libslang2-devel/pkg-plist b/devel/libslang2-devel/pkg-plist
index a03af85778ba..791de2b2fa4d 100644
--- a/devel/libslang2-devel/pkg-plist
+++ b/devel/libslang2-devel/pkg-plist
@@ -11,6 +11,7 @@ lib/slang/v2/modules/fcntl-module.so
 %%PNG%%lib/slang/v2/modules/png-module.so
 lib/slang/v2/modules/select-module.so
 lib/slang/v2/modules/slsmg-module.so
+lib/slang/v2/modules/socket-module.so
 lib/slang/v2/modules/termios-module.so
 lib/slang/v2/modules/varray-module.so
 %%DATADIR%%/arrayfuns.sl
@@ -37,8 +38,13 @@ lib/slang/v2/modules/varray-module.so
 %%DATADIR%%/cmaps/wysiwyg.map
 %%DATADIR%%/fcntl.sl
 %%DATADIR%%/glob.sl
+%%DATADIR%%/help/arrayfuns.hlp
+%%DATADIR%%/help/glob.hlp
 %%DATADIR%%/help/pcrefuns.hlp
 %%DATADIR%%/help/pngfuns.hlp
+%%DATADIR%%/help/require.hlp
+%%DATADIR%%/help/sockfuns.hlp
+%%DATADIR%%/help/structfuns.hlp
 %%DATADIR%%/pcre.sl
 %%DATADIR%%/png.sl
 %%DATADIR%%/print.sl
@@ -54,6 +60,7 @@ lib/slang/v2/modules/varray-module.so
 %%DATADIR%%/sldbcore.sl
 %%DATADIR%%/slshrl.sl
 %%DATADIR%%/slsmg.sl
+%%DATADIR%%/socket.sl
 %%DATADIR%%/stkcheck.sl
 %%DATADIR%%/structfuns.sl
 %%DATADIR%%/termios.sl
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index 63c9fb657655..389ff4b35a0d 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libslang2
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	devel
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v2.0/ \
 		ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.0/ \
@@ -34,9 +34,7 @@ DATADIR=	${PREFIX}/share/slsh
 OPTIONS=	PCRE "Include pcre support" on \
 		PNG  "Include png support"  on
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-.endif
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/libslang2/distinfo b/devel/libslang2/distinfo
index 816e2bd64acc..9d5baf9a6ca8 100644
--- a/devel/libslang2/distinfo
+++ b/devel/libslang2/distinfo
@@ -1,3 +1,3 @@
-MD5 (slang-2.0.6.tar.bz2) = efb055000636f312d5c3de56f3c70d12
-SHA256 (slang-2.0.6.tar.bz2) = 22a4968591f88c686c9f142fac37faa6e4202128d13930b3fe5f3c34ddb78616
-SIZE (slang-2.0.6.tar.bz2) = 1057149
+MD5 (slang-2.0.7.tar.bz2) = 522d9075a721ebe235211dc96c7db2d1
+SHA256 (slang-2.0.7.tar.bz2) = 61402410b60d8c64c349c5f875bc6a69bf881074494c1a1351032d6873ad10f5
+SIZE (slang-2.0.7.tar.bz2) = 1085744
diff --git a/devel/libslang2/files/patch-src-slinclud.h b/devel/libslang2/files/patch-src-slinclud.h
deleted file mode 100644
index c939e13dd854..000000000000
--- a/devel/libslang2/files/patch-src-slinclud.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/slinclud.h.orig	Mon May 16 16:11:14 2005
-+++ src/slinclud.h	Mon May 16 16:11:48 2005
-@@ -20,7 +20,7 @@
- # include <unistd.h>
- #endif
- 
--#ifdef HAVE_MALLOC_H
-+#if 0
- # include <malloc.h>
- #endif
- 
diff --git a/devel/libslang2/pkg-plist b/devel/libslang2/pkg-plist
index a03af85778ba..791de2b2fa4d 100644
--- a/devel/libslang2/pkg-plist
+++ b/devel/libslang2/pkg-plist
@@ -11,6 +11,7 @@ lib/slang/v2/modules/fcntl-module.so
 %%PNG%%lib/slang/v2/modules/png-module.so
 lib/slang/v2/modules/select-module.so
 lib/slang/v2/modules/slsmg-module.so
+lib/slang/v2/modules/socket-module.so
 lib/slang/v2/modules/termios-module.so
 lib/slang/v2/modules/varray-module.so
 %%DATADIR%%/arrayfuns.sl
@@ -37,8 +38,13 @@ lib/slang/v2/modules/varray-module.so
 %%DATADIR%%/cmaps/wysiwyg.map
 %%DATADIR%%/fcntl.sl
 %%DATADIR%%/glob.sl
+%%DATADIR%%/help/arrayfuns.hlp
+%%DATADIR%%/help/glob.hlp
 %%DATADIR%%/help/pcrefuns.hlp
 %%DATADIR%%/help/pngfuns.hlp
+%%DATADIR%%/help/require.hlp
+%%DATADIR%%/help/sockfuns.hlp
+%%DATADIR%%/help/structfuns.hlp
 %%DATADIR%%/pcre.sl
 %%DATADIR%%/png.sl
 %%DATADIR%%/print.sl
@@ -54,6 +60,7 @@ lib/slang/v2/modules/varray-module.so
 %%DATADIR%%/sldbcore.sl
 %%DATADIR%%/slshrl.sl
 %%DATADIR%%/slsmg.sl
+%%DATADIR%%/socket.sl
 %%DATADIR%%/stkcheck.sl
 %%DATADIR%%/structfuns.sl
 %%DATADIR%%/termios.sl