Wed Jun 12 12:11:49 2013 UTC ()
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.


(wiz)
diff -r1.31 -r1.32 pkgsrc/chat/vicq/Makefile
diff -r1.8 -r1.9 pkgsrc/chat/vicq/distinfo
diff -r1.3 -r1.4 pkgsrc/chat/vicq/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/chat/vicq/patches/patch-ac
cvs diff -r1.31 -r1.32 pkgsrc/chat/vicq/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/vicq/Attic/Makefile 2013/05/31 12:39:42 1.31
+++ pkgsrc/chat/vicq/Attic/Makefile 2013/06/12 12:11:48 1.32
@@ -1,33 +1,38 @@ @@ -1,33 +1,38 @@
1# $NetBSD: Makefile,v 1.31 2013/05/31 12:39:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2013/06/12 12:11:48 wiz Exp $
2 2
3DISTNAME= vicq-0.4.1 3DISTNAME= vicq-0.4.1
4PKGREVISION= 8 4PKGREVISION= 8
5CATEGORIES= chat 5CATEGORIES= chat
6MASTER_SITES= ${HOMEPAGE} 6MASTER_SITES= ${HOMEPAGE}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://gonzo.kiev.ua/projects/vicq.old/ 10HOMEPAGE= http://gonzo.kiev.ua/projects/vicq.old/
11COMMENT= Simple icq client written in perl 11COMMENT= Simple icq client written in perl
 12LICENSE= gnu-gpl-v2
12 13
13DEPENDS+= p5-Term-ReadLine>=1.11:../../devel/p5-Term-ReadLine 14DEPENDS+= p5-Term-ReadLine>=1.11:../../devel/p5-Term-ReadLine
14 15
15PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
16 17
17WRKSRC= ${WRKDIR}/vicq/Net/vICQ 18WRKSRC= ${WRKDIR}/vicq
 19CONFIGURE_DIRS= Net/vICQ
18TEST_TARGET= # disabled 20TEST_TARGET= # disabled
19 21
20REPLACE_PERL= ../../vicq 22REPLACE_PERL= vicq
21PERL5_PACKLIST= auto/Net/vICQ/.packlist 23PERL5_PACKLIST= auto/Net/vICQ/.packlist
22 24
23INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/vicq 25INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/vicq
24 26
25post-install: 27post-build:
26 ${INSTALL_SCRIPT} ${WRKDIR}/vicq/vicq ${DESTDIR}${PREFIX}/bin 28 ${PREFIX}/bin/pod2man ${WRKSRC}/vicq --section=1 \
27 ${PREFIX}/bin/pod2man ${WRKDIR}/vicq/vicq --section=1 \ 
28 --release="vICQ ${DISTNAME:C/.*-//}" \ 29 --release="vICQ ${DISTNAME:C/.*-//}" \
29 --center="vICQ manual page" > ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vicq.1 30 --center="vICQ manual page" > ${WRKSRC}/vicq.1
30 ${INSTALL_DATA} ${WRKDIR}/vicq/vicqrc.example ${DESTDIR}${PREFIX}/share/examples/vicq 31
 32post-install:
 33 ${INSTALL_SCRIPT} ${WRKSRC}/vicq ${DESTDIR}${PREFIX}/bin
 34 ${INSTALL_DATA} ${WRKSRC}/vicqrc.example ${DESTDIR}${PREFIX}/share/examples/vicq
 35 ${INSTALL_DATA} ${WRKSRC}/vicq.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
