Properly install our config.guess, the symlink isn't picked up

otherwise. Fix makefml for Perl 5.22. Drop now redundant patch against
the original config.guess.

4 files changed, 16 insertions, 21 deletions

diff --git a/mail/fml4/Makefile b/mail/fml4/Makefile
index 1a5b028cbd7..205dfdd98df 100644
--- a/mail/fml4/Makefile
+++ b/mail/fml4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/06/12 10:50:19 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2015/06/24 19:49:56 joerg Exp $
 #
 
 DISTNAME=	fml-4.0-stable-20040215
@@ -59,6 +59,9 @@ do-install:
 		${DESTDIR}${PREFIX}/${FML_DIR}/examples
 	${FIND} ${DESTDIR}${PREFIX}/${FML_DIR} -xdev -type f \
 		\( -name '*.bak' -o -name '*.orig' \) -exec ${RM} -- {} \;
+	${INSTALL_SCRIPT} ${PKGSRCDIR}/mk/gnu-config/config.guess \
+	    ${DESTDIR}${PREFIX}/${FML_DIR}/sbin/config.guess
+
 
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/fml4/distinfo b/mail/fml4/distinfo
index 27ddf275677..127bb6a27dd 100644
--- a/mail/fml4/distinfo
+++ b/mail/fml4/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.3 2013/01/29 15:48:55 taca Exp $
+$NetBSD: distinfo,v 1.4 2015/06/24 19:49:56 joerg Exp $
 
 SHA1 (fml-4.0-stable-20040215.tar.gz) = b7f958deacc50a0173928b7c43df52b5869d9491
 RMD160 (fml-4.0-stable-20040215.tar.gz) = 40eb43d2631a5e6d6769b8cfdf35e4a980ff0391
 Size (fml-4.0-stable-20040215.tar.gz) = 2906052 bytes
 SHA1 (patch-aa) = 91c0544e2969b3e4537a485d1f7a92ab5bf72bae
 SHA1 (patch-ab) = d8f8ef2085d9ad30331924c89958aaeddb89b457
-SHA1 (patch-ac) = da279a9ac2b3c0f013da43b8993b84026362efd0
+SHA1 (patch-ac) = 75f5a3da8a17d29a81d7912e7ba0721277ded0fd
 SHA1 (patch-ad) = 17e5d1d97e5a085b8b5da67e00730ce92b959fbf
 SHA1 (patch-ae) = 467a8bacfb0a6d41ceb1d8f52fc4bfc0ae2fc565
 SHA1 (patch-af) = 9e7fa7c70b4f3353a5c33d0ded2eeae86d9a5c65
 SHA1 (patch-ag) = 5a7a8a3d32e1a290e29cefa67aec584c21206d0c
-SHA1 (patch-sbin_config.guess) = 66087f9512181bd76dcbca34a1d8532bdd6ae07c
 SHA1 (patch-src_libkernsubr.pl) = c9d4e57b12fddb3045f47b27926c67cfe32c0d44
diff --git a/mail/fml4/patches/patch-ac b/mail/fml4/patches/patch-ac
index 4c72b3a21cf..e6746c2e07a 100644
--- a/mail/fml4/patches/patch-ac
+++ b/mail/fml4/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/12/23 16:55:02 taca Exp $
+$NetBSD: patch-ac,v 1.2 2015/06/24 19:49:56 joerg Exp $
 
 - use HOSTNAME as hostname when install.
 - Stop perl deprecated warnings.
@@ -454,6 +454,15 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/12/23 16:55:02 taca Exp $
  	print STDERR $f, " " unless $SilentMode;
  	&Copy($template, $outfile);
  	chmod 0755, $outfile;
+@@ -6355,7 +6368,7 @@ sub main::Dumpvar 
+ 		$buf .= "\$$key = '$entry';\n";
+ 	    }
+ 
+-	    if (defined @entry) {
++	    if (@entry) {
+ 		$buf .= "\@$key = (\n";
+ 		foreach $num ($[ .. $#entry) {
+ 		    $buf .= "\t'$entry[$num]',\n";
 @@ -6364,12 +6377,12 @@ sub main::Dumpvar 
  	    }
  
diff --git a/mail/fml4/patches/patch-sbin_config.guess b/mail/fml4/patches/patch-sbin_config.guess
deleted file mode 100644
index 60d0e549203..00000000000
--- a/mail/fml4/patches/patch-sbin_config.guess
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-sbin_config.guess,v 1.2 2013/01/29 15:48:55 taca Exp $
-
-Add DragonFly support.
-
---- sbin/config.guess.orig	2012-05-21 07:04:19.000000000 +0000
-+++ sbin/config.guess
-@@ -759,6 +759,9 @@ EOF
- 	rm -f $dummy.c && rmdir $tmpdir
- 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
- 	exit 0 ;;
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-+	exit 0 ;;    
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit 0 ;;