mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
Restore DONT_ADD_FROM, it allows .elm/elmheaders to work properly
Merge Configure patch into one file
This commit is contained in:
parent
124e917bbc
commit
1ef49cdd81
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=2740
@ -1,8 +1,11 @@
|
||||
*** Configure.bak Sun Nov 19 23:26:43 1995
|
||||
--- Configure Sun Nov 19 23:29:18 1995
|
||||
*** Configure.old Thu Feb 22 22:56:56 1996
|
||||
--- Configure Thu Feb 22 22:58:51 1996
|
||||
***************
|
||||
*** 18,28 ****
|
||||
PATH=".:/bin:/usr/bin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin:$PATH"
|
||||
*** 15,28 ****
|
||||
# working with this copy of Configure, you may wish to get metaconfig.)
|
||||
|
||||
: sanity checks
|
||||
! PATH=".:/bin:/usr/bin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin:$PATH"
|
||||
export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0; kill $$)
|
||||
|
||||
- if test ! -t 0; then
|
||||
@ -13,4 +16,47 @@
|
||||
(alias) >/dev/null 2>&1 && \
|
||||
echo "(I see you are using the Korn shell. Some ksh's blow up on Configure," && \
|
||||
echo "especially on exotic machines. If yours does, try the Bourne shell instead.)"
|
||||
--- 18,23 ----
|
||||
--- 15,23 ----
|
||||
# working with this copy of Configure, you may wish to get metaconfig.)
|
||||
|
||||
: sanity checks
|
||||
! PATH=".:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin:$PATH"
|
||||
export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0; kill $$)
|
||||
|
||||
(alias) >/dev/null 2>&1 && \
|
||||
echo "(I see you are using the Korn shell. Some ksh's blow up on Configure," && \
|
||||
echo "especially on exotic machines. If yours does, try the Bourne shell instead.)"
|
||||
***************
|
||||
*** 2473,2478 ****
|
||||
--- 2468,2475 ----
|
||||
lock_dir=/usr/spool/locks
|
||||
elif $test -d /usr/spool/uucp ; then
|
||||
lock_dir=/usr/spool/uucp
|
||||
+ elif $test -d /var/spool/lock ; then
|
||||
+ lock_dir=/var/spool/lock
|
||||
elif $test -d /var/spool/locks ; then
|
||||
lock_dir=/var/spool/locks
|
||||
elif $test -d /var/spool/uucp ; then
|
||||
***************
|
||||
*** 3310,3319 ****
|
||||
$cat <<EOM
|
||||
|
||||
The Character Set which your terminals support. You could set this
|
||||
! to one of the ISO-8859 charsets, even if you set the default for
|
||||
! the Text Messages to US-ASCII, as the ISO-8859 charsets could display
|
||||
! US-ASCII as well. For a X-Windows environment, ISO-8859-1 would be
|
||||
! a convenient value.
|
||||
|
||||
EOM
|
||||
rp="Default Character Set which could be displayed [$dflt]"
|
||||
--- 3307,3316 ----
|
||||
$cat <<EOM
|
||||
|
||||
The Character Set which your terminals support. You could set this
|
||||
! to one of the ISO-8859 charsets or KOI8-R charset, even if you set
|
||||
! the default for the Text Messages to US-ASCII, as the ISO-8859 and
|
||||
! KOI8-R charsets could display US-ASCII as well. For a X-Windows
|
||||
! environment, ISO-8859-1 would be a convenient value.
|
||||
|
||||
EOM
|
||||
rp="Default Character Set which could be displayed [$dflt]"
|
||||
|
Loading…
Reference in New Issue
Block a user