Upgrade to +29

8 files changed, 50 insertions, 54 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 6185148a7a63..195f78ea5676 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    elm
 # See also: http://www.ozone.fmi.fi/KEH/
-# Version required:     2.4.25.ME+28s
+# Version required:     2.4.25.ME+29
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.34 1996/12/19 04:19:30 ache Exp $
+# $Id: Makefile,v 1.35 1996/12/20 02:40:11 asami Exp $
 #
 
-DISTNAME=       elm-2.4ME+28s
+DISTNAME=       elm-2.4ME+29
 CATEGORIES=	mail
 MASTER_SITES=   ftp://dionysos.fmi.fi/KEH/ \
 		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
@@ -15,10 +15,15 @@ MASTER_SITES=   ftp://dionysos.fmi.fi/KEH/ \
 
 MAINTAINER=	ache@FreeBSD.ORG
 
-WRKSRC=         ${WRKDIR}/elm2.4.ME+.28s
-MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 filter.1 \
+WRKSRC=         ${WRKDIR}/elm2.4.ME+.29
+MAN1=           answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
 		listalias.1 messages.1 newalias.1 printmail.1 readmsg.1
 
+HAS_CONFIGURE=  Yes
+CONFIGURE_SCRIPT= Configure
+CONFIGURE_ENV+= PREFIX="${PREFIX}"
+CONFIGURE_ARGS+= -S
+
 post-install:
 	cd ${WRKSRC}/nls; ${MAKE} install
 	if [ -f ${PREFIX}/lib/elm.mimetypes ] ; then \
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 5da7f9a8696f..3ba6e68038bd 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1 +1 @@
-MD5 (elm-2.4ME+28s.tar.gz) = f94f7c15d31ca2933a5df7a103a6c77e
+MD5 (elm-2.4ME+29.tar.gz) = a8b28f45b682390d224d182859b649b1
diff --git a/mail/elm+ME/pkg-plist b/mail/elm+ME/pkg-plist
index b4bd78ae307a..cf040bfca293 100644
--- a/mail/elm+ME/pkg-plist
+++ b/mail/elm+ME/pkg-plist
@@ -3,7 +3,6 @@ bin/answer
 bin/checkalias
 bin/elmalias
 bin/fastmail
-bin/filter
 bin/frm
 @exec ln -f %D/%F %D/bin/nfrm
 bin/listalias
@@ -25,7 +24,6 @@ man/man1/checkalias.1.gz
 man/man1/elm.1.gz
 man/man1/elmalias.1.gz
 man/man1/fastmail.1.gz
-man/man1/filter.1.gz
 man/man1/frm.1
 @exec ln -f %D/%F %D/man/man1/nfrm.1.gz
 man/man1/listalias.1.gz
diff --git a/mail/elm+ME/scripts/pre-configure b/mail/elm+ME/scripts/pre-configure
index 11c7cdf0b94d..9d75e3fece6b 100644
--- a/mail/elm+ME/scripts/pre-configure
+++ b/mail/elm+ME/scripts/pre-configure
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	pre-configure script for Elm port to FreeBSD 2.0
-#	$Id: pre-configure,v 1.14 1996/10/25 00:31:11 ache Exp $
+#	$Id: pre-configure,v 1.15 1996/12/22 06:53:00 obrien Exp $
 
 PortsDir=$PORTSDIR
   CurDir=$CURDIR
@@ -14,7 +14,7 @@ PortsDir=$PORTSDIR
 
 Log='$Log'
 Header='$Header'
-bin="$PREFIX/bin"
+bin="${PREFIX}/bin"
 contains='grep'
 cppstdin='/usr/bin/cpp'
 cppminus=''
@@ -25,17 +25,16 @@ d_rename='define'
 d_symlink='define'
 d_whoami='undef'
 d_poll='undef'
+d_inttypes='undef'
+d_nointtypes='undef'
 n='-n'
 c=''
 orderlib='false'
 ranlib='/usr/bin/ranlib'
 package='elm2'
 pager='builtin++'
-prefshell='/bin/csh'
 startsh='#!/bin/sh'
-d_eunice='undef'
 define='define'
-eunicefix=':'
 loclist='
 cat
 chgrp
@@ -105,7 +104,7 @@ vi
 '
 test='/bin/test'
 inews=''
-ispell="$PREFIX/bin/ispell"
+ispell="${PREFIX}/bin/ispell"
 egrep=''
 more='/usr/bin/more'
 pg='pg'
@@ -149,7 +148,7 @@ compress='/usr/bin/compress'
 execmail=''
 libswanted='intl nls'
 noaddlib='yes'
