Attachment #75819 for bug #109434





PORTNAME=	Mail-SpamAssassin
PORTVERSION=	3.1.8
PORTREVISION=	1
CATEGORIES=	mail perl5
MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan

.endif

.if !defined(WITHOUT_GNUPG)
RUN_DEPENDS+=	gnupg>=1.4.1:${PORTSDIR}/security/gnupg
.endif

.if defined(WITH_MYSQL)

RUN_DEPENDS+=	${SITE_PERL}/Mail/DKIM.pm:${PORTSDIR}/mail/p5-Mail-DKIM
.endif

.if defined(WITH_DOMAINKEYS)
RUN_DEPENDS+=	p5-Mail-DomainKeys>=0.80:${PORTSDIR}/mail/p5-Mail-DomainKeys
.endif


		-e 's#B_CONFDIR)/v312.pre#B_CONFDIR)/v312.pre.sample#g' \
		-e 's/require DBI/0/' \
		${WRKSRC}/Makefile.PL
# I cant' seem to get these to work, patches or suggestions welcome
.if defined(WITH_RAZOR)
	${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre
.endif
.if defined(WITH_DOMAINKEYS)
	${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
.endif
.if defined(WITH_RELAY_COUNTRY)
	${REINPLACE_CMD} -e '/RelayCountry/s/^# ?loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre
.endif
.if defined(WITH_DKIM)
	${REINPLACE_CMD} -e '/DKIM/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre
.endif
.if !defined(WITH_SPF_QUERY)
	${REINPLACE_CMD} -e '/SPF/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/init.pre
.endif
.if defined(WITH_DCC)
	${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
.endif

pre-install:




--- sa-learn.raw	(revision 507745)
+++ sa-learn.raw	(working copy)
@@ -402,7 +402,10 @@
 
     # make sure the target list is in the normal AI format
     if ($targets[$elem] !~ /^[^:]*:[a-z]+:/) {
-      $targets[$elem] = target($targets[$elem]);
+      my $item = splice @targets, $elem, 1;
+      $elem--; # go back to this element again
+      target($item); # add back to the list
+      next;
     }
   }


Return to bug 109434

Lines 7-12 Link Here

(-)p5-Mail-SpamAssassin/Makefile (-4 / +15 lines)
7		7
8	PORTNAME= Mail-SpamAssassin	8	PORTNAME= Mail-SpamAssassin
9	PORTVERSION= 3.1.8	9	PORTVERSION= 3.1.8
		10	PORTREVISION= 1
10	CATEGORIES= mail perl5	11	CATEGORIES= mail perl5
11	MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}	12	MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
12	MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan	13	MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan
Lines 61-67 Link Here
61	.endif	62	.endif
62		63
63	.if !defined(WITHOUT_GNUPG)	64	.if !defined(WITHOUT_GNUPG)
64	RUN_DEPENDS+= gpgv:${PORTSDIR}/security/gnupg1	65	RUN_DEPENDS+= gnupg>=1.4.1:${PORTSDIR}/security/gnupg
65	.endif	66	.endif
66		67
67	.if defined(WITH_MYSQL)	68	.if defined(WITH_MYSQL)
Lines 80-86 Link Here
80	RUN_DEPENDS+= ${SITE_PERL}/Mail/DKIM.pm:${PORTSDIR}/mail/p5-Mail-DKIM	81	RUN_DEPENDS+= ${SITE_PERL}/Mail/DKIM.pm:${PORTSDIR}/mail/p5-Mail-DKIM
81	.endif	82	.endif
82		83
83	.if defined(WITH_DOMAINKEYS) \|\| defined(WITH_DKIM)	84	.if defined(WITH_DOMAINKEYS)
84	RUN_DEPENDS+= p5-Mail-DomainKeys>=0.80:${PORTSDIR}/mail/p5-Mail-DomainKeys	85	RUN_DEPENDS+= p5-Mail-DomainKeys>=0.80:${PORTSDIR}/mail/p5-Mail-DomainKeys
85	.endif	86	.endif
86		87
Lines 184-197 Link Here
184	-e 's#B_CONFDIR)/v312.pre#B_CONFDIR)/v312.pre.sample#g' \	185	-e 's#B_CONFDIR)/v312.pre#B_CONFDIR)/v312.pre.sample#g' \
185	-e 's/require DBI/0/' \	186	-e 's/require DBI/0/' \
186	${WRKSRC}/Makefile.PL	187	${WRKSRC}/Makefile.PL
		188	# I cant' seem to get these to work, patches or suggestions welcome
187	.if defined(WITH_RAZOR)	189	.if defined(WITH_RAZOR)
188	${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre	190	${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre
189	.endif	191	.endif
190	.if defined(WITH_DOMAINKEYS)	192	.if defined(WITH_DOMAINKEYS)
191	${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre	193	${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
192	.endif	194	.endif
193	.if defined(WITH_RELAY_COUNTRY)	195	.if defined(WITH_RELAY_COUNTRY)
194	${REINPLACE_CMD} -e '/RelayCountry/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre	196	${REINPLACE_CMD} -e '/RelayCountry/s/^# ?loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre
		197	.endif
		198	.if defined(WITH_DKIM)
		199	${REINPLACE_CMD} -e '/DKIM/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre
		200	.endif
		201	.if !defined(WITH_SPF_QUERY)
		202	${REINPLACE_CMD} -e '/SPF/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/init.pre
		203	.endif
		204	.if defined(WITH_DCC)
		205	${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
195	.endif	206	.endif
196		207
197	pre-install:	208	pre-install:

Line 0 Link Here

(-)p5-Mail-SpamAssassin/files/patch-sa-learn-raw (+14 lines)
	1	--- sa-learn.raw (revision 507745)
	2	+++ sa-learn.raw (working copy)
	3	@@ -402,7 +402,10 @@
	4
	5	# make sure the target list is in the normal AI format
	6	if ($targets[$elem] !~ /^[^:]*:[a-z]+:/) {
	7	- $targets[$elem] = target($targets[$elem]);
	8	+ my $item = splice @targets, $elem, 1;
	9	+ $elem--; # go back to this element again
	10	+ target($item); # add back to the list
	11	+ next;
	12	}
	13	}
	14