View | Details | Raw Unified | Return to bug 52279 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-5 / +12 lines)
Lines 6-15 Link Here
6
#
6
#
7
7
8
PORTNAME=		CClient
8
PORTNAME=		CClient
9
PORTVERSION=		1.1
9
PORTVERSION=		1.8
10
CATEGORIES=		mail perl5
10
CATEGORIES=		mail perl5
11
MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
11
MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
12
MASTER_SITE_SUBDIR=	Mail
12
MASTER_SITE_SUBDIR=	Mail/HDIAS
13
PKGNAMEPREFIX=		p5-
13
PKGNAMEPREFIX=		p5-
14
DISTNAME=		Mail-Cclient-${PORTVERSION}
14
DISTNAME=		Mail-Cclient-${PORTVERSION}
15
15
Lines 19-28 Link Here
19
LIB_DEPENDS=		c-client4.8:${PORTSDIR}/mail/cclient
19
LIB_DEPENDS=		c-client4.8:${PORTSDIR}/mail/cclient
20
20
21
PERL_CONFIGURE=		yes
21
PERL_CONFIGURE=		yes
22
CONFIGURE_ARGS=		INC="-I${PREFIX}/include/c-client" \
22
CONFIGURE_ARGS=		--cclient_dir=${LOCALBASE} \
23
			LIBS="-L${PREFIX}/lib -lc-client4"
23
		 	--with-shared_cclient \
24
			--with-pam \
25
			--with-cclient-includes=${LOCALBASE}/include/c-client
24
26
25
MANPREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
26
MAN3=			Mail::Cclient.3
27
MAN3=			Mail::Cclient.3
28
29
post-patch:
30
	@${PERL} -pi -e 's/-lc-client/-lc-client4/g;' \
31
		     -e 's/"-lc"/"-L\$$CCLIENT_DIR\/lib "/g;' \
32
		     -e 's/ -lpam_misc//g;' \
33
		 ${WRKSRC}/Makefile.PL
27
34
28
.include <bsd.port.mk>
35
.include <bsd.port.mk>
(-)distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (Mail-Cclient-1.1.tar.gz) = 3966b181ec635de962e49b252f142d0c
1
MD5 (Mail-Cclient-1.8.tar.gz) = 684166ae817f3509a1b8da98c25d84b7
(-)pkg-descr (+2 lines)
Lines 6-8 Link Here
6
6
7
  -Kelly
7
  -Kelly
8
   kbyanc@posi.net
8
   kbyanc@posi.net
9
10
WWW: http://search.cpan.org/dist/Mail-Cclient/
(-)pkg-plist (-7 / +8 lines)
Lines 1-7 Link Here
1
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mail/Cclient.pm
1
%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Cclient.pm
2
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Cclient/Cclient.so
2
%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Cclient.pod
3
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Cclient/Cclient.bs
3
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cclient/.packlist
4
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Cclient/.packlist
4
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cclient/Cclient.bs
5
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Cclient
5
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cclient/Cclient.so
6
@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
6
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cclient
7
@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
7
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
8
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail 2>/dev/null || true
(-)files/patch-aa (-51 lines)
Removed Link Here
1
--- Makefile.PL.orig	Mon Jun  7 19:59:14 1999
2
+++ Makefile.PL	Thu May 10 06:53:52 2001
3
@@ -1,45 +1,10 @@
4
 use ExtUtils::MakeMaker;
5
 
6
-if (shift(@ARGV) =~ /CCLIENT_DIR=(.*)/) {
7
-    $CCLIENT_DIR = $1;
8
-} else {
9
-    die "You need to specify the CCLIENT_DIR directory--read README\n";
10
-}
11
-
12
-if (! -r "$CCLIENT_DIR/c-client.a") {
13
-    die "CCLIENT_DIR $CCLIENT_DIR does not contain c-client.a\n";
14
-}
15
-#
16
-# We want to turn Cclient.o (ours) plus the object files in the
17
-# $CCLIENT_DIR/c-client.a archive into a shared object. Simply
18
-# including both in the MakeMaker OBJECT list works fine for Linux
19
-# but under Digital UNIX, the combination of its ar and "ld -shared"
20
-# can't cope with simply "ar cr tmp.a Cclient.o .../c-client.a".
21
-# To get around that look at the contents of the c-client.a archive
22
-# and extract all .o files from it into the current directory. Then
23
-# we set OBJECT to be our Cclient.o plus all of those. Blech.
24
-#
25
-
26
-print "Examining archive file $CCLIENT_DIR/c-client.a...\n";
27
-chomp(@contents = `ar t $CCLIENT_DIR/c-client.a`);
28
-@objects = grep(/\.o$/, @contents);
29
-print "Extracting object files from archive: ", join(", ", @objects), "\n";
30
-system("ar", "x", "$CCLIENT_DIR/c-client.a", @objects);
31
-my $err = $? >> 8;
32
-if ($err) {
33
-    print "Extraction failed: ar returned exit code $err\n",
34
-	  "Please extract them manually into the current directory\n",
35
-	  "edit Makefile.PL to remove this section of code and then rerun\n",
36
-	  "    perl Makefile.PL\n";
37
-    exit 1;
38
-}
39
-print "Extraction was apparently successful\n";
40
-
41
 WriteMakefile(
42
     NAME		=> "Mail::Cclient",
43
     VERSION_FROM	=> "Cclient.pm",
44
-    INC			=> "-I$CCLIENT_DIR",
45
-    LIBS		=> ["-lc"],
46
-    OBJECT		=> "Cclient.o @objects"
47
+    INC			=> "-I\${PREFIX}/include/c-client",
48
+    LIBS		=> "-L\${PREFIX}/lib -lc-client4",
49
+    OBJECT		=> "Cclient.o"
50
 );
51
 

Return to bug 52279