6 files changed, 116 insertions, 114 deletions

diff --git a/devel/libslang2-devel/Makefile b/devel/libslang2-devel/Makefile
index 8974146b9315..246b04114129 100644
--- a/devel/libslang2-devel/Makefile
+++ b/devel/libslang2-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libslang2
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v2.0/
 DISTNAME=	slang-${PORTVERSION}
@@ -27,6 +27,7 @@ INSTALL_TARGET=	install install-elf
 
 MAN1=		slsh.1
 DOCSDIR=	${PREFIX}/share/doc/slang
+DATADIR=	${PREFIX}/share/slsh
 
 OPTIONS=	PCRE "Include pcre support" on \
 		PNG  "Include png support"  on
@@ -41,7 +42,7 @@ PORTDOCS=	*
 LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
 PLIST_SUB+=	PCRE=""
 .else
-CONFIGURE_ARGS+=	--disable-pcre
+CONFIGURE_ARGS+=	--without-pcre
 PLIST_SUB+=	PCRE="@comment "
 .endif
 
@@ -49,7 +50,7 @@ PLIST_SUB+=	PCRE="@comment "
 LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
 PLIST_SUB+=	PNG=""
 .else
-CONFIGURE_ARGS+=	--disable-png
+CONFIGURE_ARGS+=	--without-png
 PLIST_SUB+=	PNG="@comment "
 .endif
 
diff --git a/devel/libslang2-devel/distinfo b/devel/libslang2-devel/distinfo
index d6bbbd533096..52e92ce57b01 100644
--- a/devel/libslang2-devel/distinfo
+++ b/devel/libslang2-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (slang-2.0.2.tar.bz2) = 6ef4ae010f17bc1238a978b8dc0ce154
-SIZE (slang-2.0.2.tar.bz2) = 1035709
+MD5 (slang-2.0.3.tar.bz2) = 14672524b0b5ad17f5894bd90224fef8
+SIZE (slang-2.0.3.tar.bz2) = 1036004
diff --git a/devel/libslang2-devel/pkg-plist b/devel/libslang2-devel/pkg-plist
index 24d039e4e228..42301fa7cccd 100644
--- a/devel/libslang2-devel/pkg-plist
+++ b/devel/libslang2-devel/pkg-plist
@@ -6,61 +6,61 @@ include/slcurses.h
 lib/libslang.a
 lib/libslang.so.2
 lib/libslang.so
-lib/slang/v2/modules/slsmg-module.so
-lib/slang/v2/modules/termios-module.so
-lib/slang/v2/modules/select-module.so
 lib/slang/v2/modules/fcntl-module.so
-lib/slang/v2/modules/varray-module.so
 %%PCRE%%lib/slang/v2/modules/pcre-module.so
 %%PNG%%lib/slang/v2/modules/png-module.so