31 36
32.include "../../lang/perl5/module.mk" 37.include "../../lang/perl5/module.mk"
33.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/chat/vicq/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/vicq/Attic/distinfo 2007/12/29 21:29:55 1.8
+++ pkgsrc/chat/vicq/Attic/distinfo 2013/06/12 12:11:48 1.9
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.8 2007/12/29 21:29:55 joerg Exp $ 1$NetBSD: distinfo,v 1.9 2013/06/12 12:11:48 wiz Exp $
2 2
3SHA1 (vicq-0.4.1.tar.bz2) = 824f49adb0f17d3f8c1593517db80fed5c70353c 3SHA1 (vicq-0.4.1.tar.bz2) = 824f49adb0f17d3f8c1593517db80fed5c70353c
4RMD160 (vicq-0.4.1.tar.bz2) = 4c1e24baf2ae3aa8206eb9cd611ba6dfed9efce5 4RMD160 (vicq-0.4.1.tar.bz2) = 4c1e24baf2ae3aa8206eb9cd611ba6dfed9efce5
5Size (vicq-0.4.1.tar.bz2) = 54292 bytes 5Size (vicq-0.4.1.tar.bz2) = 54292 bytes
6SHA1 (patch-ab) = 7a9d24c8a1e07ccfd868480d6f5f204f92fa05c9 6SHA1 (patch-ab) = c41c38e74b0e43994bd74b8df2ed7e18fd3c8355
7SHA1 (patch-ac) = ddbb85f68eac90c54a881bd3098cae81f7492f04 7SHA1 (patch-ac) = ef9fba66af10197d8975076c3caaf310c8549175
cvs diff -r1.3 -r1.4 pkgsrc/chat/vicq/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/chat/vicq/patches/Attic/patch-ab 2007/12/29 21:29:55 1.3
+++ pkgsrc/chat/vicq/patches/Attic/patch-ab 2013/06/12 12:11:49 1.4
@@ -1,17 +1,32 @@ @@ -1,17 +1,32 @@
1$NetBSD: patch-ab,v 1.3 2007/12/29 21:29:55 joerg Exp $ 1$NetBSD: patch-ab,v 1.4 2013/06/12 12:11:49 wiz Exp $
2 2
3--- ../../vicq.orig Mon Apr 15 18:55:17 2002 3--- vicq.orig 2002-04-15 16:55:17.000000000 +0000
4+++ ../../vicq 4+++ vicq 2013-06-12 12:09:25.000000000 +0000
 5@@ -557,12 +557,12 @@
 6
 7 change status to 'Free for chat'
 8
 9-=back
 10-
 11 =item B<offline>
 12
 13 change status to 'Offline/Disconnect'
 14
 15+=back
 16+
 17 =head2 Contact list managment
 18
 19 =over 4
5@@ -2010,7 +2010,7 @@ 20@@ -2010,7 +2010,7 @@
6 $config{log_path} = expand_file($config{log_path}); 21 $config{log_path} = expand_file($config{log_path});
7 $config{log_path}.='/' unless $config{log_path}=~/\/$/; 22 $config{log_path}.='/' unless $config{log_path}=~/\/$/;
8 }else{ 23 }else{
9- $config{log_path}="$ENV{HOME}/.vicq/history/"; 24- $config{log_path}="$ENV{HOME}/.vicq/history/";
10+ $config{log_path}="$ENV{HOME}/.vicq/history"; 25+ $config{log_path}="$ENV{HOME}/.vicq/history";
11 } 26 }
12 unless( -e $config{log_path} || $config{log_path} eq $ENV{HOME}) 27 unless( -e $config{log_path} || $config{log_path} eq $ENV{HOME})
13 { 28 {
14@@ -2494,7 +2494,7 @@ 29@@ -2494,7 +2494,7 @@
15 $uin =~ s/\033\[.m//g; 30 $uin =~ s/\033\[.m//g;
16  31
17 my $fname=($config{log_type}=~/a/)?'vicq.log':"$uin.log"; 32 my $fname=($config{log_type}=~/a/)?'vicq.log':"$uin.log";
cvs diff -r1.2 -r1.3 pkgsrc/chat/vicq/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/chat/vicq/patches/Attic/patch-ac 2007/12/29 21:29:55 1.2
+++ pkgsrc/chat/vicq/patches/Attic/patch-ac 2013/06/12 12:11:49 1.3
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-ac,v 1.2 2007/12/29 21:29:55 joerg Exp $ 1$NetBSD: patch-ac,v 1.3 2013/06/12 12:11:49 wiz Exp $
2 2
3--- install.sh.orig 2002-04-09 12:32:33.000000000 -0400 3--- Net/vICQ/install.sh.orig 2002-04-09 12:32:33.000000000 -0400
4+++ install.sh 4+++ Net/vICQ/install.sh
5@@ -1,6 +1,6 @@ 5@@ -1,6 +1,6 @@
6 #!/bin/sh 6 #!/bin/sh
7  7
8-output=`perl Makefile.PL 2>&1`; 8-output=`perl Makefile.PL 2>&1`;
9+output=`perl Makefile.PL INSTALLDIRS=vendor 2>&1`; 9+output=`perl Makefile.PL INSTALLDIRS=vendor 2>&1`;
10 if [ $? != 0 ]; then 10 if [ $? != 0 ]; then
11 echo "Command: [perl Makefile.PL]" 11 echo "Command: [perl Makefile.PL]"
12 echo "$output"; 12 echo "$output";