Update to 2.2.2

4 files changed, 16 insertions, 20 deletions

diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index 464f0beddd24..4de672a75aba 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libslang2
-PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v${PORTVERSION:R}/ \
 		ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${PORTVERSION:R}/ \
@@ -25,6 +24,8 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 PLIST_SUB+=	SHLIB_VERSION=${PORTVERSION}
 
+CONFIGURE_ARGS+=--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
+
 ALL_TARGET=	all static
 INSTALL_TARGET=	install install-static
 
diff --git a/devel/libslang2/distinfo b/devel/libslang2/distinfo
index b459432bad3f..abfb6661b46e 100644
--- a/devel/libslang2/distinfo
+++ b/devel/libslang2/distinfo
@@ -1,3 +1,3 @@
-MD5 (slang-2.1.4.tar.bz2) = 1299d5d3317e2aa7e2d75c8ce889474c
-SHA256 (slang-2.1.4.tar.bz2) = 944e7123a3889f1e972f77c7cd46e2e98f7f8d02d25c585f1276c9c9307161a6
-SIZE (slang-2.1.4.tar.bz2) = 1283938
+MD5 (slang-2.2.2.tar.bz2) = 974437602a781cfe92ab61433dd16d03
+SHA256 (slang-2.2.2.tar.bz2) = cfaf8551fa3855f9b0043309bb553ef6d457f931b404df5a6ba6a5a69371fc42
+SIZE (slang-2.2.2.tar.bz2) = 1366850
diff --git a/devel/libslang2/files/patch-src__sldisply.c b/devel/libslang2/files/patch-src__sldisply.c
deleted file mode 100644
index 9ff0143d4aea..000000000000
--- a/devel/libslang2/files/patch-src__sldisply.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/sldisply.c~	2008-08-24 20:14:47.000000000 -0400
-+++ src/sldisply.c	2009-02-19 09:59:08.000000000 -0500
-@@ -2233,10 +2233,9 @@
-     * this more general.
-     */
-    /* FIXME: Priority=low; */
--   if (0 == strcmp (cap, "ac"))
--     return s;
-+   if (0 != strcmp (cap, "ac"))
-+     s = fixup_tgetstr (s);
- 
--   s = fixup_tgetstr (s);
- #ifdef USE_TERMCAP
-    if ((s >= area_buf) && (s < area_buf + sizeof(area_buf)))
-      {
diff --git a/devel/libslang2/pkg-plist b/devel/libslang2/pkg-plist
index 46d9494bd0db..2da2254c2404 100644
--- a/devel/libslang2/pkg-plist
+++ b/devel/libslang2/pkg-plist
@@ -8,6 +8,7 @@ lib/libslang.so.%%SHLIB_VERSION%%
 lib/libslang.so.2
 lib/libslang.so
 lib/slang/v2/modules/fcntl-module.so
+lib/slang/v2/modules/fork-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
@@ -16,8 +17,11 @@ lib/slang/v2/modules/rand-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/sysconf-module.so
 lib/slang/v2/modules/termios-module.so
 lib/slang/v2/modules/varray-module.so
+lib/slang/v2/modules/zlib-module.so
+libdata/pkgconfig/slang.pc
 %%DATADIR%%/arrayfuns.sl
 %%DATADIR%%/autoload.sl
 %%DATADIR%%/cmaps/cool.map
@@ -44,14 +48,17 @@ lib/slang/v2/modules/varray-module.so
 %%DATADIR%%/cmaps/wysiwyg.map
 %%DATADIR%%/cmdopt.sl
 %%DATADIR%%/fcntl.sl
+%%DATADIR%%/fork.sl
 %%DATADIR%%/glob.sl
 %%DATADIR%%/help/arrayfuns.hlp
 %%DATADIR%%/help/cmdopt.hlp
+%%DATADIR%%/help/forkfuns.hlp
 %%DATADIR%%/help/glob.hlp
 %%DATADIR%%/help/onigfuns.hlp
 %%DATADIR%%/help/pcrefuns.hlp
 %%DATADIR%%/help/pngfuns.hlp
 %%DATADIR%%/help/print.hlp
+%%DATADIR%%/help/process.hlp
 %%DATADIR%%/help/profile.hlp
 %%DATADIR%%/help/randfuns.hlp
 %%DATADIR%%/help/readascii.hlp
@@ -63,6 +70,7 @@ lib/slang/v2/modules/varray-module.so
 %%DATADIR%%/pcre.sl
 %%DATADIR%%/png.sl
 %%DATADIR%%/print.sl
+%%DATADIR%%/process.sl
 %%DATADIR%%/profile.sl
 %%DATADIR%%/rand.sl
 %%DATADIR%%/readascii.sl
@@ -88,8 +96,10 @@ lib/slang/v2/modules/varray-module.so
 %%DATADIR%%/socket.sl
 %%DATADIR%%/stkcheck.sl
 %%DATADIR%%/structfuns.sl
+%%DATADIR%%/sysconf.sl
 %%DATADIR%%/termios.sl
 %%DATADIR%%/varray.sl
+%%DATADIR%%/zlib.sl
 @exec mkdir -p %D/%%DATADIR%%/local-packages
 @dirrmtry lib/slang/v2/modules
 @dirrmtry lib/slang/v2