Restore FreeBSD id's

formatted man pages have suffix 0, not 1.
Use patch to change /usr/local to __PREFIX/share in nls/LANGS
Use sed to change __PREFIX into $PREFIX in nls/LANGS

4 files changed, 26 insertions, 23 deletions

diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 7cd9886d6a4..76d4802155a 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -4,7 +4,8 @@
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.1.1.1 1998/01/23 12:19:45 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 1998/01/23 13:17:11 bouyer Exp $
+# FreeBSD: Makefile,v 1.42 1997/12/24 01:21:07 alex Exp
 #
 
 DISTNAME=       elm-2.4ME+32
@@ -24,6 +25,10 @@ CONFIGURE_SCRIPT= Configure
 CONFIGURE_ENV=  PREFIX="${PREFIX}"
 CONFIGURE_ARGS= -S
 
+pre-configure::
+	${MV} ${WRKSRC}/nls/LANGS ${WRKSRC}/nls/LANGS.tmpl
+	${SED} -e 's:__PREFIX:'${PREFIX}':g'< ${WRKSRC}/nls/LANGS.tmpl > ${WRKSRC}/nls/LANGS
+
 post-install:
 	cd ${WRKSRC}/nls; ${MAKE} install
 	if [ -f ${PREFIX}/lib/elm.mimetypes ] ; then \
diff --git a/mail/elm/patches/patch-ab b/mail/elm/patches/patch-ab
index 42fd950579d..8ea0674fc27 100644
--- a/mail/elm/patches/patch-ab
+++ b/mail/elm/patches/patch-ab
@@ -44,6 +44,6 @@
 --- 1,5 ----
   # LANGS file
   
-! C/C/C                   /usr/local/share/nls/C
-! english/us/ascii        /usr/local/share/nls/en_US.ISO_8859-1
-! french/canada/8859      /usr/local/share/nls/fr_FR.ISO_8859-1
+! C/C/C                   __PREFIX/share/nls/C
+! english/us/ascii        __PREFIX/share/nls/en_US.ISO_8859-1
+! french/canada/8859      __PREFIX/share/nls/fr_FR.ISO_8859-1
diff --git a/mail/elm/pkg/PLIST b/mail/elm/pkg/PLIST
index cf040bfca29..1e571ac7021 100644
--- a/mail/elm/pkg/PLIST
+++ b/mail/elm/pkg/PLIST
@@ -1,15 +1,14 @@
+@comment $NetBSD: PLIST,v 1.2 1998/01/23 13:17:16 bouyer Exp $
 bin/elm
 bin/answer
 bin/checkalias
 bin/elmalias
 bin/fastmail
 bin/frm
-@exec ln -f %D/%F %D/bin/nfrm
 bin/listalias
 bin/messages
 bin/newalias
 bin/newmail
-@exec ln -f %D/%F %D/bin/wnewmail
 bin/printmail
 bin/readmsg
 lib/prlong
@@ -19,18 +18,16 @@ lib/elm-help.0
 lib/elm-help.1
 lib/elm-help.2
 lib/elm-help.3
-man/man1/answer.1.gz
-man/man1/checkalias.1.gz
-man/man1/elm.1.gz
-man/man1/elmalias.1.gz
-man/man1/fastmail.1.gz
-man/man1/frm.1
-@exec ln -f %D/%F %D/man/man1/nfrm.1.gz
-man/man1/listalias.1.gz
-man/man1/messages.1.gz
-man/man1/newalias.1.gz
-man/man1/newmail.1
-@exec ln -f %D/%F %D/man/man1/wnewmail.1
-man/man1/printmail.1.gz
-man/man1/readmsg.1.gz
+man/cat1/answer.0
+man/cat1/checkalias.0
+man/cat1/elm.0
+man/cat1/elmalias.0
+man/cat1/fastmail.0
+man/cat1/frm.0
+man/cat1/listalias.0
+man/cat1/messages.0
+man/cat1/newalias.0
+man/cat1/newmail.0
+man/cat1/printmail.0
+man/cat1/readmsg.0
 share/nls/C/elm2.4.cat
diff --git a/mail/elm/scripts/pre-configure b/mail/elm/scripts/pre-configure
index ca09484eb9a..f5a0e3d70e8 100644
--- a/mail/elm/scripts/pre-configure
+++ b/mail/elm/scripts/pre-configure
@@ -1,7 +1,8 @@
 #!/bin/sh -
 #
 #	pre-configure script for Elm port to FreeBSD 2.0
-#	$Id: pre-configure,v 1.1.1.1 1998/01/23 12:19:45 bouyer Exp $
+#	$NetBSD: pre-configure,v 1.2 1998/01/23 13:17:18 bouyer Exp $
+#	FreeBSD: pre-configure,v 1.16 1996/12/23 06:08:21 ache Exp
 
 PortsDir=$PORTSDIR
   CurDir=$CURDIR
@@ -260,8 +261,8 @@ mansrc="${PREFIX}/man/man1"
 catmansrc="${PREFIX}/man/cat1"
 manext='.1'
 manext_choice='.1'
-catmanext='.1'
-catmanext_choice='.1'
+catmanext='.0'
+catmanext_choice='.0'
 packed='n'
 manroff='/usr/bin/nroff'
 manroffopts=''