Rip out stupid INTERACTIVE stuff from Makefile. Just bitch and die at
run time if they didn't read the (new improved) MESSAGE file when installing.
This commit is contained in:
parent
507be0a697
commit
374b657620
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.4 1999/08/19 20:52:28 downsj Exp $
|
||||
# $OpenBSD: Makefile,v 1.5 1999/10/29 00:37:56 ian Exp $
|
||||
|
||||
DISTNAME= efax-0.9
|
||||
PKGNAME= efax-0.9
|
||||
@ -8,20 +8,6 @@ MAINTAINER= ian@OpenBSD.ORG
|
||||
|
||||
MASTER_SITES= ftp://sunsite.unc.edu/pub/Linux/apps/serialcomm/fax/
|
||||
|
||||
IS_INTERACTIVE= yes # for reasons shown in pre-install!
|
||||
|
||||
pre-install:
|
||||
@echo "At this stage you MUST customize the \"fax\" script\n\
|
||||
slightly. In the following editor session, you must set the device\n\
|
||||
name (normally cua00 on a workstation, cua01 on a PC with a serial mouse).\n\
|
||||
You also MUST SET BY LAW in many jurisdictions your name and your\n\
|
||||
return FAX telephone number.\n\
|
||||
In short, check and set at least DEV, NAME and FROM, in addition to\n\
|
||||
any modem-specific settings required."
|
||||
@echo Press return to continue...
|
||||
@sh -c "read junk"
|
||||
vi ${WRKSRC}/fax
|
||||
|
||||
# the inner program, efax, must be setuid uucp, same as tip, cu, uucp,
|
||||
# so that it can open /dev/cua?? read/write.
|
||||
post-install:
|
||||
|
@ -1,74 +1,71 @@
|
||||
*** fax.orig Wed Mar 24 00:07:28 1999
|
||||
--- fax Thu Aug 19 13:41:12 1999
|
||||
***************
|
||||
*** 28,43 ****
|
||||
# /dev/modem is a link to /dev/cua1, then getty, uucp, kermit,
|
||||
# pppd, dip, etc. must *all* use either /dev/modem or /dev/cua1.
|
||||
|
||||
! DEV=cua1
|
||||
|
||||
# Your fax number in international format, 20 characters maximum.
|
||||
# Use only digits, spaces, and the "+" character.
|
||||
|
||||
! FROM="+1 800 555 5555"
|
||||
|
||||
# Your name as it should appear on the page header.
|
||||
|
||||
! NAME="Put Your Name Here"
|
||||
|
||||
# The preferred page size for creating and printing faxes.
|
||||
# Allowed values are "letter", "legal", and "a4".
|
||||
--- 28,43 ----
|
||||
# /dev/modem is a link to /dev/cua1, then getty, uucp, kermit,
|
||||
# pppd, dip, etc. must *all* use either /dev/modem or /dev/cua1.
|
||||
|
||||
! DEV=cua01
|
||||
|
||||
# Your fax number in international format, 20 characters maximum.
|
||||
# Use only digits, spaces, and the "+" character.
|
||||
|
||||
! FROM=""
|
||||
|
||||
# Your name as it should appear on the page header.
|
||||
|
||||
! NAME=""
|
||||
|
||||
# The preferred page size for creating and printing faxes.
|
||||
# Allowed values are "letter", "legal", and "a4".
|
||||
***************
|
||||
*** 81,87 ****
|
||||
# conventions. Protect with single quotes for delayed evaluation.
|
||||
# Add a leading '#' to the file name to use binary format.
|
||||
|
||||
! LOCK='-x /var/lock/LCK..$DEV' # modern systems
|
||||
# LOCK='-x /usr/spool/uucp/LCK..$DEV' # older systems
|
||||
# LOCK='-x /var/lock/LCK..$DEV -x /var/spool/uucp/LCK..$DEV' # both
|
||||
# LOCK='-x #/usr/spool/uucp/LCK..$DEV' # binary format
|
||||
--- 81,88 ----
|
||||
# conventions. Protect with single quotes for delayed evaluation.
|
||||
# Add a leading '#' to the file name to use binary format.
|
||||
|
||||
! LOCK="-x /var/spool/lock/LCK..$DEV" # OpenBSD cu et al
|
||||
! # LOCK='-x /var/lock/LCK..$DEV' # modern systems
|
||||
# LOCK='-x /usr/spool/uucp/LCK..$DEV' # older systems
|
||||
# LOCK='-x /var/lock/LCK..$DEV -x /var/spool/uucp/LCK..$DEV' # both
|
||||
# LOCK='-x #/usr/spool/uucp/LCK..$DEV' # binary format
|
||||
***************
|
||||
*** 100,105 ****
|
||||
--- 101,116 ----
|
||||
# ****************************************************************
|
||||
# The remaining options probably won't need to be changed.
|
||||
# ****************************************************************
|
||||
+
|
||||
+ # Test what user did
|
||||
+ case "$NAME" in
|
||||
+ "") echo "You have not configured $0 to set NAME=\"your name\"."
|
||||
+ exit 1;;
|
||||
+ esac
|
||||
+ case "$FROM" in
|
||||
+ "") echo "You have not configured $0 to set FROM=\"your faxnum\"."
|
||||
+ exit 1;;
|
||||
+ esac
|
||||
|
||||
# Configuration files that are sourced if they exist. Comment
|
||||
# out if you don't need to use config files. Warning: any type of
|
||||
--- fax.orig Wed Mar 24 08:07:28 1999
|
||||
+++ fax Thu Oct 28 17:55:36 1999
|
||||
@@ -28,16 +28,17 @@
|
||||
# /dev/modem is a link to /dev/cua1, then getty, uucp, kermit,
|
||||
# pppd, dip, etc. must *all* use either /dev/modem or /dev/cua1.
|
||||
|
||||
-DEV=cua1
|
||||
+DEV=cua01
|
||||
|
||||
# Your fax number in international format, 20 characters maximum.
|
||||
# Use only digits, spaces, and the "+" character.
|
||||
|
||||
-FROM="+1 800 555 5555"
|
||||
+#FROM="+1 800 555 5555"
|
||||
+FROM=""
|
||||
|
||||
# Your name as it should appear on the page header.
|
||||
|
||||
-NAME="Put Your Name Here"
|
||||
+NAME=""
|
||||
|
||||
# The preferred page size for creating and printing faxes.
|
||||
# Allowed values are "letter", "legal", and "a4".
|
||||
@@ -81,7 +82,8 @@
|
||||
# conventions. Protect with single quotes for delayed evaluation.
|
||||
# Add a leading '#' to the file name to use binary format.
|
||||
|
||||
-LOCK='-x /var/lock/LCK..$DEV' # modern systems
|
||||
+LOCK="-x /var/spool/lock/LCK..$DEV" # OpenBSD cu et al
|
||||
+# LOCK='-x /var/lock/LCK..$DEV' # modern systems
|
||||
# LOCK='-x /usr/spool/uucp/LCK..$DEV' # older systems
|
||||
# LOCK='-x /var/lock/LCK..$DEV -x /var/spool/uucp/LCK..$DEV' # both
|
||||
# LOCK='-x #/usr/spool/uucp/LCK..$DEV' # binary format
|
||||
@@ -98,9 +100,21 @@
|
||||
# FCINIT='-or' # Multi-Tech (for bit reversal)
|
||||
|
||||
# ****************************************************************
|
||||
+# Look for and run /etc/efaxrc and ~/.efaxrc, which contain
|
||||
+# settings in the same format.
|
||||
+# ****************************************************************
|
||||
+for f in /etc/efaxrc $HOME/.efaxrc
|
||||
+do
|
||||
+ if [ -f $f ]; then
|
||||
+ . $f
|
||||
+ fi
|
||||
+done
|
||||
+
|
||||
+# ****************************************************************
|
||||
# The remaining options probably won't need to be changed.
|
||||
# ****************************************************************
|
||||
|
||||
+
|
||||
# Configuration files that are sourced if they exist. Comment
|
||||
# out if you don't need to use config files. Warning: any type of
|
||||
# shell command in these files will be executed.
|
||||
@@ -413,6 +427,15 @@
|
||||
eval "`cat $f`"
|
||||
fi
|
||||
done
|
||||
+# --- Now that config files have been run, test what user did
|
||||
+case "$NAME" in
|
||||
+ "") echo "You have not configured $0 to set NAME=\"your name\"."
|
||||
+ exit 1;;
|
||||
+esac
|
||||
+case "$FROM" in
|
||||
+ "") echo "You have not configured $0 to set FROM=\"your faxnum\"."
|
||||
+ exit 1;;
|
||||
+esac
|
||||
|
||||
# --- set any variables given on command line
|
||||
|
||||
|
19
comms/efax/pkg/MESSAGE
Normal file
19
comms/efax/pkg/MESSAGE
Normal file
@ -0,0 +1,19 @@
|
||||
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
|
||||
|
||||
Before use, you MUST customize the "fax" script slightly. In
|
||||
particular, you must set the device name (normally cua00 on a
|
||||
workstation, cua01 on a PC with a serial mouse).
|
||||
|
||||
You also MUST SET BY LAW in many jurisdictions your name and your
|
||||
return FAX telephone number.
|
||||
|
||||
In short, please check and set at least DEV, NAME and FROM, in addition
|
||||
to any modem-specific settings required.
|
||||
|
||||
Instead of editing the fax script directly, you may wish to create
|
||||
one of the files named in CONFIGFILES (by default,
|
||||
CONFIGFILES="/etc/efax.rc ${HOME:-~}/.efaxrc ./.efaxrc") to obviate
|
||||
the need to change these settings should you reinstall future
|
||||
versions of this package.
|
||||
|
||||
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
|
Loading…
Reference in New Issue
Block a user