-share/slsh/scripts/jpegsize
-share/slsh/scripts/lsrpm
-share/slsh/scripts/sldb
-share/slsh/scripts/svnsh
-share/slsh/arrayfuns.sl
-share/slsh/autoload.sl
-share/slsh/glob.sl
-share/slsh/print.sl
-share/slsh/require.sl
-share/slsh/sldb.sl
-share/slsh/sldbcore.sl
-share/slsh/slshrl.sl
-share/slsh/stkcheck.sl
-share/slsh/structfuns.sl
-share/slsh/slsmg.sl
-share/slsh/termios.sl
-share/slsh/select.sl
-share/slsh/fcntl.sl
-share/slsh/varray.sl
-share/slsh/pcre.sl
-share/slsh/png.sl
-share/slsh/cmaps/cool.map
-share/slsh/cmaps/copper.map
-share/slsh/cmaps/drywet.map
-share/slsh/cmaps/gebco.map
-share/slsh/cmaps/globe.map
-share/slsh/cmaps/gray.map
-share/slsh/cmaps/haxby.map
-share/slsh/cmaps/hot.map
-share/slsh/cmaps/jet.map
-share/slsh/cmaps/no_green.map
-share/slsh/cmaps/ocean.map
-share/slsh/cmaps/polar.map
-share/slsh/cmaps/rainbow.map
-share/slsh/cmaps/red2green.map
-share/slsh/cmaps/relief.map
-share/slsh/cmaps/sealand.map
-share/slsh/cmaps/seis.map
-share/slsh/cmaps/split.map
-share/slsh/cmaps/topo.map
-share/slsh/cmaps/wysiwyg.map
-share/slsh/help/pcrefuns.hlp
-share/slsh/help/pngfuns.hlp
-@dirrm share/slsh/scripts
-@dirrm share/slsh/help
-@dirrm share/slsh/cmaps
+lib/slang/v2/modules/select-module.so
+lib/slang/v2/modules/slsmg-module.so
+lib/slang/v2/modules/termios-module.so
+lib/slang/v2/modules/varray-module.so
+%%DATADIR%%/arrayfuns.sl
+%%DATADIR%%/autoload.sl
+%%DATADIR%%/cmaps/cool.map
+%%DATADIR%%/cmaps/copper.map
+%%DATADIR%%/cmaps/drywet.map
+%%DATADIR%%/cmaps/gebco.map
+%%DATADIR%%/cmaps/globe.map
+%%DATADIR%%/cmaps/gray.map
+%%DATADIR%%/cmaps/haxby.map
+%%DATADIR%%/cmaps/hot.map
+%%DATADIR%%/cmaps/jet.map
+%%DATADIR%%/cmaps/no_green.map
+%%DATADIR%%/cmaps/ocean.map
+%%DATADIR%%/cmaps/polar.map
+%%DATADIR%%/cmaps/rainbow.map
+%%DATADIR%%/cmaps/red2green.map
+%%DATADIR%%/cmaps/relief.map
+%%DATADIR%%/cmaps/sealand.map
+%%DATADIR%%/cmaps/seis.map
+%%DATADIR%%/cmaps/split.map
+%%DATADIR%%/cmaps/topo.map
+%%DATADIR%%/cmaps/wysiwyg.map
+%%DATADIR%%/fcntl.sl
+%%DATADIR%%/glob.sl
+%%DATADIR%%/help/pcrefuns.hlp
+%%DATADIR%%/help/pngfuns.hlp
+%%DATADIR%%/pcre.sl
+%%DATADIR%%/png.sl
+%%DATADIR%%/print.sl
+%%DATADIR%%/require.sl
+%%DATADIR%%/scripts/jpegsize
+%%DATADIR%%/scripts/lsrpm
+%%DATADIR%%/scripts/sldb
+%%DATADIR%%/scripts/svnsh
+%%DATADIR%%/select.sl
+%%DATADIR%%/sldb.sl
+%%DATADIR%%/sldbcore.sl
+%%DATADIR%%/slshrl.sl
+%%DATADIR%%/slsmg.sl
+%%DATADIR%%/stkcheck.sl
+%%DATADIR%%/structfuns.sl
+%%DATADIR%%/termios.sl
+%%DATADIR%%/varray.sl
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%/cmaps
+@unexec rmdir %D/%%DATADIR%%/local-packages 2>/dev/null || true
+@dirrm %%DATADIR%%
 @dirrm lib/slang/v2/modules
 @dirrm lib/slang/v2
 @dirrm lib/slang
-@unexec rmdir %D/share/slsh/local-packages 2>/dev/null || true
-@dirrm share/slsh
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index 8974146b9315..246b04114129 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libslang2
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v2.0/
 DISTNAME=	slang-${PORTVERSION}
@@ -27,6 +27,7 @@ INSTALL_TARGET=	install install-elf
 
 MAN1=		slsh.1
 DOCSDIR=	${PREFIX}/share/doc/slang
+DATADIR=	${PREFIX}/share/slsh
 
 OPTIONS=	PCRE "Include pcre support" on \
 		PNG  "Include png support"  on
@@ -41,7 +42,7 @@ PORTDOCS=	*
 LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
 PLIST_SUB+=	PCRE=""
 .else
-CONFIGURE_ARGS+=	--disable-pcre
+CONFIGURE_ARGS+=	--without-pcre
 PLIST_SUB+=	PCRE="@comment "
 .endif
 
@@ -49,7 +50,7 @@ PLIST_SUB+=	PCRE="@comment "
 LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
 PLIST_SUB+=	PNG=""
 .else
-CONFIGURE_ARGS+=	--disable-png
+CONFIGURE_ARGS+=	--without-png
 PLIST_SUB+=	PNG="@comment "
 .endif
 
diff --git a/devel/libslang2/distinfo b/devel/libslang2/distinfo
index d6bbbd533096..52e92ce57b01 100644
--- a/devel/libslang2/distinfo
+++ b/devel/libslang2/distinfo
@@ -1,2 +1,2 @@
-MD5 (slang-2.0.2.tar.bz2) = 6ef4ae010f17bc1238a978b8dc0ce154
-SIZE (slang-2.0.2.tar.bz2) = 1035709
+MD5 (slang-2.0.3.tar.bz2) = 14672524b0b5ad17f5894bd90224fef8
+SIZE (slang-2.0.3.tar.bz2) = 1036004
diff --git a/devel/libslang2/pkg-plist b/devel/libslang2/pkg-plist
index 24d039e4e228..42301fa7cccd 100644
--- a/devel/libslang2/pkg-plist
+++ b/devel/libslang2/pkg-plist
@@ -6,61 +6,61 @@ include/slcurses.h
 lib/libslang.a
 lib/libslang.so.2
 lib/libslang.so
-lib/slang/v2/modules/slsmg-module.so
-lib/slang/v2/modules/termios-module.so
-lib/slang/v2/modules/select-module.so
 lib/slang/v2/modules/fcntl-module.so
