FreeBSD Bugzilla – Attachment 226799 Details for
Bug 257063
archivers/star: Do not install 'gnutar' for it is broken
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
devel/schilybase: fix PR #257063 (2021Q3)
0001-devel-schilybase-fix-PR-257063.patch (text/plain), 9.27 KB, created by
Robert Clausecker
on 2021-07-30 15:20:29 UTC
(
hide
)
Description:
devel/schilybase: fix PR #257063 (2021Q3)
Filename:
MIME Type:
Creator:
Robert Clausecker
Created:
2021-07-30 15:20:29 UTC
Size:
9.27 KB
patch
obsolete
>From a2c7f3e8c2d44e15fad8813fcebf999974352ab0 Mon Sep 17 00:00:00 2001 >From: Robert Clausecker <fuz@fuz.su> >Date: Fri, 9 Jul 2021 11:17:22 +0200 >Subject: [PATCH] devel/schilybase: fix PR #257063 > >This commit fixes the following problems with the schilytools ports: > > - archivers/star: install gnutar binary conditional on GNUTAR option > (see PR #257063) > - net/rscsi: have pkg-message show the right PREFIX > - move README.rscsi from sysutils/cdrtools to this port > so the advice given in pkg-message is actually useful. > - devel/schilybase: improve build output > - devel/sunpromake: register conflicts with devel/dmake > - devel/schilybase: use ECHO_MSG instead of echo > - devel/schilybase: use %%OPSYS%% instead of hard-coding freebsd in pkg-plist > Perhaps this way the port can also be built on DragonFlyBSD. >--- > archivers/star/Makefile | 9 ++++----- > archivers/star/pkg-plist | 13 ++----------- > devel/schilybase/Makefile.master | 17 +++++++++-------- > 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 ++ > 12 files changed, 38 insertions(+), 34 deletions(-) > create mode 100644 devel/schilybase/files/pkg-message.rscsi.in > delete mode 100644 net/rscsi/pkg-message > >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..55ffeab3e682 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} > >@@ -29,7 +30,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 +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..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 \ >-- >2.32.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 257063
:
226785
|
226799
|
226820