Upgrade 8a -> 8b

Make it non-interactive
Make it packageable (compiled-in domain name not plays any role due
to gethostname())
This commit is contained in:
Andrey A. Chernov 1995-11-19 21:11:57 +00:00
parent d36d2410ee
commit e04697b295
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=2434
9 changed files with 47 additions and 102 deletions

View File

@ -1,14 +1,14 @@
# New ports collection makefile for: elm
# Version required: 2.4 ME8a
# Version required: 2.4 ME8b
# Date created: 26 June 1995
# Whom: ache
#
# $Id: Makefile,v 1.6 1995/09/28 16:41:41 ache Exp $
# $Id: Makefile,v 1.7 1995/10/20 07:35:26 asami Exp $
#
DISTNAME= elm-2.4pl24me8
PKGNAME= elm-2.4m8a
PATCHFILES= elm-2.4pl24me8a.diffs.Z
PKGNAME= elm-2.4m8b
PATCHFILES= elm-2.4pl24me8a.diffs.Z elm-2.4pl24me8b.diffs.Z
PATCH_DIST_STRIP= -p1
CATEGORIES+= mail
MASTER_SITES= ftp://cs.hmc.edu/pub/me/
@ -16,8 +16,8 @@ PATCH_SITES= ${MASTER_SITES}
MAINTAINER= ache@FreeBSD.ORG
IS_INTERACTIVE= yes
NO_PACKAGE= yes # domain name compiled in
pre-patch:
rm -f ${WRKSRC}/src/state.c
post-install:
cd ${WRKSRC}/nls; ${MAKE} install

View File

@ -1,2 +1,3 @@
MD5 (elm-2.4pl24me8.tar.gz) = 5419a3de3b9d8e69ea52c47c617a6a9c
MD5 (elm-2.4pl24me8a.diffs.Z) = 6be90830bd929cab64e14c5aa7ca97cf
MD5 (elm-2.4pl24me8b.diffs.Z) = 44505894d67d10a825fa87438aa0d79a

View File