-c_date='Thu Oct  3 22:44:56 MSD 1996'
+c_date='Mon Dec 23 07:44:59 MSK 1996'
 d_ascii='undef'
 d_broke_ctype='undef'
 d_calendar='define'
@@ -178,7 +177,7 @@ termlib='-ltermlib'
 d_index='undef'
 d_internet='define'
 d_ispell='define'
-ispell_path="$PREFIX/bin/ispell"
+ispell_path="${PREFIX}/bin/ispell"
 ispell_options=''
 d_locale='define'
 d_nl_types='define'
@@ -213,6 +212,7 @@ d_sigset='undef'
 d_sighold='undef'
 d_sigprocmask='define'
 d_sigblock='undef'
+d_waitpid='define'
 d_sigaction='define'
 d_strcspn='define'
 d_strspn='define'
@@ -250,14 +250,14 @@ d_systimekernel='undef'
 i_unistd='define'
 i_utime='define'
 i_sysutime='undef'
-lib="$PREFIX/lib"
+lib="${PREFIX}/lib"
 libc='/usr/lib/libc.so.3.0'
 linepr='/usr/bin/lp'
 maildir='/var/mail'
 mailer='/usr/sbin/sendmail'
 mailgrp='bin'
-mansrc="$PREFIX/man/man1"
-catmansrc="$PREFIX/man/cat1"
+mansrc="${PREFIX}/man/man1"
+catmansrc="${PREFIX}/man/cat1"
 manext='.1'
 manext_choice='.1'
 catmanext='.1'
@@ -273,7 +273,7 @@ small=''
 medium=''
 large=''
 huge=''
-optimize='-O2 -pipe'
+optimize="$CFLAGS"
 ccflags=''
 cppflags=''
 ldflags='-s'
@@ -299,19 +299,14 @@ xenlf=''
 d_xenix='undef'
 d_bsd='define'
 d_pgp='define'
-pgp="$PREFIX/bin/pgp"
-pgp_path="$PREFIX/bin/pgp"
+pgp="${PREFIX}/bin/pgp"
+pgp_path="${PREFIX}/bin/pgp"
 d_remailer='define'
 finger='/usr/bin/finger'
 finger_path='/usr/bin/finger'
 CONFIG=true
 EOF
 
-cd ${WrkSrc}
-# old way:
-# yes "" | ./Configure -d
-./Configure -S
-
 exit 0
 # END
 
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 6185148a7a63..195f78ea5676 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    elm
 # See also: http://www.ozone.fmi.fi/KEH/
-# Version required:     2.4.25.ME+28s
+# Version required:     2.4.25.ME+29
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.34 1996/12/19 04:19:30 ache Exp $
+# $Id: Makefile,v 1.35 1996/12/20 02:40:11 asami Exp $
 #
 
-DISTNAME=       elm-2.4ME+28s
+DISTNAME=       elm-2.4ME+29
 CATEGORIES=	mail
 MASTER_SITES=   ftp://dionysos.fmi.fi/KEH/ \
 		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
@@ -15,10 +15,15 @@ MASTER_SITES=   ftp://dionysos.fmi.fi/KEH/ \
 
 MAINTAINER=	ache@FreeBSD.ORG
 
-WRKSRC=         ${WRKDIR}/elm2.4.ME+.28s
-MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 filter.1 \
+WRKSRC=         ${WRKDIR}/elm2.4.ME+.29
+MAN1=           answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
 		listalias.1 messages.1 newalias.1 printmail.1 readmsg.1
 
+HAS_CONFIGURE=  Yes
+CONFIGURE_SCRIPT= Configure
+CONFIGURE_ENV+= PREFIX="${PREFIX}"
+CONFIGURE_ARGS+= -S
+
 post-install:
 	cd ${WRKSRC}/nls; ${MAKE} install
 	if [ -f ${PREFIX}/lib/elm.mimetypes ] ; then \
diff --git a/mail/elm/distinfo b/mail/elm/distinfo
index 5da7f9a8696f..3ba6e68038bd 100644
--- a/mail/elm/distinfo
+++ b/mail/elm/distinfo
@@ -1 +1 @@
-MD5 (elm-2.4ME+28s.tar.gz) = f94f7c15d31ca2933a5df7a103a6c77e
+MD5 (elm-2.4ME+29.tar.gz) = a8b28f45b682390d224d182859b649b1
diff --git a/mail/elm/pkg-plist b/mail/elm/pkg-plist
index b4bd78ae307a..cf040bfca293 100644
--- a/mail/elm/pkg-plist
+++ b/mail/elm/pkg-plist
@@ -3,7 +3,6 @@ bin/answer
 bin/checkalias
 bin/elmalias
 bin/fastmail
