From c634b4bb839753aec2ae1040e2c80a5282402cb8 Mon Sep 17 00:00:00 2001 From: Ying-Chieh Liao Date: Fri, 24 Oct 2003 12:05:09 +0000 Subject: utilize SITE_PERL PR: 58166 Submitted by: Cheng-Lung Sung --- net-im/jarl/Makefile | 2 +- net-im/p5-Jabber-Connection/Makefile | 1 - net-im/p5-Net-AIM/pkg-plist | 16 +++++------ net-im/p5-Net-AOLIM/Makefile | 1 - net-im/p5-Net-AOLIM/pkg-plist | 12 ++++----- net-im/p5-Net-ICQ2000/Makefile | 1 - net-im/p5-Net-ICQ2000/pkg-plist | 10 +++---- net-im/p5-Net-Jabber/Makefile | 9 +++---- net-im/p5-Net-Jabber/pkg-plist | 52 ++++++++++++++++++------------------ net-im/vicq/Makefile | 3 +-- net-im/vicq/pkg-plist | 10 +++---- 11 files changed, 56 insertions(+), 61 deletions(-) (limited to 'net-im') diff --git a/net-im/jarl/Makefile b/net-im/jarl/Makefile index b107cbc7f607..6a2da5959b1e 100644 --- a/net-im/jarl/Makefile +++ b/net-im/jarl/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Perl/Tk Jabber client RUN_DEPENDS= ptksh:${PORTSDIR}/x11-toolkits/p5-Tk \ - ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Jabber/IQ.pm:${PORTSDIR}/net/p5-Net-Jabber + ${SITE_PERL}/Net/Jabber/IQ.pm:${PORTSDIR}/net/p5-Net-Jabber NO_BUILD= yes diff --git a/net-im/p5-Jabber-Connection/Makefile b/net-im/p5-Jabber-Connection/Makefile index 46bbb62aee01..9ec50086bc62 100644 --- a/net-im/p5-Jabber-Connection/Makefile +++ b/net-im/p5-Jabber-Connection/Makefile @@ -21,7 +21,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5- PERL_CONFIGURE= yes -MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= Jabber::Connection.3 Jabber::NS.3 Jabber::NodeFactory.3 .include diff --git a/net-im/p5-Net-AIM/pkg-plist b/net-im/p5-Net-AIM/pkg-plist index 056829109de0..3bb9b194db29 100644 --- a/net-im/p5-Net-AIM/pkg-plist +++ b/net-im/p5-Net-AIM/pkg-plist @@ -1,8 +1,8 @@ -lib/perl5/site_perl/%%PERL_VER%%/Net/AIM.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/AIM/Connection.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/AIM/Event.pm -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AIM/.packlist -@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AIM -@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/AIM -@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true +%%SITE_PERL%%/Net/AIM.pm +%%SITE_PERL%%/Net/AIM/Connection.pm +%%SITE_PERL%%/Net/AIM/Event.pm +%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM/.packlist +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM +@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrm %%SITE_PERL%%/Net/AIM +@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true diff --git a/net-im/p5-Net-AOLIM/Makefile b/net-im/p5-Net-AOLIM/Makefile index 8717d920b9c0..23d7033dd28c 100644 --- a/net-im/p5-Net-AOLIM/Makefile +++ b/net-im/p5-Net-AOLIM/Makefile @@ -19,6 +19,5 @@ PERL_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME} MAN3= Net::AOLIM.3 -MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} .include diff --git a/net-im/p5-Net-AOLIM/pkg-plist b/net-im/p5-Net-AOLIM/pkg-plist index 0fa005304ffe..a77414bb513f 100644 --- a/net-im/p5-Net-AOLIM/pkg-plist +++ b/net-im/p5-Net-AOLIM/pkg-plist @@ -1,6 +1,6 @@ -lib/perl5/site_perl/%%PERL_VER%%/Net/AOLIM.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/example.pl -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AOLIM/.packlist -@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true -@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/AOLIM -@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +%%SITE_PERL%%/Net/AOLIM.pm +%%SITE_PERL%%/Net/example.pl +%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM/.packlist +@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM +@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true diff --git a/net-im/p5-Net-ICQ2000/Makefile b/net-im/p5-Net-ICQ2000/Makefile index 880b7cffddd6..04d0e030febc 100644 --- a/net-im/p5-Net-ICQ2000/Makefile +++ b/net-im/p5-Net-ICQ2000/Makefile @@ -16,7 +16,6 @@ COMMENT= A perl5 module for ICQv7 protocol realisation PERL_CONFIGURE= yes -MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= Net::ICQ2000.3 .include diff --git a/net-im/p5-Net-ICQ2000/pkg-plist b/net-im/p5-Net-ICQ2000/pkg-plist index ee89d17f1a35..c12fde127c95 100644 --- a/net-im/p5-Net-ICQ2000/pkg-plist +++ b/net-im/p5-Net-ICQ2000/pkg-plist @@ -1,5 +1,5 @@ -lib/perl5/site_perl/%%PERL_VER%%/Net/ICQ2000.pm -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/ICQ2000/.packlist -@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/ICQ2000 -@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true -@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2> /dev/null || true +%%SITE_PERL%%/Net/ICQ2000.pm +%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000/.packlist +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000 +@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true +@unexec rmdir %D/%%SITE_PERL%%/Net 2> /dev/null || true diff --git a/net-im/p5-Net-Jabber/Makefile b/net-im/p5-Net-Jabber/Makefile index 2bd47716063e..456a5b8ece8a 100644 --- a/net-im/p5-Net-Jabber/Makefile +++ b/net-im/p5-Net-Jabber/Makefile @@ -15,15 +15,14 @@ PKGNAMEPREFIX= p5- MAINTAINER= erwin@FreeBSD.org COMMENT= Net::Jabber provide a Perl Developer access to the Jabber protocol -BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Stream.pm:${PORTSDIR}/textproc/p5-XML-Stream \ - ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \ - ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \ - ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time-modules +BUILD_DEPENDS= ${SITE_PERL}/XML/Stream.pm:${PORTSDIR}/textproc/p5-XML-Stream \ + ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \ + ${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \ + ${SITE_PERL}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time-modules RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes -MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= Net::Jabber.3 Net::Jabber::Client.3 Net::Jabber::Component.3 \ Net::Jabber::Data.3 Net::Jabber::Debug.3 \ Net::Jabber::Dialback.3 Net::Jabber::Dialback::Result.3 \ diff --git a/net-im/p5-Net-Jabber/pkg-plist b/net-im/p5-Net-Jabber/pkg-plist index 3c91235f8800..4ceae39c3b94 100644 --- a/net-im/p5-Net-Jabber/pkg-plist +++ b/net-im/p5-Net-Jabber/pkg-plist @@ -1,26 +1,26 @@ -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Client.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Component.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Data.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Debug.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback/Result.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback/Verify.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/IQ.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/JID.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Key.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Log.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Message.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Namespaces.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Presence.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Protocol.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Query.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Server.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/X.pm -lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/XDB.pm -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber/.packlist -@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Jabber -@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber/Dialback -@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Jabber -@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true -@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +%%SITE_PERL%%/Net/Jabber.pm +%%SITE_PERL%%/Net/Jabber/Client.pm +%%SITE_PERL%%/Net/Jabber/Component.pm +%%SITE_PERL%%/Net/Jabber/Data.pm +%%SITE_PERL%%/Net/Jabber/Debug.pm +%%SITE_PERL%%/Net/Jabber/Dialback.pm +%%SITE_PERL%%/Net/Jabber/Dialback/Result.pm +%%SITE_PERL%%/Net/Jabber/Dialback/Verify.pm +%%SITE_PERL%%/Net/Jabber/IQ.pm +%%SITE_PERL%%/Net/Jabber/JID.pm +%%SITE_PERL%%/Net/Jabber/Key.pm +%%SITE_PERL%%/Net/Jabber/Log.pm +%%SITE_PERL%%/Net/Jabber/Message.pm +%%SITE_PERL%%/Net/Jabber/Namespaces.pm +%%SITE_PERL%%/Net/Jabber/Presence.pm +%%SITE_PERL%%/Net/Jabber/Protocol.pm +%%SITE_PERL%%/Net/Jabber/Query.pm +%%SITE_PERL%%/Net/Jabber/Server.pm +%%SITE_PERL%%/Net/Jabber/X.pm +%%SITE_PERL%%/Net/Jabber/XDB.pm +%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber/.packlist +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber +@dirrm %%SITE_PERL%%/Net/Jabber/Dialback +@dirrm %%SITE_PERL%%/Net/Jabber +@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true diff --git a/net-im/vicq/Makefile b/net-im/vicq/Makefile index 5ef7fcfac345..6ba820996d4a 100644 --- a/net-im/vicq/Makefile +++ b/net-im/vicq/Makefile @@ -14,13 +14,12 @@ MAINTAINER= kevlo@FreeBSD.org COMMENT= A text-based ICQ implementation -RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu WRKSRC= ${WRKDIR}/${PORTNAME} PERL_CONFIGURE= yes -MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} post-extract: ${MV} ${WRKSRC}/Net/vICQ/* ${WRKSRC} diff --git a/net-im/vicq/pkg-plist b/net-im/vicq/pkg-plist index bd1bf6a93db3..b8b31b16b64b 100644 --- a/net-im/vicq/pkg-plist +++ b/net-im/vicq/pkg-plist @@ -1,8 +1,8 @@ bin/vicq -lib/perl5/site_perl/%%PERL_VER%%/Net/vICQ.pm -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/vICQ/.packlist +%%SITE_PERL%%/Net/vICQ.pm +%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vICQ/.packlist share/examples/vicq/vicqrc.example @dirrm share/examples/vicq -@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/vICQ -@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true -@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2> /dev/null || true +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vICQ +@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true +@unexec rmdir %D/%%SITE_PERL%%/Net 2> /dev/null || true -- cgit v1.2.3