From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 05:30:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46657299; Mon, 16 Dec 2013 05:30:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 31F13159C; Mon, 16 Dec 2013 05:30:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG5UU8O071152; Mon, 16 Dec 2013 05:30:30 GMT (envelope-from ashish@svn.freebsd.org) Received: (from ashish@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG5USiv071142; Mon, 16 Dec 2013 05:30:28 GMT (envelope-from ashish@svn.freebsd.org) Message-Id: <201312160530.rBG5USiv071142@svn.freebsd.org> From: Ashish SHUKLA Date: Mon, 16 Dec 2013 05:30:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336608 - in head/mail/opensmtpd-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 05:30:30 -0000 Author: ashish Date: Mon Dec 16 05:30:28 2013 New Revision: 336608 URL: http://svnweb.freebsd.org/changeset/ports/336608 Log: - Update to latest snapshot 201312142054 - Add STAGE support - Use OptionsNG helpers - Add OPTION for installing CA bundle Modified: head/mail/opensmtpd-devel/Makefile head/mail/opensmtpd-devel/distinfo head/mail/opensmtpd-devel/files/pkg-deinstall.in head/mail/opensmtpd-devel/files/pkg-install.in head/mail/opensmtpd-devel/pkg-descr head/mail/opensmtpd-devel/pkg-plist Modified: head/mail/opensmtpd-devel/Makefile ============================================================================== --- head/mail/opensmtpd-devel/Makefile Mon Dec 16 04:24:13 2013 (r336607) +++ head/mail/opensmtpd-devel/Makefile Mon Dec 16 05:30:28 2013 (r336608) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= opensmtpd -PORTVERSION= 201308201232 +PORTVERSION= 201312142054 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://www.opensmtpd.org/archives/ \ @@ -20,9 +20,11 @@ LIB_DEPENDS= event-1:${PORTSDIR}/devel/l OPENSMTPD_SNAPSHOT_VER= p1 -OPTIONS_DEFINE= PAM SQLITE MYSQL PGSQL LDAP +OPTIONS_DEFINE= CA_BUNDLE PAM SQLITE MYSQL PGSQL LDAP -OPTIONS_DEFAULT= PAM +OPTIONS_DEFAULT= CA_BUNDLE PAM + +CA_BUNDLE_DESC= Install CA bundle for OpenSSL GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/ \ @@ -39,58 +41,37 @@ MAN5= smtpd.conf.5 aliases.5 forward.5 USERS= _smtpd _smtpq GROUPS= _smtpd -NO_STAGE= yes -.include +OPTIONS_SUB= MYSQL SQLITE PGSQL LDAP -USE_OPENSSL= yes +CA_BUNDLE_CONFIGURE_ON= --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt +CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -CFLAGS+= -I${LOCALBASE}/include/mysql -LDFLAGS+= -L${LOCALBASE}/lib/mysql -CONFIGURE_ARGS+= --with-experimental-mysql -PLIST_SUB+= MYSQL="" -.else -PLIST_SUB+= MYSQL="@comment " -.endif +MYSQL_USE= MYSQL=yes +MYSQL_CFLAGS= -I${LOCALBASE}/include/mysql +MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql +MYSQL_CONFIGURE_ON= --with-experimental-mysql -.if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= 3 -CONFIGURE_ARGS+= --with-experimental-sqlite -PLIST_SUB+= SQLITE="" -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.else -PLIST_SUB+= SQLITE="@comment " -.endif +SQLITE_USE= SQLITE=3 +SQLITE_CFLAGS= -I${LOCALBASE}/include +SQLITE_LDFLAGS= -L${LOCALBASE}/lib +SQLITE_CONFIGURE_ON= --with-experimental-sqlite -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-experimental-postgres -PLIST_SUB+= PGSQL="" -.else -PLIST_SUB+= PGSQL="@comment " -.endif +PGSQL_USE= PGSQL=yes +PGSQL_CONFIGURE_ON= --with-experimental-postgres -.if ${PORT_OPTIONS:MLDAP} -CONFIGURE_ARGS+= --with-experimental-ldap -PLIST_SUB+= LDAP="" -.else -PLIST_SUB+= LDAP="@comment " -.endif +LDAP_CONFIGURE_ON= --with-experimental-ldap -.if ${PORT_OPTIONS:MPAM} -CONFIGURE_ARGS+= --with-pam -.endif +PAM_CONFIGURE_ON= --with-pam + +.include + +USE_OPENSSL= yes # FreeBSD 7.3 and earlier need to use OpenSSL from ports .if ${OSVERSION} < 704000 WITH_OPENSSL_PORT= yes .endif -post-install: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - post-deinstall: @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-DEINSTALL Modified: head/mail/opensmtpd-devel/distinfo ============================================================================== --- head/mail/opensmtpd-devel/distinfo Mon Dec 16 04:24:13 2013 (r336607) +++ head/mail/opensmtpd-devel/distinfo Mon Dec 16 05:30:28 2013 (r336608) @@ -1,2 +1,2 @@ -SHA256 (opensmtpd-201308201232p1.tar.gz) = 419fb0f2109ce4c155919cac163b8ac3b50578d19b723caf946a76199b636dea -SIZE (opensmtpd-201308201232p1.tar.gz) = 780516 +SHA256 (opensmtpd-201312142054p1.tar.gz) = 1ba9763825373a7fc5eb405117bfb0329cf360ea7839006632f30f144abf4e1c +SIZE (opensmtpd-201312142054p1.tar.gz) = 870900 Modified: head/mail/opensmtpd-devel/files/pkg-deinstall.in ============================================================================== --- head/mail/opensmtpd-devel/files/pkg-deinstall.in Mon Dec 16 04:24:13 2013 (r336607) +++ head/mail/opensmtpd-devel/files/pkg-deinstall.in Mon Dec 16 05:30:28 2013 (r336608) @@ -8,7 +8,7 @@ PREFIX=$(echo %%PREFIX%% |sed -e 's,/,\\ if [ "$TARGET" = POST-DEINSTALL ]; then sed -e '/[[:space:]]'$PREFIX'\/sbin\/smtpctl/d' \ -e '/[[:space:]]'$PREFIX'\/libexec\/opensmtpd\/makemap/d' \ - -e 's/^### smtpd: //g' -i '' /etc/mail/mailer.conf + -e 's/^### opensmtpd: //g' -i '' /etc/mail/mailer.conf fi exit 0 Modified: head/mail/opensmtpd-devel/files/pkg-install.in ============================================================================== --- head/mail/opensmtpd-devel/files/pkg-install.in Mon Dec 16 04:24:13 2013 (r336607) +++ head/mail/opensmtpd-devel/files/pkg-install.in Mon Dec 16 05:30:28 2013 (r336608) @@ -4,7 +4,7 @@ PKGNAME=$1 TARGET=$2 if [ "$TARGET" = POST-INSTALL ]; then - sed -e '/^[^#]/s/^/### smtpd: /g' -i '' /etc/mail/mailer.conf + sed -e '/^[^#]/s/^/### opensmtpd: /g' -i '' /etc/mail/mailer.conf cat >>/etc/mail/mailer.conf <