Update IM to 151.

- Tiny changes for Perl 5.12.
- Build scripts are updated.
  Use `sysconfdir' instead of `libdir' for the configuration file.
  ${DESTDIR) is prepended to each installed target.

5 files changed, 8 insertions, 69 deletions

diff --git a/mail/im/Makefile b/mail/im/Makefile
index 6405cae5993..962c9539247 100644
--- a/mail/im/Makefile
+++ b/mail/im/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2010/09/06 12:19:45 taca Exp $
+# $NetBSD: Makefile,v 1.6 2011/05/28 07:54:01 obache Exp $
 
-DISTNAME=	im-150
-PKGREVISION=	2
+DISTNAME=	im-151
 CATEGORIES=	mail
 MASTER_SITES=	http://tats.haun.org/im/
 
@@ -15,12 +14,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	perl:run
 
-CONFIGURE_ARGS+=	--libdir=${PKG_SYSCONFBASEDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=	--with-perldir=${PREFIX}/${PERL5_SUB_INSTALLVENDORLIB}
 CONFIGURE_ENV+=		im_path_perl=${PERL5:Q}
 
-INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
-INSTALL_MAKE_FLAGS+=	perldir=${DESTDIR}${PREFIX}/${PERL5_SUB_INSTALLVENDORLIB}
+INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
 
 PKG_SYSCONFSUBDIR=	im
 
diff --git a/mail/im/distinfo b/mail/im/distinfo
index 49256c32877..997de71529e 100644
--- a/mail/im/distinfo
+++ b/mail/im/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/09/06 12:19:45 taca Exp $
+$NetBSD: distinfo,v 1.4 2011/05/28 07:54:02 obache Exp $
 
-SHA1 (im-150.tar.gz) = 4f6ec70d52fffc6c4a44831ebed6ac8e33a769d0
-RMD160 (im-150.tar.gz) = 057142296747b8b2629e8d8265a221f703e7b27a
-Size (im-150.tar.gz) = 267337 bytes
-SHA1 (patch-aa) = 71bb1bed56be580c30f291360e7320a85a818087
-SHA1 (patch-ab) = 132c0026941cc48a24f49cf77b4dd0b25599a2e6
-SHA1 (patch-ac) = d66a6ea0e23865cc8d6dfb25a6472bd3ad48be68
+SHA1 (im-151.tar.gz) = 6172de08ca4757e97af7b9411fcb3d53f3ad0d4c
+RMD160 (im-151.tar.gz) = d7ad5cd2d0bf2c4df4fbe3be39e50ac567de5422
+Size (im-151.tar.gz) = 271073 bytes
diff --git a/mail/im/patches/patch-aa b/mail/im/patches/patch-aa
deleted file mode 100644
index b4130400619..00000000000
--- a/mail/im/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/01/06 12:00:29 obache Exp $
-
---- Makefile.in.orig	2003-03-21 15:09:45.000000000 +0000
-+++ Makefile.in
-@@ -30,7 +30,7 @@ libdir=@libdir@
- perldir=@im_path_siteperl@
- 
- # If you modify imlibdir, you should also modify IM/Config.
--imlibdir= $(libdir)/im
-+imlibdir= $(prefix)/share/examples/im
- moddir=	  $(perldir)/IM
- 
- RPOP=	@im_rpop@
-@@ -76,11 +76,7 @@ installdata::
- 	fi
- 	$(chmod) 755 $(imlibdir)
- 	for cnf_im in SiteConfig ; do \
--		if test ! -f $(imlibdir)/$$cnf_im; then \
--			$(INSTALL_DATA) cnf.im/$$cnf_im $(imlibdir); \
--		else \
--			$(INSTALL_DATA) cnf.im/$$cnf_im $(imlibdir)/$$cnf_im.new; \
--		fi ;\
-+		$(INSTALL_DATA) cnf.im/$$cnf_im $(imlibdir)/$$cnf_im; \
- 	done
- 
- clean::
diff --git a/mail/im/patches/patch-ab b/mail/im/patches/patch-ab
deleted file mode 100644
index 0af33d60e0f..00000000000
--- a/mail/im/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/09/06 12:19:45 taca Exp $
-
-Fix for perl-5.12.
-
---- IM/Config.pm.in.orig	2010-02-14 15:52:20.000000000 +0000
-+++ IM/Config.pm.in
-@@ -487,7 +487,7 @@ sub set_selector($;$) {
- 
-     foreach $s (split(',', $selector)) { ### xxx lc
- 	next if ($s eq 'default');
--	unless (defined(%{$s})) {
-+	unless (%{$s}) {
- 	    im_err("no 'case $s' in config file.\n");
- 	    return -1;
- 	} else {
diff --git a/mail/im/patches/patch-ac b/mail/im/patches/patch-ac
deleted file mode 100644
index c249d26e956..00000000000
--- a/mail/im/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2010/09/06 12:19:45 taca Exp $
-
-Fix for perl-5.12.
-
---- IM/Scan.pm.orig	2010-02-14 15:52:20.000000000 +0000
-+++ IM/Scan.pm
-@@ -509,7 +509,7 @@ sub friendly_addr($$) {
-     my($a, $f, $p);
-     while (($a, $addr, $f) = &fetch_addr($addr, 1), $a ne '') {
- 	$a =~ s/\/[^@]*//;
--	if (defined(%petnames) && $petnames{lc($a)}) {
-+	if (%petnames && $petnames{lc($a)}) {
- 	    $p = $petnames{lc($a)};
- 	} elsif (!$need_addr && $f) {
- 	    $p = &mime_decode_string($f);