-bin/filter
 bin/frm
 @exec ln -f %D/%F %D/bin/nfrm
 bin/listalias
@@ -25,7 +24,6 @@ man/man1/checkalias.1.gz
 man/man1/elm.1.gz
 man/man1/elmalias.1.gz
 man/man1/fastmail.1.gz
-man/man1/filter.1.gz
 man/man1/frm.1
 @exec ln -f %D/%F %D/man/man1/nfrm.1.gz
 man/man1/listalias.1.gz
diff --git a/mail/elm/scripts/pre-configure b/mail/elm/scripts/pre-configure
index 11c7cdf0b94d..9d75e3fece6b 100644
--- a/mail/elm/scripts/pre-configure
+++ b/mail/elm/scripts/pre-configure
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	pre-configure script for Elm port to FreeBSD 2.0
-#	$Id: pre-configure,v 1.14 1996/10/25 00:31:11 ache Exp $
+#	$Id: pre-configure,v 1.15 1996/12/22 06:53:00 obrien Exp $
 
 PortsDir=$PORTSDIR
   CurDir=$CURDIR
@@ -14,7 +14,7 @@ PortsDir=$PORTSDIR
 
 Log='$Log'
 Header='$Header'
-bin="$PREFIX/bin"
+bin="${PREFIX}/bin"
 contains='grep'
 cppstdin='/usr/bin/cpp'
 cppminus=''
@@ -25,17 +25,16 @@ d_rename='define'
 d_symlink='define'
 d_whoami='undef'
 d_poll='undef'
+d_inttypes='undef'
+d_nointtypes='undef'
 n='-n'
 c=''
 orderlib='false'
 ranlib='/usr/bin/ranlib'
 package='elm2'
 pager='builtin++'
-prefshell='/bin/csh'
 startsh='#!/bin/sh'
-d_eunice='undef'
 define='define'
-eunicefix=':'
 loclist='
 cat
 chgrp
@@ -105,7 +104,7 @@ vi
 '
 test='/bin/test'
 inews=''
-ispell="$PREFIX/bin/ispell"
+ispell="${PREFIX}/bin/ispell"
 egrep=''
 more='/usr/bin/more'
 pg='pg'
@@ -149,7 +148,7 @@ compress='/usr/bin/compress'
 execmail=''
 libswanted='intl nls'
 noaddlib='yes'
-c_date='Thu Oct  3 22:44:56 MSD 1996'
+c_date='Mon Dec 23 07:44:59 MSK 1996'
 d_ascii='undef'
 d_broke_ctype='undef'
 d_calendar='define'
@@ -178,7 +177,7 @@ termlib='-ltermlib'
 d_index='undef'
 d_internet='define'
 d_ispell='define'
-ispell_path="$PREFIX/bin/ispell"
+ispell_path="${PREFIX}/bin/ispell"
 ispell_options=''
 d_locale='define'
 d_nl_types='define'
@@ -213,6 +212,7 @@ d_sigset='undef'
 d_sighold='undef'
 d_sigprocmask='define'
 d_sigblock='undef'
+d_waitpid='define'
 d_sigaction='define'
 d_strcspn='define'
 d_strspn='define'
@@ -250,14 +250,14 @@ d_systimekernel='undef'
 i_unistd='define'
 i_utime='define'
 i_sysutime='undef'
-lib="$PREFIX/lib"
+lib="${PREFIX}/lib"
 libc='/usr/lib/libc.so.3.0'
 linepr='/usr/bin/lp'
 maildir='/var/mail'
 mailer='/usr/sbin/sendmail'
 mailgrp='bin'
-mansrc="$PREFIX/man/man1"
-catmansrc="$PREFIX/man/cat1"
+mansrc="${PREFIX}/man/man1"
+catmansrc="${PREFIX}/man/cat1"
 manext='.1'
 manext_choice='.1'
 catmanext='.1'
@@ -273,7 +273,7 @@ small=''
 medium=''
 large=''
 huge=''
-optimize='-O2 -pipe'
+optimize="$CFLAGS"
 ccflags=''
 cppflags=''
 ldflags='-s'
@@ -299,19 +299,14 @@ xenlf=''
 d_xenix='undef'
 d_bsd='define'
 d_pgp='define'
-pgp="$PREFIX/bin/pgp"
-pgp_path="$PREFIX/bin/pgp"
+pgp="${PREFIX}/bin/pgp"
+pgp_path="${PREFIX}/bin/pgp"
 d_remailer='define'
 finger='/usr/bin/finger'
 finger_path='/usr/bin/finger'
 CONFIG=true
 EOF
 
-cd ${WrkSrc}
-# old way:
-# yes "" | ./Configure -d
-./Configure -S
-
 exit 0
 # END