Wed Jun 24 19:49:56 2015 UTC ()
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.


(joerg)
diff -r1.12 -r1.13 pkgsrc/mail/fml4/Makefile
diff -r1.3 -r1.4 pkgsrc/mail/fml4/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/mail/fml4/patches/patch-ac
diff -r1.2 -r0 pkgsrc/mail/fml4/patches/patch-sbin_config.guess
cvs diff -r1.12 -r1.13 pkgsrc/mail/fml4/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/fml4/Makefile 2015/06/12 10:50:19 1.12
+++ pkgsrc/mail/fml4/Makefile 2015/06/24 19:49:56 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.12 2015/06/12 10:50:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2015/06/24 19:49:56 joerg Exp $
2# 2#
3 3
4DISTNAME= fml-4.0-stable-20040215 4DISTNAME= fml-4.0-stable-20040215
5PKGNAME= fml4-4.0.3.20040215 5PKGNAME= fml4-4.0.3.20040215
6PKGREVISION= 8 6PKGREVISION= 8
7CATEGORIES= mail 7CATEGORIES= mail
8MASTER_SITES= ftp://ftp.fml.org/pub/fml/stable/ 8MASTER_SITES= ftp://ftp.fml.org/pub/fml/stable/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.fml.org/software/fml4/index-e.html 11HOMEPAGE= http://www.fml.org/software/fml4/index-e.html
12COMMENT= FML mailing list server 12COMMENT= FML mailing list server
13LICENSE= gnu-gpl-v2 OR artistic 13LICENSE= gnu-gpl-v2 OR artistic
14 14
@@ -49,16 +49,19 @@ PLIST_SUBST+= FML_DIR=${FML_DIR} @@ -49,16 +49,19 @@ PLIST_SUBST+= FML_DIR=${FML_DIR}
49MESSAGE_SUBST+= FML_DIR=${FML_DIR} 49MESSAGE_SUBST+= FML_DIR=${FML_DIR}
50 50
51INSTALLATION_DIRS+= ${FML_DIR}/examples 51INSTALLATION_DIRS+= ${FML_DIR}/examples
52 52
53do-configure: 53do-configure:
54 ${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/sbin 54 ${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/sbin
55 55
56do-install: 56do-install:
57 cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${PERL5} makefml install 57 cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${PERL5} makefml install
58 ${MV} ${DESTDIR}${PREFIX}/${FML_DIR}/.fml/system \ 58 ${MV} ${DESTDIR}${PREFIX}/${FML_DIR}/.fml/system \
59 ${DESTDIR}${PREFIX}/${FML_DIR}/examples 59 ${DESTDIR}${PREFIX}/${FML_DIR}/examples
60 ${FIND} ${DESTDIR}${PREFIX}/${FML_DIR} -xdev -type f \ 60 ${FIND} ${DESTDIR}${PREFIX}/${FML_DIR} -xdev -type f \
61 \( -name '*.bak' -o -name '*.orig' \) -exec ${RM} -- {} \; 61 \( -name '*.bak' -o -name '*.orig' \) -exec ${RM} -- {} \;
 62 ${INSTALL_SCRIPT} ${PKGSRCDIR}/mk/gnu-config/config.guess \
 63 ${DESTDIR}${PREFIX}/${FML_DIR}/sbin/config.guess
 64
62 65
63.include "../../lang/perl5/buildlink3.mk" 66.include "../../lang/perl5/buildlink3.mk"
64.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/mail/fml4/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/fml4/distinfo 2013/01/29 15:48:55 1.3
+++ pkgsrc/mail/fml4/distinfo 2015/06/24 19:49:56 1.4
@@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
1$NetBSD: distinfo,v 1.3 2013/01/29 15:48:55 taca Exp $ 1$NetBSD: distinfo,v 1.4 2015/06/24 19:49:56 joerg Exp $
2 2
3SHA1 (fml-4.0-stable-20040215.tar.gz) = b7f958deacc50a0173928b7c43df52b5869d9491 3SHA1 (fml-4.0-stable-20040215.tar.gz) = b7f958deacc50a0173928b7c43df52b5869d9491
4RMD160 (fml-4.0-stable-20040215.tar.gz) = 40eb43d2631a5e6d6769b8cfdf35e4a980ff0391 4RMD160 (fml-4.0-stable-20040215.tar.gz) = 40eb43d2631a5e6d6769b8cfdf35e4a980ff0391
5Size (fml-4.0-stable-20040215.tar.gz) = 2906052 bytes 5Size (fml-4.0-stable-20040215.tar.gz) = 2906052 bytes
6SHA1 (patch-aa) = 91c0544e2969b3e4537a485d1f7a92ab5bf72bae 6SHA1 (patch-aa) = 91c0544e2969b3e4537a485d1f7a92ab5bf72bae
7SHA1 (patch-ab) = d8f8ef2085d9ad30331924c89958aaeddb89b457 7SHA1 (patch-ab) = d8f8ef2085d9ad30331924c89958aaeddb89b457
8SHA1 (patch-ac) = da279a9ac2b3c0f013da43b8993b84026362efd0 8SHA1 (patch-ac) = 75f5a3da8a17d29a81d7912e7ba0721277ded0fd
9SHA1 (patch-ad) = 17e5d1d97e5a085b8b5da67e00730ce92b959fbf 9SHA1 (patch-ad) = 17e5d1d97e5a085b8b5da67e00730ce92b959fbf
10SHA1 (patch-ae) = 467a8bacfb0a6d41ceb1d8f52fc4bfc0ae2fc565 10SHA1 (patch-ae) = 467a8bacfb0a6d41ceb1d8f52fc4bfc0ae2fc565
11SHA1 (patch-af) = 9e7fa7c70b4f3353a5c33d0ded2eeae86d9a5c65 11SHA1 (patch-af) = 9e7fa7c70b4f3353a5c33d0ded2eeae86d9a5c65
12SHA1 (patch-ag) = 5a7a8a3d32e1a290e29cefa67aec584c21206d0c 12SHA1 (patch-ag) = 5a7a8a3d32e1a290e29cefa67aec584c21206d0c
13SHA1 (patch-sbin_config.guess) = 66087f9512181bd76dcbca34a1d8532bdd6ae07c 
14SHA1 (patch-src_libkernsubr.pl) = c9d4e57b12fddb3045f47b27926c67cfe32c0d44 13SHA1 (patch-src_libkernsubr.pl) = c9d4e57b12fddb3045f47b27926c67cfe32c0d44
cvs diff -r1.1.1.1 -r1.2 pkgsrc/mail/fml4/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/mail/fml4/patches/patch-ac 2010/12/23 16:55:02 1.1.1.1
+++ pkgsrc/mail/fml4/patches/patch-ac 2015/06/24 19:49:56 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ac,v 1.1.1.1 2010/12/23 16:55:02 taca Exp $ 1$NetBSD: patch-ac,v 1.2 2015/06/24 19:49:56 joerg Exp $
2 2
3- use HOSTNAME as hostname when install. 3- use HOSTNAME as hostname when install.
4- Stop perl deprecated warnings. 4- Stop perl deprecated warnings.
5- honor PREFIX and FML_DATADIR. 5- honor PREFIX and FML_DATADIR.
6- Add support for DESTDIR. 6- Add support for DESTDIR.
7 7
8--- sbin/makefml.orig 2003-01-26 11:18:01.000000000 +0000 8--- sbin/makefml.orig 2003-01-26 11:18:01.000000000 +0000
9+++ sbin/makefml 9+++ sbin/makefml
10@@ -192,6 +192,11 @@ sub InitMakeFml 10@@ -192,6 +192,11 @@ sub InitMakeFml
11  11
12 { # DNS AutoConfigure to set FQDN and DOMAINNAME;  12 { # DNS AutoConfigure to set FQDN and DOMAINNAME;
13 local(@n, $hostname, $list); 13 local(@n, $hostname, $list);
14+ if ($ENV{'HOSTNAME'}) { 14+ if ($ENV{'HOSTNAME'}) {
@@ -444,26 +444,35 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/12/23 1 @@ -444,26 +444,35 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/12/23 1
444  444
445 print STDERR " * create CGI scripts in $REAL_CGI_PATH/admin/\n " 445 print STDERR " * create CGI scripts in $REAL_CGI_PATH/admin/\n "
446 unless $SilentMode; 446 unless $SilentMode;
447  447
448 for $f ("menu.cgi", "makefml.cgi", "mlmenu.cgi", 448 for $f ("menu.cgi", "makefml.cgi", "mlmenu.cgi",
449 "menubar.cgi", "index.cgi", "newml.cgi", "rmml.cgi") { 449 "menubar.cgi", "index.cgi", "newml.cgi", "rmml.cgi") {
450- $template = "$EXEC_DIR/www/cgi-bin/admin/$f"; 450- $template = "$EXEC_DIR/www/cgi-bin/admin/$f";
451- $outfile = "$REAL_CGI_PATH/admin/$f"; 451- $outfile = "$REAL_CGI_PATH/admin/$f";
452+ $template = DestDir("$EXEC_DIR/www/cgi-bin/admin/$f"); 452+ $template = DestDir("$EXEC_DIR/www/cgi-bin/admin/$f");
453+ $outfile = DestDir("$REAL_CGI_PATH/admin/$f"); 453+ $outfile = DestDir("$REAL_CGI_PATH/admin/$f");
454 print STDERR $f, " " unless $SilentMode; 454 print STDERR $f, " " unless $SilentMode;
455 &Copy($template, $outfile); 455 &Copy($template, $outfile);
456 chmod 0755, $outfile; 456 chmod 0755, $outfile;
 457@@ -6355,7 +6368,7 @@ sub main::Dumpvar
 458 $buf .= "\$$key = '$entry';\n";
 459 }
 460
 461- if (defined @entry) {
 462+ if (@entry) {
 463 $buf .= "\@$key = (\n";
 464 foreach $num ($[ .. $#entry) {
 465 $buf .= "\t'$entry[$num]',\n";
457@@ -6364,12 +6377,12 @@ sub main::Dumpvar  466@@ -6364,12 +6377,12 @@ sub main::Dumpvar
458 } 467 }
459  468
460 if ((($] !~ /5\.\d\d\d/) &&  469 if ((($] !~ /5\.\d\d\d/) &&
461- $key ne "_$package" && $key ne "_DB" && defined %entry 470- $key ne "_$package" && $key ne "_DB" && defined %entry
462+ $key ne "_$package" && $key ne "_DB" && %entry 471+ $key ne "_$package" && $key ne "_DB" && %entry
463 ) 472 )
464 || 473 ||
465 (($] =~ /5\.\d\d\d/) &&  474 (($] =~ /5\.\d\d\d/) &&
466 $key ne "$package::" && $key ne "DB::" &&  475 $key ne "$package::" && $key ne "DB::" &&
467- (defined %entry) &&  476- (defined %entry) &&
468+ %entry &&  477+ %entry &&
469 ($dumpPackages || $key !~ /::$/) 478 ($dumpPackages || $key !~ /::$/)
File Deleted: pkgsrc/mail/fml4/patches/Attic/patch-sbin_config.guess