From c1e2668e515e377828aa3acced89e3c7ff31cf0d Mon Sep 17 00:00:00 2001 From: naddy Date: Fri, 8 Oct 2004 16:44:43 +0000 Subject: [PATCH] Kill INSTALL/DEINSTALL. Don't bother advertising srmt. Don't install a sample srmt.conf. Those very few people who want to play with this can figure it out on their own. --- archivers/star/Makefile | 7 +-- archivers/star/patches/patch-star_star_1 | 12 +++++ archivers/star/pkg/DEINSTALL | 66 ------------------------ archivers/star/pkg/INSTALL | 54 ------------------- archivers/star/pkg/PLIST | 4 +- 5 files changed, 18 insertions(+), 125 deletions(-) create mode 100644 archivers/star/patches/patch-star_star_1 delete mode 100644 archivers/star/pkg/DEINSTALL delete mode 100644 archivers/star/pkg/INSTALL diff --git a/archivers/star/Makefile b/archivers/star/Makefile index b09b4276471..60e089c6f2d 100644 --- a/archivers/star/Makefile +++ b/archivers/star/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2003/02/18 12:59:10 naddy Exp $ +# $OpenBSD: Makefile,v 1.14 2004/10/08 16:44:43 naddy Exp $ # $FreeBSD: Makefile,v 1.7 1998/12/24 13:15:23 dirk Exp $ COMMENT= "unique standard tape archiver with many enhancements" @@ -41,6 +41,8 @@ do-configure: OBJ= OBJ/${MACHINE}-openbsd-${CC} do-install: + perl -pi -e 's,%%SYSCONFDIR%%,${SYSCONFDIR},g' \ + ${WRKSRC}/star/star.1 ${WRKSRC}/rmt/rmt.1 .for prog in star tartest ${INSTALL_PROGRAM} ${WRKBUILD}/${prog}/${OBJ}/${prog} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${prog}/${prog}.1 ${PREFIX}/man/man1 @@ -49,11 +51,10 @@ do-install: cd ${PREFIX}/man/man1; ln -sf star.1 ustar.1 ${INSTALL_PROGRAM} ${WRKBUILD}/mt/${OBJ}/smt ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKBUILD}/rmt/${OBJ}/rmt ${PREFIX}/libexec/srmt - perl -pi -e 's,%%SYSCONFDIR%%,${SYSCONFDIR},g' ${WRKSRC}/rmt/rmt.1 ${INSTALL_MAN} ${WRKSRC}/rmt/rmt.1 ${PREFIX}/man/man8/srmt.8 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/star ${INSTALL_DATA} ${WRKSRC}/rmt/rmt.dfl \ - ${PREFIX}/share/examples/star/srmt.conf.sample + ${PREFIX}/share/examples/star/srmt.conf NO_REGRESS= Yes diff --git a/archivers/star/patches/patch-star_star_1 b/archivers/star/patches/patch-star_star_1 new file mode 100644 index 00000000000..767571933d2 --- /dev/null +++ b/archivers/star/patches/patch-star_star_1 @@ -0,0 +1,12 @@ +$OpenBSD: patch-star_star_1,v 1.4 2004/10/08 16:44:43 naddy Exp $ +--- star/star.1.orig Fri Oct 8 18:21:28 2004 ++++ star/star.1 Fri Oct 8 18:22:02 2004 +@@ -1051,7 +1051,7 @@ It is the only + .B rmt + server that gives platform independent compatibility with BSD, Sun and GNU + .B rmt +-clients and it includes security features that may be set up in /etc/default/rmt. ++clients and it includes security features that may be set up in %%SYSCONFDIR%%/srmt.conf. + All options that start with the + .B \-f + sequence are sensitive to typo problems, see BUGS section for more information. diff --git a/archivers/star/pkg/DEINSTALL b/archivers/star/pkg/DEINSTALL deleted file mode 100644 index 08aa64063b3..00000000000 --- a/archivers/star/pkg/DEINSTALL +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# $OpenBSD: DEINSTALL,v 1.3 2003/08/22 19:29:37 naddy Exp $ -# -# star de-installation - -set -e -PATH=/bin:/usr/bin:/sbin:/usr/sbin -PREFIX=${PKG_PREFIX:-/usr/local} -CONFIG_FILE=${SYSCONFDIR}/srmt.conf - -do_notice() -{ - echo - echo "+---------------" - echo "| To completely deinstall the $1 package you need to perform" - echo "| these steps as root:" - echo "|" - echo "| rm -f ${CONFIG_FILE}" - echo "|" - echo "| Do not do this if you plan on re-installing $1" - echo "| at some future time." - echo "+---------------" - echo -} - -do_unlink() -{ - if [ X`readlink /etc/rmt` = X${PREFIX}/libexec/srmt ]; then - rm -f /etc/rmt - echo - echo "+---------------" - echo "| You should reset the /etc/rmt link to whatever it was" - echo "| before star was installed, perhaps /usr/sbin/rmt" - echo "| Try these steps as root:" - echo "|" - echo "| cd /etc" - echo "| ln -s /usr/sbin/rmt ." - echo "|" - echo "+---------------" - echo - fi -} - -# Verify proper execution -# -if [ $# -ne 2 ]; then - echo "usage: $0 distname DEINSTALL" >&2 - exit 1 -fi - -# Verify/process the command -# -case $2 in - DEINSTALL) - if [ "$PKG_DELETE_EXTRA" != Yes -a -f ${CONFIG_FILE} ]; then - do_notice "$1" - fi - do_unlink "$1" - ;; - *) - echo "usage: $0 distname DEINSTALL" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/archivers/star/pkg/INSTALL b/archivers/star/pkg/INSTALL deleted file mode 100644 index f8a7273fdd5..00000000000 --- a/archivers/star/pkg/INSTALL +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# $OpenBSD: INSTALL,v 1.1 2001/05/06 21:52:46 naddy Exp $ -# -# Pre/post-installation setup of star - -# exit on errors, use a sane path and install prefix -# -set -e -PATH=/bin:/usr/bin:/sbin:/usr/sbin -PREFIX=${PKG_PREFIX:-/usr/local} - -# Function: tell the user what s/he needs to do to use the port just installed -# -do_notice() -{ - echo - echo "+---------------" - echo "| You might want to setup a link to /etc/rmt by issuing the command:" - echo "|" - echo "| ln -sf ${PREFIX}/libexec/srmt /etc/rmt" - echo "|" - echo "| If so, you should try to remember to reset that link" - echo "| to its former value if you ever pkg_delete this package." - echo "| It is NOT necessary to do this to use star." - echo "|" - echo "| If you use srmt, you want to set up ${SYSCONFDIR}/srmt.conf," - echo "| cf. $PREFIX/share/examples/star/srmt.conf.sample." - echo "+---------------" - echo -} - -# verify proper execution -# -if [ $# -ne 2 ]; then - echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 - exit 1 -fi - -# Verify/process the command -# -case $2 in - PRE-INSTALL) - : nothing to pre-install for this port - ;; - POST-INSTALL) - do_notice $1 - ;; - *) - echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/archivers/star/pkg/PLIST b/archivers/star/pkg/PLIST index 819d63325c7..5c94df99ca9 100644 --- a/archivers/star/pkg/PLIST +++ b/archivers/star/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2004/08/03 11:30:02 espie Exp $ +@comment $OpenBSD: PLIST,v 1.8 2004/10/08 16:44:43 naddy Exp $ bin/smt bin/star bin/tartest @@ -9,6 +9,6 @@ libexec/srmt @man man/man1/ustar.1 @man man/man8/srmt.8 share/examples/star/ -share/examples/star/srmt.conf.sample +share/examples/star/srmt.conf @cwd ${SYSCONFDIR} @extra srmt.conf