Date: Thu, 15 May 2003 15:30:01 +0200 (CEST) From: Mathieu Arnold <m@absolight.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kbyanc@posi.net Subject: ports/52279: (update) mail/p5-Mail-CClient to 1.7 Message-ID: <20030515133001.7C05F81FE@aragorn.reaumur.absolight.net> Resent-Message-ID: <200305151330.h4FDUGaw094922@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 52279
>Category: ports
>Synopsis: (update) mail/p5-Mail-CClient to 1.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu May 15 06:30:15 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Mathieu Arnold
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.reaumur.absolight.net 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Thu Apr 10 13:45:07 CEST 2003 root@aragorn.reaumur.absolight.net:/usr/obj/usr/src/sys/ARAGORN i386
>Description:
Update to 1.7
>How-To-Repeat:
>Fix:
The patch was old and not correct.
I replaced it with a post-patch substitution.
--- p5-CClient-1.7.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/p5-Mail-CClient/Makefile,v
retrieving revision 1.6
diff -u -b -w -r1.6 Makefile
--- Makefile 2003/03/07 06:05:55 1.6
+++ Makefile 2003/05/15 13:26:53
@@ -6,10 +6,10 @@
#
PORTNAME= CClient
-PORTVERSION= 1.1
+PORTVERSION= 1.7
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITE_SUBDIR= Mail/HDIAS
PKGNAMEPREFIX= p5-
DISTNAME= Mail-Cclient-${PORTVERSION}
@@ -19,10 +19,17 @@
LIB_DEPENDS= c-client4.8:${PORTSDIR}/mail/cclient
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INC="-I${PREFIX}/include/c-client" \
- LIBS="-L${PREFIX}/lib -lc-client4"
+CONFIGURE_ARGS= --cclient_dir=${LOCALBASE} \
+ --with-shared_cclient \
+ --with-pam \
+ --with-cclient-includes=${LOCALBASE}/include/c-client
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Mail::Cclient.3
+
+post-patch:
+ @${PERL} -pi -e 's/-lc-client/-lc-client4/g;' \
+ -e 's/"-lc"/"-L\$$CCLIENT_DIR\/lib "/g;' \
+ -e 's/ -lpam_misc//g;' \
+ ${WRKSRC}/Makefile.PL
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/p5-Mail-CClient/distinfo,v
retrieving revision 1.2
diff -u -b -w -r1.2 distinfo
--- distinfo 2001/05/20 02:19:10 1.2
+++ distinfo 2003/05/15 13:26:53
@@ -1 +1 @@
-MD5 (Mail-Cclient-1.1.tar.gz) = 3966b181ec635de962e49b252f142d0c
+MD5 (Mail-Cclient-1.7.tar.gz) = 7ea50cdde187df281e85c7732d03c592
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/mail/p5-Mail-CClient/pkg-descr,v
retrieving revision 1.1.1.1
diff -u -b -w -r1.1.1.1 pkg-descr
--- pkg-descr 2000/07/14 09:39:55 1.1.1.1
+++ pkg-descr 2003/05/15 13:26:53
@@ -6,3 +6,5 @@
-Kelly
kbyanc@posi.net
+
+WWW: http://search.cpan.org/dist/Mail-Cclient/
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/p5-Mail-CClient/pkg-plist,v
retrieving revision 1.3
diff -u -b -w -r1.3 pkg-plist
--- pkg-plist 2001/05/20 02:19:10 1.3
+++ pkg-plist 2003/05/15 13:26:53
@@ -1,7 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mail/Cclient.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Cclient/Cclient.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Cclient/Cclient.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Cclient/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Cclient
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Cclient.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Cclient.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cclient/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cclient/Cclient.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cclient/Cclient.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cclient
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail 2>/dev/null || true
Index: files/patch-aa
===================================================================
RCS file: patch-aa
diff -N patch-aa
--- /cvstmp/cvsCtppz9GS0M Thu May 15 08:26:53 2003
+++ /dev/null Thu May 15 03:22:21 2003
@@ -1,51 +0,0 @@
---- Makefile.PL.orig Mon Jun 7 19:59:14 1999
-+++ Makefile.PL Thu May 10 06:53:52 2001
-@@ -1,45 +1,10 @@
- use ExtUtils::MakeMaker;
-
--if (shift(@ARGV) =~ /CCLIENT_DIR=(.*)/) {
-- $CCLIENT_DIR = $1;
--} else {
-- die "You need to specify the CCLIENT_DIR directory--read README\n";
--}
--
--if (! -r "$CCLIENT_DIR/c-client.a") {
-- die "CCLIENT_DIR $CCLIENT_DIR does not contain c-client.a\n";
--}
--#
--# We want to turn Cclient.o (ours) plus the object files in the
--# $CCLIENT_DIR/c-client.a archive into a shared object. Simply
--# including both in the MakeMaker OBJECT list works fine for Linux
--# but under Digital UNIX, the combination of its ar and "ld -shared"
--# can't cope with simply "ar cr tmp.a Cclient.o .../c-client.a".
--# To get around that look at the contents of the c-client.a archive
--# and extract all .o files from it into the current directory. Then
--# we set OBJECT to be our Cclient.o plus all of those. Blech.
--#
--
--print "Examining archive file $CCLIENT_DIR/c-client.a...\n";
--chomp(@contents = `ar t $CCLIENT_DIR/c-client.a`);
--@objects = grep(/\.o$/, @contents);
--print "Extracting object files from archive: ", join(", ", @objects), "\n";
--system("ar", "x", "$CCLIENT_DIR/c-client.a", @objects);
--my $err = $? >> 8;
--if ($err) {
-- print "Extraction failed: ar returned exit code $err\n",
-- "Please extract them manually into the current directory\n",
-- "edit Makefile.PL to remove this section of code and then rerun\n",
-- " perl Makefile.PL\n";
-- exit 1;
--}
--print "Extraction was apparently successful\n";
--
- WriteMakefile(
- NAME => "Mail::Cclient",
- VERSION_FROM => "Cclient.pm",
-- INC => "-I$CCLIENT_DIR",
-- LIBS => ["-lc"],
-- OBJECT => "Cclient.o @objects"
-+ INC => "-I\${PREFIX}/include/c-client",
-+ LIBS => "-L\${PREFIX}/lib -lc-client4",
-+ OBJECT => "Cclient.o"
- );
-
--- p5-CClient-1.7.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030515133001.7C05F81FE>