Fix DISTNAME/PKGNAME. Ensure on-null name/faxnum at run time.

This commit is contained in:
ian 1998-09-13 01:48:17 +00:00
parent 0aad802867
commit 6d4237d8aa
2 changed files with 76 additions and 78 deletions

View File

@ -3,16 +3,17 @@
# Date created: 27 Aug 1998
# Whom: ian
#
# $OpenBSD: Makefile,v 1.1 1998/09/06 22:39:51 ian Exp $
# $OpenBSD: Makefile,v 1.2 1998/09/13 01:48:17 ian Exp $
DISTNAME= efax08a
PKGNAME= efax-0.8a
CATEGORIES= comm
MASTER_SITES= ftp://sunsite.unc.edu/pub/Linux/apps/serialcomm/fax/
MAINTAINER= ian@OpenBSD.ORG
IS_INTERACTIVE= yes # for reasons shown in per-install!
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\

View File

@ -1,76 +1,73 @@
*** fax.orig Mon Aug 26 03:41:29 1996
--- fax Sat Sep 5 14:46:00 1998
***************
*** 22,34 ****
# /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
# The type of fax modem commands to use. Un-comment one of the
# following lines depending on your modem.
! # CLASS=1
! CLASS=2
# CLASS=2.0
# Your fax number in international format, 20 characters maximum.
--- 22,34 ----
# /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
# The type of fax modem commands to use. Un-comment one of the
# following lines depending on your modem.
! CLASS=1
! # CLASS=2
# CLASS=2.0
# Your fax number in international format, 20 characters maximum.
***************
*** 50,57 ****
# The type of printer. Use 'pcl' for HP-PCL or 'ps' for
# Postscript. See definition of PRINT (below) for more options.
! PRTYPE=pcl # HP-PCL (e.g. HP LaserJet)
! # PRTYPE=ps # Postscript (e.g. Apple LaserWriter)
# The command to print image files from standard input. Typically
# this is "lpr" or "lp".
--- 50,57 ----
# The type of printer. Use 'pcl' for HP-PCL or 'ps' for
# Postscript. See definition of PRINT (below) for more options.
! # PRTYPE=pcl # HP-PCL (e.g. HP LaserJet)
! PRTYPE=ps # Postscript (e.g. Apple LaserWriter)
# The command to print image files from standard input. Typically
# this is "lpr" or "lp".
***************
*** 82,92 ****
# conventions. Protect with single quotes for delayed evaluation.
# Add a leading '#' to the file name to use HDB (ASCII) format.
! LOCK='-x /usr/spool/uucp/LCK..$DEV' # "normal" systems
# LOCK='' # no lock file
# LOCK='-x /usr/spool/locks/LK.047.040.011' # SysV style names
# LOCK='-x #/usr/spool/uucp/LCK..$DEV' # HDB format (ASCII pid)
# LOCK='-x /usr/spool/uucp/LCK/LCK..$DEV' # NeXT
# Uncomment one of the following lines to force xon/xoff flow
# control if you have one of the types of modems listed.
--- 82,93 ----
# conventions. Protect with single quotes for delayed evaluation.
# Add a leading '#' to the file name to use HDB (ASCII) format.
! # LOCK='-x /usr/spool/uucp/LCK..$DEV' # "normal" systems
# LOCK='' # no lock file
# LOCK='-x /usr/spool/locks/LK.047.040.011' # SysV style names
# LOCK='-x #/usr/spool/uucp/LCK..$DEV' # HDB format (ASCII pid)
# LOCK='-x /usr/spool/uucp/LCK/LCK..$DEV' # NeXT
+ LOCK="-x /var/spool/lock/LCK..$DEV" # OpenBSD cu et al
# Uncomment one of the following lines to force xon/xoff flow
# control if you have one of the types of modems listed.
--- fax.orig Mon Aug 26 03:41:29 1996
+++ fax Sat Sep 12 19:47:12 1998
@@ -22,23 +22,23 @@
# /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
# The type of fax modem commands to use. Un-comment one of the
# following lines depending on your modem.
-# CLASS=1
-CLASS=2
+CLASS=1
+# CLASS=2
# CLASS=2.0
# Your fax number in international format, 20 characters maximum.
# Use only digits, spaces, and the "+" character.
-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".
@@ -50,8 +50,8 @@
# The type of printer. Use 'pcl' for HP-PCL or 'ps' for
# Postscript. See definition of PRINT (below) for more options.
-PRTYPE=pcl # HP-PCL (e.g. HP LaserJet)
-# PRTYPE=ps # Postscript (e.g. Apple LaserWriter)
+# PRTYPE=pcl # HP-PCL (e.g. HP LaserJet)
+PRTYPE=ps # Postscript (e.g. Apple LaserWriter)
# The command to print image files from standard input. Typically
# this is "lpr" or "lp".
@@ -82,11 +82,12 @@
# conventions. Protect with single quotes for delayed evaluation.
# Add a leading '#' to the file name to use HDB (ASCII) format.
-LOCK='-x /usr/spool/uucp/LCK..$DEV' # "normal" systems
+# LOCK='-x /usr/spool/uucp/LCK..$DEV' # "normal" systems
# LOCK='' # no lock file
# LOCK='-x /usr/spool/locks/LK.047.040.011' # SysV style names
# LOCK='-x #/usr/spool/uucp/LCK..$DEV' # HDB format (ASCII pid)
# LOCK='-x /usr/spool/uucp/LCK/LCK..$DEV' # NeXT
+LOCK="-x /var/spool/lock/LCK..$DEV" # OpenBSD cu et al
# Uncomment one of the following lines to force xon/xoff flow
# control if you have one of the types of modems listed.
@@ -99,6 +100,16 @@
# ****************************************************************
# 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