Date: Fri, 30 Jul 2021 13:27:22 GMT From: Juraj Lutter <otis@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 774298c0f68f - main - devel/schilybase: update to 2021.07.29 Message-ID: <202107301327.16UDRMs2071197@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=774298c0f68f7b5f67dbde44d046184807423450 commit 774298c0f68f7b5f67dbde44d046184807423450 Author: Robert Clausecker <fuz@fuz.su> AuthorDate: 2021-07-30 11:52:31 +0000 Commit: Juraj Lutter <otis@FreeBSD.org> CommitDate: 2021-07-30 13:26:47 +0000 devel/schilybase: update to 2021.07.29 - Update to 2021.07.29 - Fix related PR (Do not install broken gnutar by default) PR: 257063 Reported by: ice@extreme.hu --- archivers/star/Makefile | 9 ++++----- archivers/star/pkg-plist | 13 ++----------- devel/schilybase/Makefile.master | 18 +++++++++--------- devel/schilybase/distinfo | 6 +++--- devel/schilybase/files/pkg-message.rscsi.in | 5 +++++ devel/schilybase/pkg-plist | 6 +++--- devel/sunpromake/Makefile | 2 ++ net/rscsi/Makefile | 7 +++++++ net/rscsi/pkg-message | 6 ------ net/rscsi/pkg-plist | 1 + sysutils/cdrtools/Makefile | 3 +++ sysutils/cdrtools/pkg-plist | 1 - sysutils/schilyutils/Makefile | 2 ++ 13 files changed, 41 insertions(+), 38 deletions(-) diff --git a/archivers/star/Makefile b/archivers/star/Makefile index fda93701fe85..4819d27e71d4 100644 --- a/archivers/star/Makefile +++ b/archivers/star/Makefile @@ -3,8 +3,11 @@ CATEGORIES= archivers COMMENT= Unique standard tape archiver with many enhancements -OPTIONS_DEFINE+=DOCS TARTEST +PORTDOCS= README* STARvsGNUTAR + +OPTIONS_DEFINE+=DOCS GNUTAR TARTEST OPTIONS_SUB= yes +GNUTAR_DESC= Install a gnutar binary TARTEST_DESC= Install tartest and test scripts TARTEST_VARS= COMPONENTS+=tartest @@ -15,8 +18,4 @@ COMPONENTS= mt \ star_sym \ strar -post-install-DOCS-off: - ${RM} ${STAGEDIR}share/doc/star/README* - ${RM} ${STAGEDIR}share/doc/star/STARvsGNUTAR - .include "${MASTERDIR}/Makefile.master" diff --git a/archivers/star/pkg-plist b/archivers/star/pkg-plist index 24a2cb5de549..13412844490e 100644 --- a/archivers/star/pkg-plist +++ b/archivers/star/pkg-plist @@ -1,4 +1,4 @@ -bin/gnutar +%%GNUTAR%%bin/gnutar bin/scpio bin/smt bin/spax @@ -12,15 +12,6 @@ etc/default/srmt etc/default/star sbin/srmt share/doc/srmt/default-srmt.sample -%%PORTDOCS%%share/doc/star/README -%%PORTDOCS%%share/doc/star/README.ACL -%%PORTDOCS%%share/doc/star/README.crash -%%PORTDOCS%%share/doc/star/README.largefiles -%%PORTDOCS%%share/doc/star/README.mtio -%%PORTDOCS%%share/doc/star/README.otherbugs -%%PORTDOCS%%share/doc/star/README.pattern -%%PORTDOCS%%share/doc/star/README.posix-2001 -%%PORTDOCS%%share/doc/star/STARvsGNUTAR %%TARTEST%%share/doc/star/testscripts/00INDEX %%TARTEST%%share/doc/star/testscripts/100char_longlink.tar %%TARTEST%%share/doc/star/testscripts/100char_longlink.tar-non-compliant @@ -77,7 +68,7 @@ share/doc/srmt/default-srmt.sample %%TARTEST%%share/doc/star/testscripts/ustar-bad-signedsum.tar %%TARTEST%%share/doc/star/testscripts/ustar-big-2g.tar.bz2 %%TARTEST%%share/doc/star/testscripts/ustar-big-8g.tar.bz2 -share/man/man1/gnutar.1.gz +%%GNUTAR%%share/man/man1/gnutar.1.gz share/man/man1/srmt.1.gz share/man/man1/scpio.1.gz share/man/man1/smt.1.gz diff --git a/devel/schilybase/Makefile.master b/devel/schilybase/Makefile.master index 2cc18ccec56c..c182923db2c3 100644 --- a/devel/schilybase/Makefile.master +++ b/devel/schilybase/Makefile.master @@ -1,4 +1,4 @@ -DISTVERSION= 2021-06-07 +DISTVERSION= 2021-07-29 MASTER_SITES= SF/schilytools DISTNAME= schily-${DISTVERSION} @@ -29,7 +29,7 @@ BUILD_DEPENDS+= schilybase=${PORTVERSION}:devel/schilybase RUN_DEPENDS+= schilybase=${PORTVERSION}:devel/schilybase .endif -.if "${BOOTSTRAP_SMAKE:tl}" != "yes" +.if "${BOOTSTRAP_SMAKE}" != "yes" BUILD_DEPENDS+= smake:devel/smake .endif @@ -48,22 +48,22 @@ MAKE_ARGS= INS_BASE=${PREFIX} \ NOECHO= MAKE_CMD= ${"${BOOTSTRAP_SMAKE}" == "yes":?${WRKSRC}/psmake/smake:smake} -PLIST_SUB+= ARCH=${ARCH} COMPILER_TYPE=${COMPILER_TYPE} +PLIST_SUB+= OPSYS=${OPSYS:tl} ARCH=${ARCH} COMPILER_TYPE=${COMPILER_TYPE} PLIST= ${.CURDIR}/pkg-plist -PKGMESSAGE= ${.CURDIR}/pkg-message +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 -.if "${BOOTSTRAP_SMAKE:tl}" == "yes" -# build a bootstrap smake as MAKE_CMD -pre-configure: - cd ${WRKSRC}/psmake && ${SETENV} ${MAKE_ENV} ${SH} ./MAKE-all -.endif 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 && \ diff --git a/devel/schilybase/distinfo b/devel/schilybase/distinfo index c7981cecfe19..e0f08fac1274 100644 --- a/devel/schilybase/distinfo +++ b/devel/schilybase/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1623063845 -SHA256 (schily-2021-06-07.tar.bz2) = ca7ecb3b749d7579a65b61708828153ab8d4f0081b5e2171fc8b98d75cacce2d -SIZE (schily-2021-06-07.tar.bz2) = 4905609 +TIMESTAMP = 1627564925 +SHA256 (schily-2021-07-29.tar.bz2) = 8c1ba399684d95fbbdd60856d306e895166e81d0596fef7ef946f95acfc5ea66 +SIZE (schily-2021-07-29.tar.bz2) = 4927143 diff --git a/devel/schilybase/files/pkg-message.rscsi.in b/devel/schilybase/files/pkg-message.rscsi.in new file mode 100644 index 000000000000..4a7a7808338c --- /dev/null +++ b/devel/schilybase/files/pkg-message.rscsi.in @@ -0,0 +1,5 @@ +See %%PREFIX%%/share/doc/rscsi/README.rscsi for further information on +how to configure remote access to SCSI-devies via rscsi. + +Don't forget to add an entry for rshd(8) to /etc/inetd.conf in order to +be able to use the remote SCSI daemon. diff --git a/devel/schilybase/pkg-plist b/devel/schilybase/pkg-plist index fa78c84092b9..ac4eedaefe53 100644 --- a/devel/schilybase/pkg-plist +++ b/devel/schilybase/pkg-plist @@ -12,9 +12,9 @@ include/scg/scsitransp.h include/scg/spti-wnt.h include/scg/srb_os2.h include/schily/_regex.h -include/schily/%%ARCH%%-freebsd-%%COMPILER_TYPE%%/align.h -include/schily/%%ARCH%%-freebsd-%%COMPILER_TYPE%%/avoffset.h -include/schily/%%ARCH%%-freebsd-%%COMPILER_TYPE%%/xconfig.h +include/schily/%%ARCH%%-%%OPSYS%%-%%COMPILER_TYPE%%/align.h +include/schily/%%ARCH%%-%%OPSYS%%-%%COMPILER_TYPE%%/avoffset.h +include/schily/%%ARCH%%-%%OPSYS%%-%%COMPILER_TYPE%%/xconfig.h include/schily/align.h include/schily/alloca.h include/schily/archdefs.h diff --git a/devel/sunpromake/Makefile b/devel/sunpromake/Makefile index 45db77f2dea4..ce59606ceae7 100644 --- a/devel/sunpromake/Makefile +++ b/devel/sunpromake/Makefile @@ -5,6 +5,8 @@ COMMENT= Parallel-execution enabled SunOS make program, enhanced to fit POSIX USE_LDCONFIG= yes +CONFLICTS= dmake + MASTERDIR= ${.CURDIR}/../../devel/schilybase COMPONENTS= sunpro diff --git a/net/rscsi/Makefile b/net/rscsi/Makefile index b431918178e7..c4aebccbac21 100644 --- a/net/rscsi/Makefile +++ b/net/rscsi/Makefile @@ -11,4 +11,11 @@ GROUPS= rscsi MASTERDIR= ${.CURDIR}/../../devel/schilybase COMPONENTS= rscsi +SUB_FILES= pkg-message.rscsi +PKGMESSAGE= ${WRKDIR}/pkg-message.rscsi + +post-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/cdrecord/README.rscsi ${STAGEDIR}${DOCSDIR}/ + .include "${MASTERDIR}/Makefile.master" diff --git a/net/rscsi/pkg-message b/net/rscsi/pkg-message deleted file mode 100644 index 52b00f3a8070..000000000000 --- a/net/rscsi/pkg-message +++ /dev/null @@ -1,6 +0,0 @@ -See /usr/local/share/doc/cdrtools/README.rscsi and /usr/local/etc/rscsi -for further information on how to configure remote access to SCSI-devies -via rscsi. - -Don't forget to add an entry for rshd(8) to /etc/inetd.conf in order to -be able to use the remote SCSI daemon. diff --git a/net/rscsi/pkg-plist b/net/rscsi/pkg-plist index ef2af9b37a80..655d30e05497 100644 --- a/net/rscsi/pkg-plist +++ b/net/rscsi/pkg-plist @@ -1,4 +1,5 @@ @(root,,4711) sbin/rscsi etc/default/rscsi share/man/man1/rscsi.1.gz +share/doc/rscsi/README.rscsi share/doc/rscsi/default-rscsi.sample diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index 8a8865e2c8b1..e6452a9fe052 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -26,6 +26,9 @@ COMPONENTS= cdda2wav \ scgcheck \ scgskeleton +post-install: + ${RM} ${STAGEDIR}${PREFIX}/share/doc/cdrecord/README.rscsi + post-install-LAME-off: ${RM} ${STAGEDIR}${PREFIX}/bin/cdda2mp3 ${STAGEDIR}${PREFIX}share/man/man1/cdda2mp3.1 diff --git a/sysutils/cdrtools/pkg-plist b/sysutils/cdrtools/pkg-plist index e1de36d2e7d7..fa2a8564f7cf 100644 --- a/sysutils/cdrtools/pkg-plist +++ b/sysutils/cdrtools/pkg-plist @@ -27,7 +27,6 @@ etc/default/cdrecord %%PORTDOCS%%share/doc/cdrecord/README.multi %%PORTDOCS%%share/doc/cdrecord/README.parallel %%PORTDOCS%%share/doc/cdrecord/README.raw -%%PORTDOCS%%share/doc/cdrecord/README.rscsi %%PORTDOCS%%share/doc/cdrecord/README.solaris-x86-ATAPI-DMA %%PORTDOCS%%share/doc/cdrecord/README.solaris-x86-ata-DMA %%PORTDOCS%%share/doc/cdrecord/README.sony diff --git a/sysutils/schilyutils/Makefile b/sysutils/schilyutils/Makefile index a1cea66410ca..bbf2c02804af 100644 --- a/sysutils/schilyutils/Makefile +++ b/sysutils/schilyutils/Makefile @@ -9,6 +9,8 @@ USES+= perl5 shebangfix USE_PERL5= run SHEBANG_FILES= man2html/man2html cstyle/cstyle.pl +CONFLICTS_INSTALL= bsh + MASTERDIR= ${.CURDIR}/../../devel/schilybase COMPONENTS= bsh \ btcflash \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107301327.16UDRMs2071197>