Index: head/devel/libslang2/files/patch-slsh__Makefile.in =================================================================== --- head/devel/libslang2/files/patch-slsh__Makefile.in (revision 428203) +++ head/devel/libslang2/files/patch-slsh__Makefile.in (nonexistent) @@ -1,20 +0,0 @@ ---- slsh/Makefile.in.orig 2011-04-11 04:37:07.000000000 +0200 -+++ slsh/Makefile.in 2014-09-02 15:47:37.000000000 +0200 -@@ -23,6 +23,7 @@ - #---------------------------------------------------------------------------- - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - MKINSDIR = $(CONFIG_DIR)/autoconf/mkinsdir.sh - #---------------------------------------------------------------------------- - # Where system-wide slsh.rc, scripts, and library files reside -@@ -148,8 +149,8 @@ - install: slsh install_directories install_lib_files install_rline_files \ - install_scripts install_help install_docs - $(INSTALL) $(OBJDIR)/slsh $(DEST_BIN_DIR)/ -+ echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> etc/slsh.rc - $(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/ -- echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc - $(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/ - #--------------------------------------------------------------------------- - # Housekeeping Property changes on: head/devel/libslang2/files/patch-slsh__Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libslang2/files/patch-configure =================================================================== --- head/devel/libslang2/files/patch-configure (revision 428203) +++ head/devel/libslang2/files/patch-configure (nonexistent) @@ -1,19 +0,0 @@ ---- configure.orig 2014-05-14 19:15:05.000000000 -0300 -+++ configure 2014-05-14 19:16:21.000000000 -0300 -@@ -664,6 +664,7 @@ - GNU_READLINE - TERMINFO_LAYOUT - pkgconfigdir -+INSTALL_LIB - INSTALL_DATA - INSTALL_SCRIPT - INSTALL_PROGRAM -@@ -4163,6 +4164,8 @@ - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -+test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL} -s -m 444' -+ - - - # Check whether --with-pkgconfigdir was given. Property changes on: head/devel/libslang2/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libslang2/files/patch-src__Makefile.in =================================================================== --- head/devel/libslang2/files/patch-src__Makefile.in (revision 428203) +++ head/devel/libslang2/files/patch-src__Makefile.in (nonexistent) @@ -1,19 +0,0 @@ ---- src/Makefile.in.orig 2014-05-14 19:08:43.000000000 -0300 -+++ src/Makefile.in 2014-05-14 19:09:40.000000000 -0300 -@@ -63,6 +63,7 @@ - RANLIB = @RANLIB@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LIB = @INSTALL_LIB@ - MKINSDIR = @CONFIG_DIR@/autoconf/mkinsdir.sh - RM = rm -f - RM_R = rm -rf -@@ -195,7 +196,7 @@ - -$(RM) $(DEST_LIBDIR)/$(ELFLIB) - -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR) - @echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR) -- $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/ -+ $(INSTALL_LIB) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/ - -cd $(DEST_LIBDIR) && $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR) - -cd $(DEST_LIBDIR) && $(LN) $(ELFLIB_MAJOR) $(ELFLIB) - @echo "" Property changes on: head/devel/libslang2/files/patch-src__Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libslang2/Makefile =================================================================== --- head/devel/libslang2/Makefile (revision 428203) +++ head/devel/libslang2/Makefile (revision 428204) @@ -1,69 +1,66 @@ # $FreeBSD$ PORTNAME= libslang2 -PORTVERSION= 2.3.0 +PORTVERSION= 2.3.1 CATEGORIES= devel MASTER_SITES= http://www.jedsoft.org/releases/slang/ DISTNAME= slang-${PORTVERSION} MAINTAINER= garga@FreeBSD.org COMMENT= Routines for rapid alpha-numeric terminal applications development LICENSE= GPLv2 CONFLICTS= libslang-1.*.j[0-9] USES= tar:bzip2 USE_LDCONFIG= yes 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 DOCSDIR= ${PREFIX}/share/doc/slang DATADIR= ${PREFIX}/share/slsh OPTIONS_DEFINE= PCRE PNG ICONV ONIG DOCS OPTIONS_DEFAULT=PCRE PNG ICONV OPTIONS_SUB= yes ONIG_DESC= Oniguruma support PORTDOCS= * PCRE_CONFIGURE_WITH= pcre PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PNG_CONFIGURE_WITH= png PNG_LIB_DEPENDS= libpng.so:graphics/png ICONV_USES= iconv ONIG_CONFIGURE_WITH= onig -ONIG_LIB_DEPENDS= libonig.so:devel/oniguruma4 +ONIG_LIB_DEPENDS= libonig.so:devel/oniguruma5 .include .if ! ${PORT_OPTIONS:MICONV} || empty(ICONV_LIB) CONFIGURE_ARGS+= --without-iconv .endif post-patch: @${REINPLACE_CMD} -E 's,doc/slsh,doc/slang/v\@slang_major_version\@,' \ ${WRKSRC}/slsh/Makefile.in - @${REINPLACE_CMD} -e 's, install[_-]docs,,g; /MKINSDIR.*DEST_SLSH_DOC_DIR/d' \ - ${WRKSRC}/src/Makefile.in \ - ${WRKSRC}/slsh/Makefile.in - @${REINPLACE_CMD} -e 's,INSTALL_MODULE,INSTALL_LIB,g' \ - ${WRKSRC}/modules/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in NEWS changes.txt ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/slsh + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libslang.so.${PORTVERSION} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/slang/v2/modules/*.so .include Index: head/devel/libslang2/distinfo =================================================================== --- head/devel/libslang2/distinfo (revision 428203) +++ head/devel/libslang2/distinfo (revision 428204) @@ -1,2 +1,3 @@ -SHA256 (slang-2.3.0.tar.bz2) = f95224060f45e0d8212a5039b339afa5f1a94a1bb0298e796104e5b12e926129 -SIZE (slang-2.3.0.tar.bz2) = 1532986 +TIMESTAMP = 1481282375 +SHA256 (slang-2.3.1.tar.bz2) = a810d5da7b0c0c8c335393c6b4f12884be6fa7696d9ca9521ef21316a4e00f9d +SIZE (slang-2.3.1.tar.bz2) = 1577864 Index: head/devel/libslang2/pkg-plist =================================================================== --- head/devel/libslang2/pkg-plist (revision 428203) +++ head/devel/libslang2/pkg-plist (revision 428204) @@ -1,135 +1,138 @@ bin/slsh etc/slsh.rc include/slang.h include/slcurses.h lib/libslang.a 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 %%ONIG%%lib/slang/v2/modules/onig-module.so lib/slang/v2/modules/base64-module.so lib/slang/v2/modules/chksum-module.so lib/slang/v2/modules/csv-module.so lib/slang/v2/modules/histogram-module.so lib/slang/v2/modules/json-module.so 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/stats-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 man/man1/slsh.1.gz %%DATADIR%%/arrayfuns.sl %%DATADIR%%/autoload.sl %%DATADIR%%/base64.sl %%DATADIR%%/chksum.sl %%DATADIR%%/cmaps/cool.map %%DATADIR%%/cmaps/coolwarm.map %%DATADIR%%/cmaps/copper.map %%DATADIR%%/cmaps/cubicl.map %%DATADIR%%/cmaps/cubicyf.map %%DATADIR%%/cmaps/ds9b.map %%DATADIR%%/cmaps/ds9sls.map %%DATADIR%%/cmaps/drywet.map %%DATADIR%%/cmaps/edge.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%%/cmdopt.sl %%DATADIR%%/csv.sl %%DATADIR%%/fcntl.sl %%DATADIR%%/fork.sl %%DATADIR%%/fswalk.sl %%DATADIR%%/glob.sl %%DATADIR%%/help/arrayfuns.hlp %%DATADIR%%/help/base64funs.hlp %%DATADIR%%/help/chksumfuns.hlp %%DATADIR%%/help/cmdopt.hlp %%DATADIR%%/help/csvfuns.hlp %%DATADIR%%/help/forkfuns.hlp %%DATADIR%%/help/fswalk.hlp %%DATADIR%%/help/glob.hlp %%DATADIR%%/help/histfuns.hlp %%DATADIR%%/help/jsonfuns.hlp %%DATADIR%%/help/listfuns.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 %%DATADIR%%/help/require.hlp %%DATADIR%%/help/setfuns.hlp %%DATADIR%%/help/slsmg.hlp %%DATADIR%%/help/sockfuns.hlp %%DATADIR%%/help/statsfuns.hlp %%DATADIR%%/help/structfuns.hlp %%DATADIR%%/histogram.sl %%DATADIR%%/iconv.sl %%DATADIR%%/json.sl %%DATADIR%%/listfuns.sl %%DATADIR%%/onig.sl %%DATADIR%%/pcre.sl %%DATADIR%%/png.sl %%DATADIR%%/print.sl %%DATADIR%%/process.sl %%DATADIR%%/profile.sl %%DATADIR%%/rand.sl %%DATADIR%%/readascii.sl %%DATADIR%%/require.sl %%DATADIR%%/rline/complete.sl %%DATADIR%%/rline/editfuns.sl %%DATADIR%%/rline/editor.sl %%DATADIR%%/rline/emacskeys.sl %%DATADIR%%/rline/history.sl %%DATADIR%%/rline/histsrch.sl %%DATADIR%%/rline/slrline.rc %%DATADIR%%/rline/vikeys.sl %%DATADIR%%/scripts/jpegsize %%DATADIR%%/scripts/lsrpm %%DATADIR%%/scripts/sldb %%DATADIR%%/scripts/slprof %%DATADIR%%/scripts/slstkchk %%DATADIR%%/scripts/svnsh %%DATADIR%%/select.sl %%DATADIR%%/setfuns.sl %%DATADIR%%/sldb.sl %%DATADIR%%/sldbcore.sl %%DATADIR%%/sldbsock.sl %%DATADIR%%/slshhelp.sl %%DATADIR%%/slshrl.sl %%DATADIR%%/slsmg.sl %%DATADIR%%/socket.sl %%DATADIR%%/stats.sl +%%DATADIR%%/statslib/ad_test.sl +%%DATADIR%%/statslib/ks_test.sl +%%DATADIR%%/statslib/kuiper.sl %%DATADIR%%/stkcheck.sl %%DATADIR%%/structfuns.sl %%DATADIR%%/sysconf.sl %%DATADIR%%/termios.sl %%DATADIR%%/varray.sl %%DATADIR%%/zlib.sl @dir %%DATADIR%%/local-packages