From 763ff0bda62e16dfc064a8cd9d75c879befd0cb7 Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sat, 22 Jan 2000 18:03:39 +0000
Subject: [PATCH] tweaks for FreeBSD 2.*

---
 mail/elm+ME/scripts/pre-configure | 21 ++++++++++++---------
 mail/elm/scripts/pre-configure    | 21 ++++++++++++---------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/mail/elm+ME/scripts/pre-configure b/mail/elm+ME/scripts/pre-configure
index 2ae7a156371f..19cfaa9ffdc1 100644
--- a/mail/elm+ME/scripts/pre-configure
+++ b/mail/elm+ME/scripts/pre-configure
@@ -1,19 +1,22 @@
 #!/bin/sh -
 #
-#	pre-configure script for Elm port to FreeBSD 2.0
+#       pre-configure script for Elm port to FreeBSD
 # $FreeBSD$
 
 PortsDir=$PORTSDIR
-  CurDir=$CURDIR
-  WrkSrc=$WRKSRC
+CurDir=$CURDIR
+WrkSrc=$WRKSRC
 
-	cat > ${WrkSrc}/config.sh << 'EOF'
+has_inttypes=undef
+[ -r /usr/include/inttypes.h ] && has_inttypes=define
+
+	cat > ${WrkSrc}/config.sh << EOF
 #!/bin/sh
 # config.sh
 # This file was produced by running the Configure script.
 
-Log='$Log'
-Header='$Header'
+Log='\$Log'
+Header='\$Header'
 bin="${PREFIX}/bin"
 contains='grep'
 cppstdin='/usr/bin/cpp'
@@ -29,7 +32,7 @@ d_mmap='define'
 d_socket='define'
 d_netdb='define'
 d_netinet_in='define'
-d_inttypes='define'
+d_inttypes='$has_inttypes'
 d_nointtypes='undef'
 n='-n'
 c=''
@@ -247,9 +250,9 @@ d_vfork='define'
 defbatsub='no subject (file transmission)'
 defeditor='/usr/bin/vi'
 editoropts=''
-hostname="${Hostname}"
+hostname=''
 phostname='hostname'
-mydomain="${Domain}"
+mydomain=''
 autohostname='define'
 i_memory='define'
 i_stdarg='define'
diff --git a/mail/elm/scripts/pre-configure b/mail/elm/scripts/pre-configure
index 2ae7a156371f..19cfaa9ffdc1 100644
--- a/mail/elm/scripts/pre-configure
+++ b/mail/elm/scripts/pre-configure
@@ -1,19 +1,22 @@
 #!/bin/sh -
 #
-#	pre-configure script for Elm port to FreeBSD 2.0
+#       pre-configure script for Elm port to FreeBSD
 # $FreeBSD$
 
 PortsDir=$PORTSDIR
-  CurDir=$CURDIR
-  WrkSrc=$WRKSRC
+CurDir=$CURDIR
+WrkSrc=$WRKSRC
 
-	cat > ${WrkSrc}/config.sh << 'EOF'
+has_inttypes=undef
+[ -r /usr/include/inttypes.h ] && has_inttypes=define
+
+	cat > ${WrkSrc}/config.sh << EOF
 #!/bin/sh
 # config.sh
 # This file was produced by running the Configure script.
 
-Log='$Log'
-Header='$Header'
+Log='\$Log'
+Header='\$Header'
 bin="${PREFIX}/bin"
 contains='grep'
 cppstdin='/usr/bin/cpp'
@@ -29,7 +32,7 @@ d_mmap='define'
 d_socket='define'
 d_netdb='define'
 d_netinet_in='define'
-d_inttypes='define'
+d_inttypes='$has_inttypes'
 d_nointtypes='undef'
 n='-n'
 c=''
@@ -247,9 +250,9 @@ d_vfork='define'
 defbatsub='no subject (file transmission)'
 defeditor='/usr/bin/vi'
 editoropts=''
-hostname="${Hostname}"
+hostname=''
 phostname='hostname'
-mydomain="${Domain}"
+mydomain=''
 autohostname='define'
 i_memory='define'
 i_stdarg='define'