Subject: Re: pkg/29504: mail/ssmtp fixes / enhancements
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Jukka Salmi <j+nbsd@2005.salmi.ch>
List: pkgsrc-bugs
Date: 02/22/2005 11:36:01
The following reply was made to PR pkg/29504; it has been noted by GNATS.
From: Jukka Salmi <j+nbsd@2005.salmi.ch>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/29504: mail/ssmtp fixes / enhancements
Date: Tue, 22 Feb 2005 12:35:01 +0100
--jI8keyz6grp/JLjh
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
j+nbsd@2005.salmi.ch --> pkgsrc-bugs (2005-02-22 11:32:00 +0000):
> >Fix:
> I'll append a patch to this PR which fixes the bug and adds the options
> framework soon.
Here it is.
--
bashian roulette:
$ ((RANDOM%6)) || rm -rf ~
--jI8keyz6grp/JLjh
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="ssmtp.options.patch"
diff -ru pkgsrc/mail/ssmtp.orig/Makefile pkgsrc/mail/ssmtp/Makefile
--- pkgsrc/mail/ssmtp.orig/Makefile 2005-02-22 08:50:43.000000000 +0100
+++ pkgsrc/mail/ssmtp/Makefile 2005-02-22 11:53:01.000000000 +0100
@@ -22,13 +22,26 @@
USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --enable-ssl
-.include "../../mk/bsd.prefs.mk"
-.if !empty(USE_INET6:M[Yy][Ee][Ss])
+PKG_OPTIONS_VAR= PKG_OPTIONS.ssmtp
+PKG_SUPPORTED_OPTIONS= inet6 ssl
+
+.if !defined(PKG_OPTIONS.ssmtp)
+PKG_DEFAULT_OPTIONS+= ssl
+.endif
+
+.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
+
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
PKG_SYSCONFSUBDIR= ${PKGBASE}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
@@ -62,5 +75,4 @@
${INSTALL_DATA} ${WRKSRC}/revaliases ${EGDIR}
${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR}
-.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
--jI8keyz6grp/JLjh--