Index: devel/skalibs/Makefile =================================================================== --- devel/skalibs/Makefile +++ devel/skalibs/Makefile @@ -2,39 +2,30 @@ # $FreeBSD$ PORTNAME= skalibs -PORTVERSION= 0.47 +PORTVERSION= 2.2.1.0 CATEGORIES= devel MASTER_SITES= http://www.skarnet.org/software/${PORTNAME}/ -MAINTAINER= dhn@FreeBSD.org +MAINTAINER= colin@heliocat.net COMMENT= General purpose C libraries used by skarnet.org software -USE_GCC= any +LICENSE= ISCL -LDFLAGS?= -s -STRIPFLAGS?= -x +USES= gmake +USE_LDCONFIG= yes +HAS_CONFIGURE= yes +CONFIGURE_ARGS+=--prefix=${PREFIX} \ + --with-default-path=${LOCALBASE}/bin:/usr/bin:/bin -WRKSRC= ${WRKDIR}/prog/${DISTNAME} +DOCS= AUTHORS COPYING INSTALL README doc/*.html -DOCS= package/CHANGES package/README package/THANKS doc/*.html - -OPTIONS_DEFINE= DOCS - -do-configure: - ${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-compile/conf-cc - ${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/conf-compile/conf-ld - ${ECHO_CMD} "${STRIP_CMD} ${STRIPFLAGS}" \ - > ${WRKSRC}/conf-compile/conf-striplibs - -do-build: - cd ${WRKSRC} && package/compile - -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/include/${PORTNAME} - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/library/* ${STAGEDIR}${PREFIX}/lib/${PORTNAME} +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libskarnet.so.${PORTVERSION} @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_MAN} ${DOCS} ${STAGEDIR}${DOCSDIR} +.for d in libbiguint libdatastruct librandom libstdcrypto libstddjb libunixonacid + @${MKDIR} ${STAGEDIR}${DOCSDIR}/${d} + cd ${WRKSRC} && ${INSTALL_MAN} doc/${d}/*.html ${STAGEDIR}${DOCSDIR}/${d} +.endfor .include Index: devel/skalibs/distinfo =================================================================== --- devel/skalibs/distinfo +++ devel/skalibs/distinfo @@ -1,2 +1,2 @@ -SHA256 (skalibs-0.47.tar.gz) = 0e4136a699fb8ad87ff3afbd30b47109161d99d7eb212289bfb3ddd220ae75d9 -SIZE (skalibs-0.47.tar.gz) = 134430 +SHA256 (skalibs-2.2.1.0.tar.gz) = 9e80ba0ee95a1f28d7e5769957699e574962e8897140c63ab87f4ed60a82e253 +SIZE (skalibs-2.2.1.0.tar.gz) = 202831 Index: devel/skalibs/pkg-descr =================================================================== --- devel/skalibs/pkg-descr +++ devel/skalibs/pkg-descr @@ -11,4 +11,4 @@ from distributing any of your executables. Author: Laurent G. Bercot -WWW: http://www.skarnet.org/software/skalibs/ +WWW: http://www.skarnet.org/software/skalibs/ Index: devel/skalibs/pkg-plist =================================================================== --- devel/skalibs/pkg-plist +++ devel/skalibs/pkg-plist @@ -1,53 +1,61 @@ +etc/leapsecs.dat include/skalibs/alloc.h include/skalibs/allreadwrite.h include/skalibs/avlnode.h -include/skalibs/avlnodealloc.h -include/skalibs/avlnodebunch.h include/skalibs/avltree.h +include/skalibs/avltreen.h include/skalibs/biguint.h include/skalibs/bitarray.h include/skalibs/bufalloc.h include/skalibs/buffer.h include/skalibs/bytestr.h -include/skalibs/caltimedate.h +include/skalibs/cbuffer.h include/skalibs/cdb.h include/skalibs/cdb_make.h +include/skalibs/config.h include/skalibs/datastruct.h include/skalibs/direntry.h include/skalibs/diuint.h include/skalibs/diuint32.h -include/skalibs/diuint32alloc.h -include/skalibs/diuint32bunch.h -include/skalibs/diuintalloc.h -include/skalibs/diuintbunch.h +include/skalibs/djbtime.h include/skalibs/djbunix.h -include/skalibs/dns.h -include/skalibs/dns_helper.h -include/skalibs/dns_transmit.h include/skalibs/env.h include/skalibs/envalloc.h include/skalibs/environ.h include/skalibs/error.h include/skalibs/fmtscan.h +include/skalibs/functypes.h include/skalibs/gccattributes.h -include/skalibs/gen_alloc.h -include/skalibs/gen_bunch.h -include/skalibs/intalloc.h +include/skalibs/genalloc.h +include/skalibs/genset.h +include/skalibs/gensetdyn.h +include/skalibs/genwrite.h +include/skalibs/getpeereid.h +include/skalibs/gidstuff.h include/skalibs/iobuffer.h include/skalibs/iopause.h -include/skalibs/list1.h +include/skalibs/ip46.h +include/skalibs/kolbak.h +include/skalibs/lolstdio.h include/skalibs/md5.h +include/skalibs/mininetstring.h include/skalibs/netstring.h +include/skalibs/nonposix.h +include/skalibs/nsig.h include/skalibs/random.h +include/skalibs/randomegd.h include/skalibs/rc4.h include/skalibs/rrandom.h -include/skalibs/select.h +include/skalibs/segfault.h include/skalibs/selfpipe.h +include/skalibs/setgroups.h include/skalibs/sgetopt.h include/skalibs/sha1.h -include/skalibs/shglob.h +include/skalibs/sha256.h include/skalibs/sig.h -include/skalibs/skalibs-version.h +include/skalibs/siovec.h +include/skalibs/skaclient.h +include/skalibs/skalibs.h include/skalibs/skamisc.h include/skalibs/socket.h include/skalibs/stdcrypto.h @@ -56,43 +64,72 @@ include/skalibs/strerr.h include/skalibs/strerr2.h include/skalibs/surf.h -include/skalibs/syssocket.h +include/skalibs/sysdeps.h include/skalibs/tai.h -include/skalibs/ttymodes.h +include/skalibs/uint.h include/skalibs/uint16.h -include/skalibs/uint16alloc.h include/skalibs/uint32.h -include/skalibs/uint32aalloc.h -include/skalibs/uint32alloc.h include/skalibs/uint64.h -include/skalibs/uint64alloc.h -include/skalibs/uintalloc.h -include/skalibs/uintbunch.h +include/skalibs/ulong.h include/skalibs/unirandom.h +include/skalibs/unirandomdev.h +include/skalibs/unirandomegd.h +include/skalibs/unisurf.h +include/skalibs/unix-timed.h +include/skalibs/unix-transactional.h +include/skalibs/unixconnection.h +include/skalibs/unixmessage.h +include/skalibs/unixonacid.h +include/skalibs/ushort.h include/skalibs/webipc.h -lib/skalibs/libbiguint.a -lib/skalibs/libdatastruct.a -lib/skalibs/libdns.a -lib/skalibs/librandom.a -lib/skalibs/libstdcrypto.a -lib/skalibs/libstddjb.a -lib/skalibs/libttymodes.a -lib/skalibs/libwebipc.a -%%PORTDOCS%%%%DOCSDIR%%/CHANGES +lib/libskarnet.so +lib/libskarnet.so.2 +lib/libskarnet.so.2.2 +lib/libskarnet.so.2.2.1 +lib/libskarnet.so.2.2.1.0 +lib/skalibs/libskarnet.a +lib/skalibs/sysdeps/rt.lib +lib/skalibs/sysdeps/socket.lib +lib/skalibs/sysdeps/sysclock.lib +lib/skalibs/sysdeps/sysdeps +lib/skalibs/sysdeps/sysdeps.h +lib/skalibs/sysdeps/tainnow.lib +lib/skalibs/sysdeps/target +lib/skalibs/sysdeps/util.lib +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/THANKS %%PORTDOCS%%%%DOCSDIR%%/crosscompile.html -%%PORTDOCS%%%%DOCSDIR%%/dank-cross-notes.html -%%PORTDOCS%%%%DOCSDIR%%/gccattributes.html +%%PORTDOCS%%%%DOCSDIR%%/djblegacy.html +%%PORTDOCS%%%%DOCSDIR%%/flags.html %%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/install.html -%%PORTDOCS%%%%DOCSDIR%%/libbiguint.html -%%PORTDOCS%%%%DOCSDIR%%/libdatastruct.html -%%PORTDOCS%%%%DOCSDIR%%/libdns.html -%%PORTDOCS%%%%DOCSDIR%%/librandom.html -%%PORTDOCS%%%%DOCSDIR%%/libstdcrypto.html -%%PORTDOCS%%%%DOCSDIR%%/libstddjb.html -%%PORTDOCS%%%%DOCSDIR%%/libttymodes.html -%%PORTDOCS%%%%DOCSDIR%%/libwebipc.html -%%PORTDOCS%%%%DOCSDIR%%/selfpipe.html +%%PORTDOCS%%%%DOCSDIR%%/libbiguint/index.html +%%PORTDOCS%%%%DOCSDIR%%/libdatastruct/index.html +%%PORTDOCS%%%%DOCSDIR%%/librandom/index.html +%%PORTDOCS%%%%DOCSDIR%%/libskarnet.html +%%PORTDOCS%%%%DOCSDIR%%/libstdcrypto/index.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/alloc.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/allreadwrite.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/bitarray.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/djbtime.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/djbunix.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/gccattributes.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/genalloc.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/genwrite.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/index.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/iopause.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/ip46.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/lolstdio.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/safewrappers.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/selfpipe.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/stralloc.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/tai.html +%%PORTDOCS%%%%DOCSDIR%%/libunixonacid/index.html +%%PORTDOCS%%%%DOCSDIR%%/libunixonacid/kolbak.html +%%PORTDOCS%%%%DOCSDIR%%/libunixonacid/skaclient.html +%%PORTDOCS%%%%DOCSDIR%%/libunixonacid/unix-timed.html +%%PORTDOCS%%%%DOCSDIR%%/libunixonacid/unix-transactional.html +%%PORTDOCS%%%%DOCSDIR%%/libunixonacid/unixmessage.html +%%PORTDOCS%%%%DOCSDIR%%/license.html %%PORTDOCS%%%%DOCSDIR%%/upgrade.html Index: lang/execline/Makefile =================================================================== --- lang/execline/Makefile +++ lang/execline/Makefile @@ -2,46 +2,32 @@ # $FreeBSD$ PORTNAME= execline -PORTVERSION= 1.08 +PORTVERSION= 2.0.2.0 CATEGORIES= lang shells MASTER_SITES= http://www.skarnet.org/software/${PORTNAME}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= colin@heliocat.net COMMENT= Lightweight non-interactive sh(1)-like scripting language -BUILD_DEPENDS= ${LOCALBASE}/lib/skalibs/libstddjb.a:${PORTSDIR}/devel/skalibs +LICENSE= ISCL -WRKSRC= ${WRKDIR}/admin/${DISTNAME} +BUILD_DEPENDS= skalibs>=2.2.1.0:${PORTSDIR}/devel/skalibs -DOCS= package/CHANGES package/README package/THANKS package/TODO \ - doc/*.html - -OPTIONS_DEFINE= DOCS EXAMPLES - -do-configure: - ${ECHO_CMD} "FreeBSD" > ${WRKSRC}/src/sys/systype - ${ECHO_CMD} "${LOCALBASE}/include/skalibs" \ - > ${WRKSRC}/conf-compile/import - ${ECHO_CMD} "${LOCALBASE}/lib/skalibs" \ - >> ${WRKSRC}/conf-compile/import - ${REINPLACE_CMD} -e 's|superstrip1|#superstrip1|g' \ - ${WRKSRC}/conf-compile/conf-stripbins - @${REINPLACE_CMD} 's|gcc|${CC}|; s|-O2.*|${CFLAGS}|' \ - ${WRKSRC}/conf-compile/conf-cc \ - ${WRKSRC}/conf-compile/conf-ld - -do-build: - (cd ${WRKSRC} && package/compile) - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/command/* ${STAGEDIR}${PREFIX}/bin - @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/include/* \ - ${STAGEDIR}${PREFIX}/include/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/library/* ${STAGEDIR}${PREFIX}/lib - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/* ${STAGEDIR}${EXAMPLESDIR} +USES= gmake +USE_LDCONFIG= yes +HAS_CONFIGURE= yes +CONFIGURE_ARGS+=--prefix=${PREFIX} \ + --with-sysdeps=${LOCALBASE}/lib/skalibs/sysdeps \ + --with-lib=${LOCALBASE}/lib/skalibs \ + --with-include=${LOCALBASE}/include \ + --enable-shared + +DOCS= AUTHORS COPYING INSTALL README doc/*.html + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libexecline.so.${PORTVERSION} @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) + cd ${WRKSRC} && ${INSTALL_MAN} ${DOCS} ${STAGEDIR}${DOCSDIR} .include Index: lang/execline/distinfo =================================================================== --- lang/execline/distinfo +++ lang/execline/distinfo @@ -1,2 +1,2 @@ -SHA256 (execline-1.08.tar.gz) = 6b721bfc2d486e64fa5f0309496a80928ca04d44c647df2aba0c8bbc684ea03b -SIZE (execline-1.08.tar.gz) = 69685 +SHA256 (execline-2.0.2.0.tar.gz) = 73aa2db6e253f1821361033028d9b77733b799f93e4d7d477e4230534d7fce32 +SIZE (execline-2.0.2.0.tar.gz) = 73327 Index: lang/execline/pkg-descr =================================================================== --- lang/execline/pkg-descr +++ lang/execline/pkg-descr @@ -10,4 +10,4 @@ and has no security issues. Author: Laurent G. Bercot -WWW: http://www.skarnet.org/software/execline/ +WWW: http://www.skarnet.org/software/execline/ Index: lang/execline/pkg-plist =================================================================== --- lang/execline/pkg-plist +++ lang/execline/pkg-plist @@ -8,25 +8,28 @@ bin/elglob bin/emptyenv bin/exec -bin/execline bin/execlineb bin/exit bin/export +bin/fdblock bin/fdclose bin/fdmove bin/fdreserve -bin/for -bin/forbacktick +bin/fdswap +bin/forbacktickx bin/foreground +bin/forx bin/getpid bin/heredoc bin/homeof bin/if -bin/ifthenelse +bin/ifelse bin/ifte +bin/ifthenelse bin/import bin/importas -bin/loopwhile +bin/loopwhilex +bin/multidefine bin/multisubstitute bin/pipeline bin/piperw @@ -37,15 +40,18 @@ bin/umask bin/unexport bin/wait +include/execline/config.h include/execline/execline.h -include/execline/exls1.h -lib/libexecline.a -lib/libexlp.a -lib/libexls1.a -%%PORTDOCS%%%%DOCSDIR%%/CHANGES +lib/execline/libexecline.a +lib/libexecline.so +lib/libexecline.so.2 +lib/libexecline.so.2.0 +lib/libexecline.so.2.0.2 +lib/libexecline.so.2.0.2.0 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/THANKS -%%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/background.html %%PORTDOCS%%%%DOCSDIR%%/backtick.html %%PORTDOCS%%%%DOCSDIR%%/cd.html @@ -63,29 +69,30 @@ %%PORTDOCS%%%%DOCSDIR%%/exec.html %%PORTDOCS%%%%DOCSDIR%%/execline-shell.html %%PORTDOCS%%%%DOCSDIR%%/execline-startup.html -%%PORTDOCS%%%%DOCSDIR%%/execline.html %%PORTDOCS%%%%DOCSDIR%%/execlineb.html %%PORTDOCS%%%%DOCSDIR%%/exit.html %%PORTDOCS%%%%DOCSDIR%%/export.html +%%PORTDOCS%%%%DOCSDIR%%/fdblock.html %%PORTDOCS%%%%DOCSDIR%%/fdclose.html %%PORTDOCS%%%%DOCSDIR%%/fdmove.html %%PORTDOCS%%%%DOCSDIR%%/fdreserve.html -%%PORTDOCS%%%%DOCSDIR%%/for.html -%%PORTDOCS%%%%DOCSDIR%%/forbacktick.html +%%PORTDOCS%%%%DOCSDIR%%/fdswap.html +%%PORTDOCS%%%%DOCSDIR%%/forbacktickx.html %%PORTDOCS%%%%DOCSDIR%%/foreground.html +%%PORTDOCS%%%%DOCSDIR%%/forx.html %%PORTDOCS%%%%DOCSDIR%%/getpid.html %%PORTDOCS%%%%DOCSDIR%%/grammar.html %%PORTDOCS%%%%DOCSDIR%%/heredoc.html %%PORTDOCS%%%%DOCSDIR%%/homeof.html %%PORTDOCS%%%%DOCSDIR%%/if.html +%%PORTDOCS%%%%DOCSDIR%%/ifelse.html %%PORTDOCS%%%%DOCSDIR%%/ifte.html %%PORTDOCS%%%%DOCSDIR%%/ifthenelse.html %%PORTDOCS%%%%DOCSDIR%%/import.html %%PORTDOCS%%%%DOCSDIR%%/importas.html %%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/install.html -%%PORTDOCS%%%%DOCSDIR%%/libexecline.html -%%PORTDOCS%%%%DOCSDIR%%/loopwhile.html +%%PORTDOCS%%%%DOCSDIR%%/loopwhilex.html +%%PORTDOCS%%%%DOCSDIR%%/multidefine.html %%PORTDOCS%%%%DOCSDIR%%/multisubstitute.html %%PORTDOCS%%%%DOCSDIR%%/pipeline.html %%PORTDOCS%%%%DOCSDIR%%/piperw.html @@ -97,5 +104,3 @@ %%PORTDOCS%%%%DOCSDIR%%/unexport.html %%PORTDOCS%%%%DOCSDIR%%/upgrade.html %%PORTDOCS%%%%DOCSDIR%%/wait.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/execline-shell -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/execline-startup Index: sysutils/runwhen/Makefile =================================================================== --- sysutils/runwhen/Makefile +++ sysutils/runwhen/Makefile @@ -20,6 +20,8 @@ OPTIONS_DEFINE= DOCS +BROKEN= fails to build with skalibs-2.x + post-patch: @${REINPLACE_CMD} -e 's!gcc -O2!${CC} ${CFLAGS}!' \ ${WRKSRC}/conf-compile/host_compile.sh