Date: Sat, 8 Jan 2005 16:17:25 +0100 (MET) From: "Olli Hauer" <ohauer@gmx.de> To: perl@FreeBSD.org <perl@FreeBSD.org> Cc: ports@FreeBSD.org Subject: Re: FreeBSD Port: p5-Mail-SpamAssassin-3.0.2 Message-ID: <1781.1105197445@www47.gmx.net>
next in thread | raw e-mail | index | archive | help
This is a MIME encapsulated multipart message -
please use a MIME-compliant e-mail program to open it.
Dies ist eine mehrteilige Nachricht im MIME-Format -
bitte verwenden Sie zum Lesen ein MIME-konformes Mailprogramm.
--========GMXBoundary17811105197445
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
Hello Mathieu,
i changed this, so the options for the port is also changed from
--WITH_OPENSSL=yes to --WITH_SSL
here is the new patch
----
--- Makefile~ Sat Jan 8 14:54:53 2005
+++ Makefile Sat Jan 8 16:01:37 2005
@@ -7,6 +7,7 @@
PORTNAME= Mail-SpamAssassin
PORTVERSION= 3.0.2
+PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/}
${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
MASTER_SITE_SUBDIR= spamassassin/:apache Mail/:cpan
@@ -27,11 +28,23 @@
CONTACT_ADDRESS="the administrator of that system" \
BUILD_SPAMC=yes RUN_NET_TESTS=yes
+OPTIONS= SSL "enable SSL between spamc and spamd" off \
+ MYSQL "add MySQL support" off \
+ PGSQL "add PostgreSQL support" off \
+ SPF_QUERY "add SPF query support" off
+
+.include <bsd.port.pre.mk>
+
.if defined(WITH_SPF_QUERY)
RUN_DEPENDS+= spfd:${PORTSDIR}/mail/p5-Mail-SPF-Query
.endif
-.if !defined(WITHOUT_OPENSSL)
+.if defined(WITH_SSL)
+# we need to .include bsd.openssl.mk manually here because USE_OPENSSL only
+# works when it is defined before bsd.port{.pre}.mk is .included and this
is
+# not possible when using OPTIONS
+.include
"${PORTSDIR}/Mk/bsd.openssl.mk"
+RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
USE_OPENSSL= yes
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
@@ -93,19 +106,6 @@
SED_SCRIPT+= -e 's|%%SQL%%||g'
.endif
-pre-patch:
- @${ECHO_MSG} ""
- @${ECHO_MSG}
"================================================================"
- @${ECHO_MSG} "You can use folowed options to install SpamAssassin with"
- @${ECHO_MSG} " an addition features:"
- @${ECHO_MSG} ""
- @${ECHO_MSG} "WITHOUT_SSL=yes - disable SSL,"
- @${ECHO_MSG} "WITH_MYSQL=yes - add MySQL support,"
- @${ECHO_MSG} "WITH_PGSQL=yes - add PostgreSQL support,"
- @${ECHO_MSG} "WITH_SPF_QUERY=yes - add SPF query support."
- @${ECHO_MSG}
"================================================================"
- @${ECHO_MSG} ""
-
post-patch:
@${FIND} ${WRKSRC} -name \*.orig -delete
@${SED} -e 's#B_CONFDIR)/local.cf#B_CONFDIR)/local.cf.sample#g' \
@@ -132,8 +132,6 @@
.endif
@${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
-
-.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
IGNORE= Needs perl 5.6.1 or higher, install lang/perl5.8 and try again
----
olli
> That's nice, could you change the WITH_OPENSSL to some keyworld not
> already
> registered, say, WITH_SSL, and send-pr your patch ?
>
> +-le 08/01/2005 15:50 +0100, Olli Hauer écrivait :
> | Hello,
> |
> | perhaps i found a missing modul at p5-Mail-SpamAssassin.
> |
> | The install instruction for Mail-SpamAssassin say for SSL:
> | - IO::Socket::SSL (from CPAN)
> |
> | If you wish to use SSL encryption to communicate between spamc and
> | spamd (the --ssl option to spamd), you need to install this
> | module. (You will need the OpenSSL libraries and use the
> | ENABLE_SSL="yes" argument to Makefile.PL to build and run an SSL
> | compatibile spamc.)
> |
> |
> | I have written a little patch for the Makefile and also added the
> | option dialog. One thing i could not fix is "make fetch-recursive" to
> | get all the ssl stuff for the port if ssl is enabled and "make config"
> | was not executed before -> so i switch this off.
> |
> | here is my patch (i hope you like it).
> | ----
> |
> | --- Makefile~ Sat Jan 8 14:54:53 2005
> | +++ Makefile Sat Jan 8 15:18:46 2005
> | @@ -7,6 +7,7 @@
> |
> | PORTNAME= Mail-SpamAssassin
> | PORTVERSION= 3.0.2
> | +PORTREVISION= 1
> | CATEGORIES= mail perl5
> | MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/}
> | ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
> | MASTER_SITE_SUBDIR= spamassassin/:apache Mail/:cpan
> | @@ -27,11 +28,23 @@
> | CONTACT_ADDRESS="the administrator of that system" \
> | BUILD_SPAMC=yes RUN_NET_TESTS=yes
> |
> | +OPTIONS= OPENSSL "enable SSL between spamc and spamd" off \
> | + MYSQL "add MySQL support" off \
> | + PGSQL "add PostgreSQL support" off \
> | + SPF_QUERY "add SPF query support" off
> | +
> | +.include <bsd.port.pre.mk>
> | +
> | .if defined(WITH_SPF_QUERY)
> | RUN_DEPENDS+= spfd:${PORTSDIR}/mail/p5-Mail-SPF-Query
> | .endif
> |
> | -.if !defined(WITHOUT_OPENSSL)
> | +.if defined(WITH_OPENSSL)
> | +# we need to .include bsd.openssl.mk manually here because USE_OPENSSL
> only
> | +# works when it is defined before bsd.port{.pre}.mk is .included and
> this
> | is
> | +# not possible when using OPTIONS
> | +.include
> | "${PORTSDIR}/Mk/bsd.openssl.mk"
> | +RUN_DEPENDS+=
> | ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
> | USE_OPENSSL= yes
> | CFLAGS+= -I${OPENSSLINC}
> | LDFLAGS+= -L${OPENSSLLIB}
> | @@ -93,19 +106,6 @@
> | SED_SCRIPT+= -e 's|%%SQL%%||g'
> | .endif
> |
> | -pre-patch:
> | - @${ECHO_MSG} ""
> | - @${ECHO_MSG}
> | "================================================================"
> | - @${ECHO_MSG} "You can use folowed options to install SpamAssassin
> with"
> | - @${ECHO_MSG} " an addition features:"
> | - @${ECHO_MSG} ""
> | - @${ECHO_MSG} "WITHOUT_SSL=yes - disable SSL,"
> | - @${ECHO_MSG} "WITH_MYSQL=yes - add MySQL support,"
> | - @${ECHO_MSG} "WITH_PGSQL=yes - add PostgreSQL support,"
> | - @${ECHO_MSG} "WITH_SPF_QUERY=yes - add SPF query support."
> | - @${ECHO_MSG}
> | "================================================================"
> | - @${ECHO_MSG} ""
> | -
> | post-patch:
> | @${FIND} ${WRKSRC} -name \*.orig -delete
> | @${SED} -e 's#B_CONFDIR)/local.cf#B_CONFDIR)/local.cf.sample#g' \
> | @@ -132,8 +132,6 @@
> |
> | .endif
> | @${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
> | -
> | -.include <bsd.port.pre.mk>
> |
> |
> | ----
> | olli
>
>
>
> --
> Mathieu Arnold
>
--
+++ Sparen Sie mit GMX DSL +++ http://www.gmx.net/de/go/dsl
AKTION für Wechsler: DSL-Tarife ab 3,99 EUR/Monat + Startguthaben
--========GMXBoundary17811105197445
Content-Type: application/octet-stream;
name="patch-p5-Mail-SpamAssassin-3.0.2-options2"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="patch-p5-Mail-SpamAssassin-3.0.2-options2"
LS0tIE1ha2VmaWxlfglTYXQgSmFuICA4IDE0OjU0OjUzIDIwMDUNCisrKyBNYWtlZmlsZQlTYXQg
SmFuICA4IDE2OjAxOjM3IDIwMDUNCkBAIC03LDYgKzcsNyBAQA0KIA0KIFBPUlROQU1FPQlNYWls
LVNwYW1Bc3Nhc3Npbg0KIFBPUlRWRVJTSU9OPQkzLjAuMg0KK1BPUlRSRVZJU0lPTj0JMQ0KIENB
VEVHT1JJRVM9CW1haWwgcGVybDUNCiBNQVNURVJfU0lURVM9CSR7TUFTVEVSX1NJVEVfQVBBQ0hF
OlMvJC86YXBhY2hlL30gJHtNQVNURVJfU0lURV9QRVJMX0NQQU46Uy8kLzpjcGFuL30NCiBNQVNU
RVJfU0lURV9TVUJESVI9CXNwYW1hc3Nhc3Npbi86YXBhY2hlIE1haWwvOmNwYW4NCkBAIC0yNywx
MSArMjgsMjMgQEANCiAJICAgICAgIAlDT05UQUNUX0FERFJFU1M9InRoZSBhZG1pbmlzdHJhdG9y
IG9mIHRoYXQgc3lzdGVtIiBcDQogCQlCVUlMRF9TUEFNQz15ZXMgUlVOX05FVF9URVNUUz15ZXMN
CiANCitPUFRJT05TPQlTU0wJCSJlbmFibGUgU1NMIGJldHdlZW4gc3BhbWMgYW5kIHNwYW1kIglv
ZmYgXA0KKwkJTVlTUUwJCSJhZGQgTXlTUUwgc3VwcG9ydCIJCQlvZmYgXA0KKwkJUEdTUUwJCSJh
ZGQgUG9zdGdyZVNRTCBzdXBwb3J0IgkJb2ZmIFwNCisJCVNQRl9RVUVSWQkiYWRkIFNQRiBxdWVy
eSBzdXBwb3J0IgkJCW9mZg0KKw0KKy5pbmNsdWRlIDxic2QucG9ydC5wcmUubWs+DQorDQogLmlm
IGRlZmluZWQoV0lUSF9TUEZfUVVFUlkpDQogUlVOX0RFUEVORFMrPQlzcGZkOiR7UE9SVFNESVJ9
L21haWwvcDUtTWFpbC1TUEYtUXVlcnkNCiAuZW5kaWYNCiANCi0uaWYgIWRlZmluZWQoV0lUSE9V
VF9PUEVOU1NMKQ0KKy5pZiBkZWZpbmVkKFdJVEhfU1NMKQ0KKyMgd2UgbmVlZCB0byAuaW5jbHVk
ZSBic2Qub3BlbnNzbC5tayBtYW51YWxseSBoZXJlIGJlY2F1c2UgVVNFX09QRU5TU0wgb25seQ0K
KyMgd29ya3Mgd2hlbiBpdCBpcyBkZWZpbmVkIGJlZm9yZSBic2QucG9ydHsucHJlfS5tayBpcyAu
aW5jbHVkZWQgYW5kIHRoaXMgaXMNCisjIG5vdCBwb3NzaWJsZSB3aGVuIHVzaW5nIE9QVElPTlMN
CisuaW5jbHVkZSAiJHtQT1JUU0RJUn0vTWsvYnNkLm9wZW5zc2wubWsiDQorUlVOX0RFUEVORFMr
PQkke1NJVEVfUEVSTH0vSU8vU29ja2V0L1NTTC5wbToke1BPUlRTRElSfS9zZWN1cml0eS9wNS1J
Ty1Tb2NrZXQtU1NMDQogVVNFX09QRU5TU0w9CXllcw0KIENGTEFHUys9CS1JJHtPUEVOU1NMSU5D
fQ0KIExERkxBR1MrPQktTCR7T1BFTlNTTExJQn0NCkBAIC05MywxOSArMTA2LDYgQEANCiBTRURf
U0NSSVBUKz0JLWUgJ3N8JSVTUUwlJXx8ZycNCiAuZW5kaWYNCiANCi1wcmUtcGF0Y2g6DQotCUAk
e0VDSE9fTVNHfSAiIg0KLQlAJHtFQ0hPX01TR30gIj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0iDQotCUAke0VDSE9fTVNHfSAi
WW91IGNhbiB1c2UgZm9sb3dlZCBvcHRpb25zIHRvIGluc3RhbGwgU3BhbUFzc2Fzc2luIHdpdGgi
DQotCUAke0VDSE9fTVNHfSAiCWFuIGFkZGl0aW9uIGZlYXR1cmVzOiINCi0JQCR7RUNIT19NU0d9
ICIiDQotCUAke0VDSE9fTVNHfSAiV0lUSE9VVF9TU0w9eWVzCSAtIGRpc2FibGUgU1NMLCINCi0J
QCR7RUNIT19NU0d9ICJXSVRIX01ZU1FMPXllcwkgLSBhZGQgTXlTUUwgc3VwcG9ydCwiDQotCUAk
e0VDSE9fTVNHfSAiV0lUSF9QR1NRTD15ZXMJIC0gYWRkIFBvc3RncmVTUUwgc3VwcG9ydCwiDQot
CUAke0VDSE9fTVNHfSAiV0lUSF9TUEZfUVVFUlk9eWVzIC0gYWRkIFNQRiBxdWVyeSBzdXBwb3J0
LiINCi0JQCR7RUNIT19NU0d9ICI9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ig0KLQlAJHtFQ0hPX01TR30gIiINCi0NCiBwb3N0
LXBhdGNoOg0KIAlAJHtGSU5EfSAke1dSS1NSQ30gLW5hbWUgXCoub3JpZyAtZGVsZXRlDQogCUAk
e1NFRH0gLWUgJ3MjQl9DT05GRElSKS9sb2NhbC5jZiNCX0NPTkZESVIpL2xvY2FsLmNmLnNhbXBs
ZSNnJyBcDQpAQCAtMTMyLDggKzEzMiw2IEBADQogDQogLmVuZGlmDQogCUAke1NFRH0gLWUgJ3Mj
UFJFRklYIyR7UFJFRklYfSMnICR7UEtHTUVTU0FHRX0NCi0NCi0uaW5jbHVkZSA8YnNkLnBvcnQu
cHJlLm1rPg0KIA0KIC5pZiAke1BFUkxfTEVWRUx9IDwgNTAwNjAwDQogSUdOT1JFPQlOZWVkcyBw
ZXJsIDUuNi4xIG9yIGhpZ2hlciwgaW5zdGFsbCBsYW5nL3Blcmw1LjggYW5kIHRyeSBhZ2Fpbg0K
--========GMXBoundary17811105197445--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1781.1105197445>