[Midnightbsd-cvs] mports [18745] trunk/devel/libslang2: libslang 2.3.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat May 2 18:07:10 EDT 2015 

Revision: 18745
          http://svnweb.midnightbsd.org/mports/?rev=18745
Author:   laffer1
Date:     2015-05-02 18:07:10 -0400 (Sat, 02 May 2015)
Log Message:
-----------
libslang 2.3.0

Modified Paths:
--------------
    trunk/devel/libslang2/Makefile
    trunk/devel/libslang2/distinfo
    trunk/devel/libslang2/pkg-descr
    trunk/devel/libslang2/pkg-plist

Added Paths:
-----------
    trunk/devel/libslang2/files/
    trunk/devel/libslang2/files/patch-configure
    trunk/devel/libslang2/files/patch-slsh__Makefile.in
    trunk/devel/libslang2/files/patch-src__Makefile.in

Modified: trunk/devel/libslang2/Makefile
===================================================================
--- trunk/devel/libslang2/Makefile	2015-05-02 22:02:58 UTC (rev 18744)
+++ trunk/devel/libslang2/Makefile	2015-05-02 22:07:10 UTC (rev 18745)
@@ -1,82 +1,68 @@
 # $MidnightBSD$
 
 PORTNAME=	libslang2
-PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTVERSION=	2.3.0
+PORTREVISION=	0
 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}/ \
-		ftp://ftp.ntua.gr/pub/lang/slang/slang/v${PORTVERSION:R}/
+MASTER_SITES=	http://www.jedsoft.org/releases/slang/
 DISTNAME=	slang-${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Routines for rapid alpha-numeric terminal applications development
+
 LICENSE=        gpl2     
 
-USE_BZIP2=	yes
+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
 
-CONFLICTS=	libslang-[0-9]* libslang-1.*.j[0-9]
-
 ALL_TARGET=	all static
 INSTALL_TARGET=	install install-static
 
-MAN1=		slsh.1
 DOCSDIR=	${PREFIX}/share/doc/slang
 DATADIR=	${PREFIX}/share/slsh
 
 OPTIONS_DEFINE=	PCRE PNG ICONV ONIG DOCS
 OPTIONS_DEFAULT=PCRE PNG ICONV DOCS
+OPTIONS_SUB=	yes
 
 ONIG_DESC=	Oniguruma support
 
 PORTDOCS=	*
 
+PCRE_CONFIGURE_WITH=	pcre
+PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PNG_CONFIGURE_WITH=	png
+PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+ICONV_USES=		iconv
+ONIG_CONFIGURE_WITH=	onig
+ONIG_LIB_DEPENDS=	libonig.so:${PORTSDIR}/devel/oniguruma4
+
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
-PLIST_SUB+=	PCRE=""
-.else
-CONFIGURE_ARGS+=	--without-pcre
-PLIST_SUB+=	PCRE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
-PLIST_SUB+=	PNG=""
-.else
-CONFIGURE_ARGS+=	--without-png
-PLIST_SUB+=	PNG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MICONV}
-USE_ICONV=	yes
-PLIST_SUB+=	ICONV=""
-.else
+.if ! ${PORT_OPTIONS:MICONV} || empty(ICONV_LIB)
 CONFIGURE_ARGS+=	--without-iconv
-PLIST_SUB+=	ICONV="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MONIG}
-LIB_DEPENDS+=	onig:${PORTSDIR}/devel/oniguruma4
-PLIST_SUB+=	ONIG=""
-.else
-CONFIGURE_ARGS+=	--without-onig
-PLIST_SUB+=	ONIG="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -E 's,doc/slsh,doc/slang/v\@slang_major_version\@,' \
 		${WRKSRC}/slsh/Makefile.in
-.if empty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} -e 's, install[_-]docs,,g; /MKINSDIR.*DEST_SLSH_DOC_DIR/d' \
 		${WRKSRC}/src/Makefile.in \
 		${WRKSRC}/slsh/Makefile.in
