pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/ssmtp SSL support is now optional via options.mk;...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/71e1aed87690
branches:  trunk
changeset: 490384:71e1aed87690
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Mar 08 09:33:19 2005 +0000

description:
SSL support is now optional via options.mk; config files are installed correctly (Fix PR#29504)

diffstat:

 mail/ssmtp/Makefile   |  18 ++++++------------
 mail/ssmtp/options.mk |  16 ++++++++++++++++
 2 files changed, 22 insertions(+), 12 deletions(-)

diffs (62 lines):

diff -r a19853eb2c02 -r 71e1aed87690 mail/ssmtp/Makefile
--- a/mail/ssmtp/Makefile       Tue Mar 08 09:07:02 2005 +0000
+++ b/mail/ssmtp/Makefile       Tue Mar 08 09:33:19 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/10/22 14:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/03/08 09:33:19 adam Exp $
 # FreeBSD Id: ports/mail/ssmtp/Makefile,v 1.10 2003/04/14 08:41:04 leeym Exp
 #
 # TLS functionality needs testing. Please let me know the result,
@@ -17,21 +17,16 @@
 COMMENT=       Extremely simple MTA to forward mail to a mail hub
 
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV:S/.orig$//}
-USE_BUILDLINK3=                YES
-USE_PKGINSTALL=                YES
-
+USE_BUILDLINK3=                yes
 USE_GNU_TOOLS+=                make
-GNU_CONFIGURE=         YES
-CONFIGURE_ARGS+=       --enable-ssl
+USE_PKGINSTALL=                yes
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
 
-.include "../../mk/bsd.prefs.mk"
-.if !empty(USE_INET6:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=       --enable-inet6
-.endif
+.include "options.mk"
 
 PKG_SYSCONFSUBDIR=     ${PKGBASE}
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
-
 CONF_FILES=    ${EGDIR}/ssmtp.conf ${PKG_SYSCONFDIR}/ssmtp.conf
 CONF_FILES+=   ${EGDIR}/revaliases ${PKG_SYSCONFDIR}/revaliases
 
@@ -62,5 +57,4 @@
        ${INSTALL_DATA} ${WRKSRC}/revaliases ${EGDIR}
        ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR}
 
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a19853eb2c02 -r 71e1aed87690 mail/ssmtp/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/ssmtp/options.mk     Tue Mar 08 09:33:19 2005 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2005/03/08 09:33:19 adam Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.ssmtp
+PKG_DEFAULT_OPTIONS=   ssl
+PKG_SUPPORTED_OPTIONS= inet6 ssl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --enable-inet6
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=       --enable-ssl
+.include "../../security/openssl/buildlink3.mk"
+.endif



Home | Main Index | Thread Index | Old Index