git: 078db1f62fa8 - 2021Q3 - misc/schilytools: Do not install broken gnutar by default

Juraj Lutter otis at FreeBSD.org
Thu Aug 5 18:57:15 UTC 2021 

The branch 2021Q3 has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=078db1f62fa8de558815f82e813ff919a8f90fda

commit 078db1f62fa8de558815f82e813ff919a8f90fda
Author:     Robert Clausecker <fuz at fuz.su>
AuthorDate: 2021-08-05 18:51:58 +0000
Commit:     Juraj Lutter <otis at FreeBSD.org>
CommitDate: 2021-08-05 18:56:38 +0000

    misc/schilytools: Do not install broken gnutar by default
    
    - Do not install broken gnutar by default
    
    This is a direct commit to 2021Q3 based on a commit
    774298c0f68f7b5f67dbde44d046184807423450 in main.
    
    Reported by:    ice at extreme.hu
    PR:             257063
---
 archivers/star/Makefile                     |  9 ++++-----
 archivers/star/pkg-plist                    | 13 ++-----------
 devel/schilybase/Makefile.master            | 21 +++++++++++----------
 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               |  4 ++--
 12 files changed, 40 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..abda16a49ad6 100644
--- a/devel/schilybase/Makefile.master
+++ b/devel/schilybase/Makefile.master
@@ -1,4 +1,5 @@
 DISTVERSION=	2021-06-07
+PORTREVISION=	1
 MASTER_SITES=	SF/schilytools
 DISTNAME=	schily-${DISTVERSION}
 
@@ -25,11 +26,11 @@ 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:tl}" != "yes"
+.if "${BOOTSTRAP_SMAKE}" != "yes"
 BUILD_DEPENDS+=	smake:devel/smake
 .endif
 
@@ -48,22 +49,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/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..c2627bffd0ad 100644
--- a/sysutils/schilyutils/Makefile
+++ b/sysutils/schilyutils/Makefile
@@ -3,12 +3,12 @@ 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 \

More information about the dev-commits-ports-branches mailing list