3 files changed, 36 insertions, 71 deletions

diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index 359c648e290d..3b4c7fd73c77 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	libslang2
-PORTVERSION=	2.0.7
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	devel
-MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v2.0/ \
-		ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.0/ \
-		ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.0/ \
-		ftp://ftp.plig.org/pub/slang/v2.0/
+MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v${PORTVERSION:R}/ \
+		ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${PORTVERSION:R}/ \
+		ftp://ftp.ntua.gr/pub/lang/slang/slang/v${PORTVERSION:R}/ \
+		ftp://ftp.plig.org/pub/slang/v${PORTVERSION:R}/
 DISTNAME=	slang-${PORTVERSION}
 
 MAINTAINER=	garga@FreeBSD.org
@@ -25,17 +24,21 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 CONFLICTS=	libslang-[0-9]* libslang2-devel-[0-9]*
 
-ALL_TARGET=	all elf
-INSTALL_TARGET=	install install-elf
+ALL_TARGET=	all static
+INSTALL_TARGET=	install install-static
 
 MAN1=		slsh.1
 DOCSDIR=	${PREFIX}/share/doc/slang
 DATADIR=	${PREFIX}/share/slsh
+CONFIGURE_ARGS=	--mandir=${MAN1PREFIX}/man
 
-OPTIONS=	PCRE "Include pcre support" on \
-		PNG  "Include png support"  on
+OPTIONS=	PCRE	"Include pcre support" on \
+		PNG	"Include png support"  on \
+		ICONV	"Include iconv support" on \
+		ONIG	"Include Oniguruma support" off
 
 PORTDOCS=	*
+PORTDATA=	*
 
 .include <bsd.port.pre.mk>
 
@@ -55,9 +58,25 @@ CONFIGURE_ARGS+=	--without-png
 PLIST_SUB+=	PNG="@comment "
 .endif
 
+.if !defined(WITHOUT_ICONV)
+USE_ICONV=	yes
+PLIST_SUB+=	ICONV=""
+.else
+CONFIGURE_ARGS+=	--without-iconv
+PLIST_SUB+=	ICONV="@comment "
+.endif
+
+.if defined(WITH_ONIG)
+LIB_DEPENDS+=	onig.1:${PORTSDIR}/devel/oniguruma4
+PLIST_SUB+=	ONIG=""
+.else
+CONFIGURE_ARGS+=	--without-onig
+PLIST_SUB+=	ONIG="@comment "
+.endif
+
 post-patch:
 .if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's, install_docs,,g' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's, install-docs,,g' ${WRKSRC}/src/Makefile.in
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/libslang2/distinfo b/devel/libslang2/distinfo
index 9d5baf9a6ca8..567845378fb5 100644
--- a/devel/libslang2/distinfo
+++ b/devel/libslang2/distinfo
@@ -1,3 +1,3 @@
-MD5 (slang-2.0.7.tar.bz2) = 522d9075a721ebe235211dc96c7db2d1
-SHA256 (slang-2.0.7.tar.bz2) = 61402410b60d8c64c349c5f875bc6a69bf881074494c1a1351032d6873ad10f5
-SIZE (slang-2.0.7.tar.bz2) = 1085744
+MD5 (slang-2.1.1.tar.bz2) = 4465440c158a32aaebed6ef07e7408ac
+SHA256 (slang-2.1.1.tar.bz2) = c2702b4a087065ea88a7a42f45ba9f45867a7d589643111ac24a4be1997a7bc0
+SIZE (slang-2.1.1.tar.bz2) = 1170920
diff --git a/devel/libslang2/pkg-plist b/devel/libslang2/pkg-plist
index 021753ecbc60..a8b607cf4740 100644
--- a/devel/libslang2/pkg-plist
+++ b/devel/libslang2/pkg-plist
@@ -4,73 +4,19 @@ etc/slsh.rc
 include/slang.h
 include/slcurses.h
 lib/libslang.a
-lib/libslang.so.2.0.7
+lib/libslang.so.2.1.1
 lib/libslang.so.2
 lib/libslang.so
 lib/slang/v2/modules/fcntl-module.so
 %%PCRE%%lib/slang/v2/modules/pcre-module.so
 %%PNG%%lib/slang/v2/modules/png-module.so
+%%ICONV%%lib/slang/v2/modules/iconv-module.so
+%%ONIG%%lib/slang/v2/modules/onig-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
-%%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/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
-%%DATADIR%%/profile.sl
-%%DATADIR%%/require.sl
-%%DATADIR%%/scripts/jpegsize
-%%DATADIR%%/scripts/lsrpm
-%%DATADIR%%/scripts/sldb
-%%DATADIR%%/scripts/slprof
-%%DATADIR%%/scripts/svnsh
-%%DATADIR%%/select.sl
-%%DATADIR%%/sldb.sl
-%%DATADIR%%/sldbcore.sl
-%%DATADIR%%/slshrl.sl
-%%DATADIR%%/slsmg.sl
-%%DATADIR%%/socket.sl
-%%DATADIR%%/stkcheck.sl
-%%DATADIR%%/structfuns.sl
-%%DATADIR%%/termios.sl
-%%DATADIR%%/varray.sl
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/cmaps
-@dirrmtry %%DATADIR%%/local-packages
-@dirrm %%DATADIR%%
 @dirrm lib/slang/v2/modules
 @dirrm lib/slang/v2
 @dirrm lib/slang