Fix build with perl-5.18.

While here, improve WRKSRC to avoid ".." in patches and paths,
build man page during build and not during install step,
and set LICENSE.

4 files changed, 37 insertions, 17 deletions

diff --git a/chat/vicq/Makefile b/chat/vicq/Makefile
index bab804413f3..1ef15a1a5d6 100644
--- a/chat/vicq/Makefile
+++ b/chat/vicq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2013/05/31 12:39:42 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2013/06/12 12:11:48 wiz Exp $
 
 DISTNAME=	vicq-0.4.1
 PKGREVISION=	8
@@ -9,25 +9,30 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gonzo.kiev.ua/projects/vicq.old/
 COMMENT=	Simple icq client written in perl
+LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	p5-Term-ReadLine>=1.11:../../devel/p5-Term-ReadLine
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=			${WRKDIR}/vicq/Net/vICQ
+WRKSRC=			${WRKDIR}/vicq
+CONFIGURE_DIRS=		Net/vICQ
 TEST_TARGET=		# disabled
 
-REPLACE_PERL=		../../vicq
+REPLACE_PERL=		vicq
 PERL5_PACKLIST=		auto/Net/vICQ/.packlist
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/vicq
 
-post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/vicq/vicq ${DESTDIR}${PREFIX}/bin
-	${PREFIX}/bin/pod2man ${WRKDIR}/vicq/vicq --section=1 \
+post-build:
+	${PREFIX}/bin/pod2man ${WRKSRC}/vicq --section=1 \
 	    --release="vICQ ${DISTNAME:C/.*-//}" \
-	    --center="vICQ manual page" >  ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vicq.1
-	${INSTALL_DATA} ${WRKDIR}/vicq/vicqrc.example ${DESTDIR}${PREFIX}/share/examples/vicq
+	    --center="vICQ manual page" >  ${WRKSRC}/vicq.1
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/vicq ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/vicqrc.example ${DESTDIR}${PREFIX}/share/examples/vicq
+	${INSTALL_DATA} ${WRKSRC}/vicq.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/vicq/distinfo b/chat/vicq/distinfo
index b1baa05d071..2d68b922e9e 100644
--- a/chat/vicq/distinfo
+++ b/chat/vicq/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2007/12/29 21:29:55 joerg Exp $
+$NetBSD: distinfo,v 1.9 2013/06/12 12:11:48 wiz Exp $
 
 SHA1 (vicq-0.4.1.tar.bz2) = 824f49adb0f17d3f8c1593517db80fed5c70353c
 RMD160 (vicq-0.4.1.tar.bz2) = 4c1e24baf2ae3aa8206eb9cd611ba6dfed9efce5
 Size (vicq-0.4.1.tar.bz2) = 54292 bytes
-SHA1 (patch-ab) = 7a9d24c8a1e07ccfd868480d6f5f204f92fa05c9
-SHA1 (patch-ac) = ddbb85f68eac90c54a881bd3098cae81f7492f04
+SHA1 (patch-ab) = c41c38e74b0e43994bd74b8df2ed7e18fd3c8355
+SHA1 (patch-ac) = ef9fba66af10197d8975076c3caaf310c8549175
diff --git a/chat/vicq/patches/patch-ab b/chat/vicq/patches/patch-ab
index bdaaf3dd266..05be3335340 100644
--- a/chat/vicq/patches/patch-ab
+++ b/chat/vicq/patches/patch-ab
@@ -1,7 +1,22 @@
-$NetBSD: patch-ab,v 1.3 2007/12/29 21:29:55 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2013/06/12 12:11:49 wiz Exp $
 
---- ../../vicq.orig	Mon Apr 15 18:55:17 2002
-+++ ../../vicq
+--- vicq.orig	2002-04-15 16:55:17.000000000 +0000
++++ vicq	2013-06-12 12:09:25.000000000 +0000
+@@ -557,12 +557,12 @@
+ 
+ change status to 'Free for chat'
+ 
+-=back
+-
+ =item B<offline>
+ 
+ change status to 'Offline/Disconnect'
+ 
++=back
++
+ =head2 Contact list managment
+ 
+ =over 4
 @@ -2010,7 +2010,7 @@
  		$config{log_path} = expand_file($config{log_path});
  		$config{log_path}.='/' unless $config{log_path}=~/\/$/;
diff --git a/chat/vicq/patches/patch-ac b/chat/vicq/patches/patch-ac
index 7b3d6f4e6c7..1692cfdda89 100644
--- a/chat/vicq/patches/patch-ac
+++ b/chat/vicq/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2007/12/29 21:29:55 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2013/06/12 12:11:49 wiz Exp $
 
---- install.sh.orig	2002-04-09 12:32:33.000000000 -0400
-+++ install.sh
+--- Net/vICQ/install.sh.orig	2002-04-09 12:32:33.000000000 -0400
++++ Net/vICQ/install.sh
 @@ -1,6 +1,6 @@
  #!/bin/sh