-lib/slang/v2/modules/varray-module.so
 %%PCRE%%lib/slang/v2/modules/pcre-module.so
 %%PNG%%lib/slang/v2/modules/png-module.so
-share/slsh/scripts/jpegsize
-share/slsh/scripts/lsrpm
-share/slsh/scripts/sldb
-share/slsh/scripts/svnsh
-share/slsh/arrayfuns.sl
-share/slsh/autoload.sl
-share/slsh/glob.sl
-share/slsh/print.sl
-share/slsh/require.sl
-share/slsh/sldb.sl
-share/slsh/sldbcore.sl
-share/slsh/slshrl.sl
-share/slsh/stkcheck.sl
-share/slsh/structfuns.sl
-share/slsh/slsmg.sl
-share/slsh/termios.sl
-share/slsh/select.sl
-share/slsh/fcntl.sl
-share/slsh/varray.sl
-share/slsh/pcre.sl
-share/slsh/png.sl
-share/slsh/cmaps/cool.map
-share/slsh/cmaps/copper.map
-share/slsh/cmaps/drywet.map
-share/slsh/cmaps/gebco.map
-share/slsh/cmaps/globe.map
-share/slsh/cmaps/gray.map
-share/slsh/cmaps/haxby.map
-share/slsh/cmaps/hot.map
-share/slsh/cmaps/jet.map
-share/slsh/cmaps/no_green.map
-share/slsh/cmaps/ocean.map
-share/slsh/cmaps/polar.map
-share/slsh/cmaps/rainbow.map
-share/slsh/cmaps/red2green.map
-share/slsh/cmaps/relief.map
-share/slsh/cmaps/sealand.map
-share/slsh/cmaps/seis.map
-share/slsh/cmaps/split.map
-share/slsh/cmaps/topo.map
-share/slsh/cmaps/wysiwyg.map
-share/slsh/help/pcrefuns.hlp
-share/slsh/help/pngfuns.hlp
-@dirrm share/slsh/scripts
-@dirrm share/slsh/help
-@dirrm share/slsh/cmaps
+lib/slang/v2/modules/select-module.so
+lib/slang/v2/modules/slsmg-module.so
+lib/slang/v2/modules/termios-module.so
+lib/slang/v2/modules/varray-module.so
+%%DATADIR%%/arrayfuns.sl
+%%DATADIR%%/autoload.sl
+%%DATADIR%%/cmaps/cool.map
+%%DATADIR%%/cmaps/copper.map
+%%DATADIR%%/cmaps/drywet.map
+%%DATADIR%%/cmaps/gebco.map
+%%DATADIR%%/cmaps/globe.map
+%%DATADIR%%/cmaps/gray.map
+%%DATADIR%%/cmaps/haxby.map
+%%DATADIR%%/cmaps/hot.map
+%%DATADIR%%/cmaps/jet.map
+%%DATADIR%%/cmaps/no_green.map
+%%DATADIR%%/cmaps/ocean.map
+%%DATADIR%%/cmaps/polar.map
+%%DATADIR%%/cmaps/rainbow.map
+%%DATADIR%%/cmaps/red2green.map
+%%DATADIR%%/cmaps/relief.map
+%%DATADIR%%/cmaps/sealand.map
+%%DATADIR%%/cmaps/seis.map
+%%DATADIR%%/cmaps/split.map
+%%DATADIR%%/cmaps/topo.map
+%%DATADIR%%/cmaps/wysiwyg.map
+%%DATADIR%%/fcntl.sl
+%%DATADIR%%/glob.sl
+%%DATADIR%%/help/pcrefuns.hlp
+%%DATADIR%%/help/pngfuns.hlp
+%%DATADIR%%/pcre.sl
+%%DATADIR%%/png.sl
+%%DATADIR%%/print.sl
+%%DATADIR%%/require.sl
+%%DATADIR%%/scripts/jpegsize
+%%DATADIR%%/scripts/lsrpm
+%%DATADIR%%/scripts/sldb
+%%DATADIR%%/scripts/svnsh
+%%DATADIR%%/select.sl
+%%DATADIR%%/sldb.sl
+%%DATADIR%%/sldbcore.sl
+%%DATADIR%%/slshrl.sl
+%%DATADIR%%/slsmg.sl
+%%DATADIR%%/stkcheck.sl
+%%DATADIR%%/structfuns.sl
+%%DATADIR%%/termios.sl
+%%DATADIR%%/varray.sl
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%/cmaps
+@unexec rmdir %D/%%DATADIR%%/local-packages 2>/dev/null || true
+@dirrm %%DATADIR%%
 @dirrm lib/slang/v2/modules
 @dirrm lib/slang/v2
 @dirrm lib/slang
-@unexec rmdir %D/share/slsh/local-packages 2>/dev/null || true
-@dirrm share/slsh