-.endif
+	@${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
+
 .include <bsd.port.post.mk>

Modified: trunk/devel/libslang2/distinfo
===================================================================
--- trunk/devel/libslang2/distinfo	2015-05-02 22:02:58 UTC (rev 18744)
+++ trunk/devel/libslang2/distinfo	2015-05-02 22:07:10 UTC (rev 18745)
@@ -1,2 +1,2 @@
-SHA256 (slang-2.2.4.tar.bz2) = 9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a01d5db
-SIZE (slang-2.2.4.tar.bz2) = 1427363
+SHA256 (slang-2.3.0.tar.bz2) = f95224060f45e0d8212a5039b339afa5f1a94a1bb0298e796104e5b12e926129
+SIZE (slang-2.3.0.tar.bz2) = 1532986

Added: trunk/devel/libslang2/files/patch-configure
===================================================================
--- trunk/devel/libslang2/files/patch-configure	                        (rev 0)
+++ trunk/devel/libslang2/files/patch-configure	2015-05-02 22:07:10 UTC (rev 18745)
@@ -0,0 +1,19 @@
+--- 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: trunk/devel/libslang2/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/libslang2/files/patch-slsh__Makefile.in
===================================================================
--- trunk/devel/libslang2/files/patch-slsh__Makefile.in	                        (rev 0)
+++ trunk/devel/libslang2/files/patch-slsh__Makefile.in	2015-05-02 22:07:10 UTC (rev 18745)
@@ -0,0 +1,20 @@
+--- 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: trunk/devel/libslang2/files/patch-slsh__Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/libslang2/files/patch-src__Makefile.in
===================================================================
--- trunk/devel/libslang2/files/patch-src__Makefile.in	                        (rev 0)
+++ trunk/devel/libslang2/files/patch-src__Makefile.in	2015-05-02 22:07:10 UTC (rev 18745)
@@ -0,0 +1,19 @@
+--- 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: trunk/devel/libslang2/files/patch-src__Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/libslang2/pkg-descr
===================================================================
--- trunk/devel/libslang2/pkg-descr	2015-05-02 22:02:58 UTC (rev 18744)
+++ trunk/devel/libslang2/pkg-descr	2015-05-02 22:07:10 UTC (rev 18745)
@@ -9,4 +9,4 @@
 interpreter that may be easily embedded into a program to
 make it extensible. 
 
-WWW:	http://www.jedsoft.org/slang/
+WWW: http://www.jedsoft.org/slang/

Modified: trunk/devel/libslang2/pkg-plist
===================================================================
--- trunk/devel/libslang2/pkg-plist	2015-05-02 22:02:58 UTC (rev 18744)
+++ trunk/devel/libslang2/pkg-plist	2015-05-02 22:07:10 UTC (rev 18745)
@@ -1,4 +1,3 @@
- at comment $FreeBSD$
 bin/slsh
 etc/slsh.rc
 include/slang.h
@@ -13,24 +12,35 @@
 %%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
@@ -52,12 +62,19 @@
 %%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
@@ -70,8 +87,12 @@
 %%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
@@ -104,6 +125,7 @@
 %%DATADIR%%/slshrl.sl
 %%DATADIR%%/slsmg.sl
 %%DATADIR%%/socket.sl
+%%DATADIR%%/stats.sl
 %%DATADIR%%/stkcheck.sl
 %%DATADIR%%/structfuns.sl
 %%DATADIR%%/sysconf.sl
@@ -110,13 +132,4 @@
 %%DATADIR%%/termios.sl
 %%DATADIR%%/varray.sl
 %%DATADIR%%/zlib.sl
- at exec mkdir -p %D/%%DATADIR%%/local-packages
- at dirrmtry lib/slang/v2/modules
- at dirrmtry lib/slang/v2
- at dirrmtry lib/slang
- at dirrm %%DATADIR%%/cmaps
- at dirrm %%DATADIR%%/help
- at dirrmtry %%DATADIR%%/local-packages
- at dirrm %%DATADIR%%/rline
- at dirrm %%DATADIR%%/scripts
- at dirrmtry %%DATADIR%%
+ at dir %%DATADIR%%/local-packages

More information about the Midnightbsd-cvs mailing list