diff --git a/devel/schilybase/Makefile.master b/devel/schilybase/Makefile.master index c182923db2c3..9a698745f70d 100644 --- a/devel/schilybase/Makefile.master +++ b/devel/schilybase/Makefile.master @@ -1,88 +1,88 @@ -DISTVERSION= 2021-07-29 +DISTVERSION= 2021-08-14 MASTER_SITES= SF/schilytools DISTNAME= schily-${DISTVERSION} MAINTAINER= fuz@fuz.su LICENSE= CDDL ${COMPONENTS:@c@${LICENSE.${c}}@:O:u} LICENSE.autoconf= GPLv2 LICENSE.libhfs_iso= GPLv2 LICENSE.man2html= GPLv2 LICENSE.mkisofs= GPLv2 LICENSE.libparanoia= LGPL21 LICENSE.cpp= BSD3CLAUSE LICENSE.libmdigest= BSD2CLAUSE LICENSE.libfile= BSD2CLAUSE LICENSE.patch= BSD1CLAUSE LICENSE.lndir= MIT LICENSE_COMB= ${${LICENSE:[#]}>1:?multi:single} LICENSE_FILE_CDDL= ${WRKSRC}/CDDL.Schily.txt LICENSE_FILE_GPLv2= ${WRKSRC}/GPL-2.0.txt LICENSE_FILE_LGPL21= ${WRKSRC}/LGPL-2.1.txt LICENSE_FILE_BSD1CLAUSE= ${WRKSRC}/patch/LICENSE LICENSE_NAME_BSD1CLAUSE= BSD 1-clause LICENSE LICENSE_PERMS_BSD1CLAUSE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept # schilybase has all the libraries .if ${PORTNAME} != "schilybase" -BUILD_DEPENDS+= schilybase=${PORTVERSION}:devel/schilybase -RUN_DEPENDS+= schilybase=${PORTVERSION}:devel/schilybase +BUILD_DEPENDS+= schilybase=${PORTVERSION}_${PORTREVISION}:devel/schilybase +RUN_DEPENDS+= schilybase=${PORTVERSION}_${PORTREVISION}:devel/schilybase .endif .if "${BOOTSTRAP_SMAKE}" != "yes" BUILD_DEPENDS+= smake:devel/smake .endif USES+= tar:bz2 compiler gettext-runtime iconv MAKE_ARGS= INS_BASE=${PREFIX} \ INS_RBASE=${PREFIX} \ LINKMODE=dynamic \ DESTDIR=${STAGEDIR} \ STRIPFLAGS=${WITH_DEBUG:D:U-s} \ CCOM=${COMPILER_TYPE} \ CC=${CC} \ CCC=${CXX} \ COPTX="${CFLAGS}" \ C++OPTX="${CXXFLAGS}" \ NOECHO= MAKE_CMD= ${"${BOOTSTRAP_SMAKE}" == "yes":?${WRKSRC}/psmake/smake:smake} PLIST_SUB+= OPSYS=${OPSYS:tl} ARCH=${ARCH} COMPILER_TYPE=${COMPILER_TYPE} PLIST= ${.CURDIR}/pkg-plist PKGMESSAGE?= ${.CURDIR}/pkg-message DESCR= ${.CURDIR}/pkg-descr post-extract: - cd ${WRKSRC}/rmt && ${MV} rmt.dfl srmt.dfl - cd ${WRKSRC}/rmt && ${MV} default-rmt.sample default-srmt.sample + @cd ${WRKSRC}/rmt && ${MV} rmt.dfl srmt.dfl + @cd ${WRKSRC}/rmt && ${MV} default-rmt.sample default-srmt.sample do-configure: .if "${BOOTSTRAP_SMAKE}" == "yes" @${ECHO_MSG} "=> building a bootstrap smake" cd ${WRKSRC}/psmake && ${SETENV} ${MAKE_ENV} ${SH} ./MAKE-all .endif @${ECHO_MSG} "=> configuring components" for component in ${COMPONENTS} ; \ do \ cd ${WRKSRC}/$$component && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} config ; \ done do-build: for component in ${COMPONENTS} ; \ do \ cd ${WRKSRC}/$$component && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all ; \ done do-install: for component in ${COMPONENTS} ; \ do \ cd ${WRKSRC}/$$component && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install ; \ done [ -z "${COMPONENTS:Mlib*}" ] || ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*.* .include diff --git a/devel/schilybase/distinfo b/devel/schilybase/distinfo index e0f08fac1274..a0beb1668d27 100644 --- a/devel/schilybase/distinfo +++ b/devel/schilybase/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1627564925 -SHA256 (schily-2021-07-29.tar.bz2) = 8c1ba399684d95fbbdd60856d306e895166e81d0596fef7ef946f95acfc5ea66 -SIZE (schily-2021-07-29.tar.bz2) = 4927143 +TIMESTAMP = 1629365867 +SHA256 (schily-2021-08-14.tar.bz2) = fb4e4c0ca534aa28127f7e7556c9017e059f4c7b93f6bfc33965f28091230f10 +SIZE (schily-2021-08-14.tar.bz2) = 4942864 diff --git a/sysutils/schilyutils/Makefile b/sysutils/schilyutils/Makefile index bbf2c02804af..c2627bffd0ad 100644 --- a/sysutils/schilyutils/Makefile +++ b/sysutils/schilyutils/Makefile @@ -1,55 +1,53 @@ PORTNAME= schilyutils CATEGORIES= sysutils converters deskutils textproc shells COMMENT= Collection of utilities from J. Schilling -RUN_DEPENDS= schilybase=${PORTVERSION}:devel/schilybase - USES+= perl5 shebangfix USE_PERL5= run SHEBANG_FILES= man2html/man2html cstyle/cstyle.pl CONFLICTS_INSTALL= bsh MASTERDIR= ${.CURDIR}/../../devel/schilybase COMPONENTS= bsh \ btcflash \ cal \ calc \ calltree \ change \ compare \ copy \ count \ cpp \ cstyle \ cut \ fifo \ label \ hdump \ lndir \ match \ mdigest \ obosh \ p \ paste \ patch \ pbosh \ printf \ sdd \ sfind \ sformat \ sgrow \ sh \ termcap \ translit \ udiff # these files are installed by the patch target, # but they belong to devel/sccs. post-install: ${RM} ${STAGEDIR}${PREFIX}/ccs/bin/sccspatch cd ${STAGEDIR}${PREFIX} && ${RMDIR} -p ccs/bin ${RM} ${STAGEDIR}${PREFIX}/share/man/man1/sccspatch.1 .include "${MASTERDIR}/Makefile.master"