@ -1,19 +1,16 @@
*** src/menu2.c.bak Mon Aug 28 06:10:02 1995
--- src/menu2.c Sun Sep 24 21:18:52 1995
*** Configure.bak Sun Nov 19 23:26:43 1995
--- Configure Sun Nov 19 23:29:18 1995
***************
*** 93,99 ****
default:
for (i = 0; i < max ; i++) {
if (ch == items[i].key) {
! do_item (items[i]);
update = TRUE;
break;
}
--- 93,99 ----
default:
for (i = 0; i < max ; i++) {
if (ch == items[i].key) {
! do_item (&items[i]);
update = TRUE;
break;
}
*** 18,28 ****
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
- echo "Say 'sh Configure', not 'sh <Configure'"
- exit 1
- fi
-
(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 ----

View File

@ -1 +1 @@
ELM Mail User Agent, v2.4pl24 ME8a
ELM Mail User Agent, v2.4pl24 ME8b

View File

@ -1,41 +1,12 @@
#!/bin/sh -
#
# pre-configure script for Elm port to FreeBSD 2.0
# $Id: pre-configure,v 1.4 1995/09/23 21:06:06 ache Exp $
# $Id: pre-configure,v 1.3 1995/09/28 16:41:56 ache Exp $
PortsDir=$PORTSDIR
CurDir=$CURDIR
WrkSrc=$WRKSRC
echo ""
echo "Elm comes with a Configure script to help you setting things up."
echo "Unfortunately, this script asks for things (like locking style)"
echo "which can be misleading."
echo "I (the porter) tried and configure a general Elm (without MIME"
echo "support), hopefully suitable for most systems."
echo "Please note that if you will run Elm on a system with NFSmounted"
echo "mailboxes you need to enable dot locking (see below)".
echo ""
echo ""
echo "You now have two possible choices:"
echo ""
echo " 1) use my configuration as default, run Configure on top of it."
echo " 2) run Configure from scratch."
echo ""
echo "Due to a check done iside the Elm Configure script, I cannot run"
echo "it automagically. If you want to pick up the default configura-"
echo "tion, simply press ENTER each time the script asks you anything."
echo ""
echo -n "Your choice [1]: "
read foo
if [ ! ${foo} ] ; then
foo=1
fi
if [ ${foo} -eq 1 ] ; then
#DON'T ALTER INDENTATION
cat > ${WrkSrc}/config.sh << 'EOF'
#!/bin/sh
# config.sh
@ -102,6 +73,7 @@ cpp
date
emacs
execmail
finger
ispell
line
lint
@ -213,8 +185,9 @@ d_usenls='undef'
d_mallocvoid='define'
d_mboxedit='undef'
d_mime='undef'
defencoding='7bit'
defencoding=''
d_8bitmime='undef'
d_binarymime='undef'
defcharset='US-ASCII'
defdispcharset='US-ASCII'
d_mmdf='undef'
@ -274,7 +247,7 @@ i_unistd='define'
i_utime='define'
i_sysutime='undef'
lib='/usr/local/lib'
libc='/usr/lib/libc.so.2.1'
libc='/usr/lib/libc.so.2.2'
linepr='/usr/bin/lp'
maildir='/var/mail'
mailer='/usr/sbin/sendmail'
@ -325,13 +298,13 @@ d_pgp='define'
pgp='/usr/local/bin/pgp'
pgp_path='/usr/local/bin/pgp'
d_remailer='define'
finger='/usr/bin/finger'
finger_path='/usr/bin/finger'
CONFIG=true
EOF
fi # choice = 1
cd ${WrkSrc}
sh Configure
yes "" | ./Configure
cd ${CurDir}
exit 0

View File

@ -1,14 +1,14 @@
# New ports collection makefile for: elm
# Version required: 2.4 ME8a
# Version required: 2.4 ME8b
# Date created: 26 June 1995
# Whom: ache
#
# $Id: Makefile,v 1.6 1995/09/28 16:41:41 ache Exp $
# $Id: Makefile,v 1.7 1995/10/20 07:35:26 asami Exp $
#
DISTNAME= elm-2.4pl24me8
PKGNAME= elm-2.4m8a
PATCHFILES= elm-2.4pl24me8a.diffs.Z
PKGNAME= elm-2.4m8b
PATCHFILES= elm-2.4pl24me8a.diffs.Z elm-2.4pl24me8b.diffs.Z
PATCH_DIST_STRIP= -p1
CATEGORIES+= mail
MASTER_SITES= ftp://cs.hmc.edu/pub/me/
@ -16,8 +16,8 @@ PATCH_SITES= ${MASTER_SITES}
MAINTAINER= ache@FreeBSD.ORG
IS_INTERACTIVE= yes
NO_PACKAGE= yes # domain name compiled in
pre-patch:
rm -f ${WRKSRC}/src/state.c
post-install:
cd ${WRKSRC}/nls; ${MAKE} install

View File

@ -1,2 +1,3 @@
MD5 (elm-2.4pl24me8.tar.gz) = 5419a3de3b9d8e69ea52c47c617a6a9c
MD5 (elm-2.4pl24me8a.diffs.Z) = 6be90830bd929cab64e14c5aa7ca97cf
MD5 (elm-2.4pl24me8b.diffs.Z) = 44505894d67d10a825fa87438aa0d79a

View File

@ -1 +1 @@
ELM Mail User Agent, v2.4pl24 ME8a
ELM Mail User Agent, v2.4pl24 ME8b

View File

@ -1,41 +1,12 @@
#!/bin/sh -
#
# pre-configure script for Elm port to FreeBSD 2.0
# $Id: pre-configure,v 1.4 1995/09/23 21:06:06 ache Exp $
# $Id: pre-configure,v 1.3 1995/09/28 16:41:56 ache Exp $
PortsDir=$PORTSDIR
CurDir=$CURDIR
WrkSrc=$WRKSRC
echo ""
echo "Elm comes with a Configure script to help you setting things up."
echo "Unfortunately, this script asks for things (like locking style)"
echo "which can be misleading."
echo "I (the porter) tried and configure a general Elm (without MIME"
echo "support), hopefully suitable for most systems."
echo "Please note that if you will run Elm on a system with NFSmounted"
echo "mailboxes you need to enable dot locking (see below)".
echo ""
echo ""
echo "You now have two possible choices:"
echo ""
echo " 1) use my configuration as default, run Configure on top of it."
echo " 2) run Configure from scratch."
echo ""
echo "Due to a check done iside the Elm Configure script, I cannot run"
echo "it automagically. If you want to pick up the default configura-"
echo "tion, simply press ENTER each time the script asks you anything."
echo ""
echo -n "Your choice [1]: "
read foo
if [ ! ${foo} ] ; then
foo=1
fi
if [ ${foo} -eq 1 ] ; then
#DON'T ALTER INDENTATION
cat > ${WrkSrc}/config.sh << 'EOF'
#!/bin/sh
# config.sh
@ -102,6 +73,7 @@ cpp
date
emacs
execmail
finger
ispell
line
lint
@ -213,8 +185,9 @@ d_usenls='undef'
d_mallocvoid='define'
d_mboxedit='undef'
d_mime='undef'
defencoding='7bit'
defencoding=''
d_8bitmime='undef'
d_binarymime='undef'
defcharset='US-ASCII'
defdispcharset='US-ASCII'
d_mmdf='undef'
@ -274,7 +247,7 @@ i_unistd='define'
i_utime='define'
i_sysutime='undef'
lib='/usr/local/lib'
libc='/usr/lib/libc.so.2.1'
libc='/usr/lib/libc.so.2.2'
linepr='/usr/bin/lp'
maildir='/var/mail'
mailer='/usr/sbin/sendmail'
@ -325,13 +298,13 @@ d_pgp='define'
pgp='/usr/local/bin/pgp'
pgp_path='/usr/local/bin/pgp'
d_remailer='define'
finger='/usr/bin/finger'
finger_path='/usr/bin/finger'
CONFIG=true
EOF
fi # choice = 1
cd ${WrkSrc}
sh Configure
yes "" | ./Configure
cd ${CurDir}
exit 0