cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- substitute SYSCONFDIR into DEINSTALL/INSTALL

Browse Source 
- fix 2 typos in patch-aa todo with DESTDIR usage
- ${SCREENRC} -> $CONFIG_FILE in INSTALL script
This commit is contained in:
brad 2000-08-25 03:30:01 +00:00
parent 551a52b028
commit 3749cca865
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/screen/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.26 2000/08/24 22:46:43 brad Exp $
# $OpenBSD: Makefile,v 1.27 2000/08/25 03:30:01 brad Exp $
VERSION= 3.9.5
DISTNAME= screen-${VERSION}
@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
SUBST_VARS= VERSION
SUBST_VARS= SYSCONFDIR VERSION
CONFIGURE_STYLE= gnu

6
misc/screen/patches/patch-aa
View File

@ -1,5 +1,5 @@
--- Makefile.in.orig Wed Sep 1 18:50:31 1999
+++ Makefile.in Thu Aug 24 18:37:40 2000
+++ Makefile.in Thu Aug 24 23:07:52 2000
@@ -7,6 +7,8 @@
srcdir = @srcdir@
VPATH = @srcdir@
@ -45,8 +45,8 @@
- -if [ -f $(bindir)/screen ] && [ ! -f $(bindir)/screen.old ]; then mv $(bindir)/screen $(bindir)/screen.old; fi
- rm -f $(bindir)/screen
- ln -s $(SCREEN) $(bindir)/screen
+ -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTIDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
+ rm -f $(DESTIDIR)$(bindir)/screen
+ -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
+ rm -f $(DESTDIR)$(bindir)/screen
+ cd $(DESTDIR)$(bindir) && ln -fs $(SCREEN) screen
###############################################################################

4
misc/screen/pkg/DEINSTALL
View File

@ -1,12 +1,12 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.3 2000/08/04 18:25:24 brad Exp $
# $OpenBSD: DEINSTALL,v 1.4 2000/08/25 03:30:02 brad Exp $
#
# screen de-installation
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_FILE=/etc/screenrc
CONFIG_FILE=${SYSCONFDIR}/screenrc
if [ -e $CONFIG_FILE ]; then
echo

6
misc/screen/pkg/INSTALL
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.3 2000/08/04 18:25:25 brad Exp $
# $OpenBSD: INSTALL,v 1.4 2000/08/25 03:30:02 brad Exp $
#
# Pre/post-installation setup of screen
@ -8,7 +8,7 @@
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_FILE=/etc/screenrc
CONFIG_FILE=${SYSCONFDIR}/screenrc
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/screen
do_notice()
@ -27,7 +27,7 @@ do_install()
install -o root -g wheel $SAMPLE_CONFIG_DIR/screenrc-sample $CONFIG_FILE
echo
echo "+---------------"
echo "| The file ${SCREENRC} has been created on your system."
echo "| The file $CONFIG_FILE has been created on your system."
echo "| You may want to verify/edit its contents"
}