From owner-svn-ports-all@FreeBSD.ORG Wed Jan 16 18:49:51 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DCA1AE29; Wed, 16 Jan 2013 18:49:51 +0000 (UTC) (envelope-from glarkin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C45EA292; Wed, 16 Jan 2013 18:49:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0GInp8H017023; Wed, 16 Jan 2013 18:49:51 GMT (envelope-from glarkin@svn.freebsd.org) Received: (from glarkin@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0GInpNT017016; Wed, 16 Jan 2013 18:49:51 GMT (envelope-from glarkin@svn.freebsd.org) Message-Id: <201301161849.r0GInpNT017016@svn.freebsd.org> From: Greg Larkin Date: Wed, 16 Jan 2013 18:49:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310509 - in head/mail/nullmailer: . 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2013 18:49:51 -0000 Author: glarkin Date: Wed Jan 16 18:49:50 2013 New Revision: 310509 URL: http://svnweb.freebsd.org/changeset/ports/310509 Log: - Updated 1.11 - Added support for GNU TLS - Converted to OptionsNG - Trimmed Makefile header PR: ports/173263 Submitted by: Ilya Skalozubov Modified: head/mail/nullmailer/Makefile head/mail/nullmailer/distinfo head/mail/nullmailer/files/patch-src-Makefile.in head/mail/nullmailer/pkg-plist Modified: head/mail/nullmailer/Makefile ============================================================================== --- head/mail/nullmailer/Makefile Wed Jan 16 18:15:33 2013 (r310508) +++ head/mail/nullmailer/Makefile Wed Jan 16 18:49:50 2013 (r310509) @@ -1,13 +1,8 @@ -# Ports collection makefile for: nullmailer -# Date created: Tue Jan 30 2001 -# Whom: clive -# +# Created by: clive # $FreeBSD$ -# PORTNAME= nullmailer -PORTVERSION= 1.05 -PORTREVISION= 4 +PORTVERSION= 1.11 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://untroubled.org/nullmailer/ \ @@ -17,6 +12,8 @@ MASTER_SITE_SUBDIR= ${PORTVERSION} MAINTAINER= glarkin@FreeBSD.org COMMENT= MTA for hosts which relay to a fixed set of smart relays +LICENSE= GPLv2 + LOCALSTATEDIR= /var/spool .if defined(MAINTAINER_MODE) @@ -28,10 +25,8 @@ GROUPS= nullmail NULLMAIL_UID= 522 NULLMAIL_GID= 522 -LICENSE= GPLv2 - GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} +CONFIGURE_ARGS+=--localstatedir=${LOCALSTATEDIR} USE_SUBMAKE= yes @@ -47,6 +42,21 @@ MAN1= nullmailer-inject.1 sendmail.1 MAN7= nullmailer.7 MAN8= nullmailer-queue.8 nullmailer-send.8 + +OPTIONS_DEFINE= GNUTLS + +.include + +.if ${PORT_OPTIONS:MGNUTLS} +LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lgnutls +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS+=--enable-tls +.else +CONFIGURE_ARGS+=--disable-tls +.endif + post-install: @cd ${WRKSRC} && ${MAKE} install-root Modified: head/mail/nullmailer/distinfo ============================================================================== --- head/mail/nullmailer/distinfo Wed Jan 16 18:15:33 2013 (r310508) +++ head/mail/nullmailer/distinfo Wed Jan 16 18:49:50 2013 (r310509) @@ -1,2 +1,2 @@ -SHA256 (nullmailer-1.05.tar.gz) = 90356ed2bd95eef09ed04713fdef1f81c1ab95e02eee333a96a8e3eb230cac2f -SIZE (nullmailer-1.05.tar.gz) = 176800 +SHA256 (nullmailer-1.11.tar.gz) = bf61c839b5f0927e0998c6183f229fa644f97165d3d5402adc59369b2bdaf25e +SIZE (nullmailer-1.11.tar.gz) = 203239 Modified: head/mail/nullmailer/files/patch-src-Makefile.in ============================================================================== --- head/mail/nullmailer/files/patch-src-Makefile.in Wed Jan 16 18:15:33 2013 (r310508) +++ head/mail/nullmailer/files/patch-src-Makefile.in Wed Jan 16 18:49:50 2013 (r310509) @@ -1,13 +1,14 @@ --- src/Makefile.in.orig 2007-10-09 19:23:25.000000000 -0400 +++ src/Makefile.in 2009-08-11 17:24:28.000000000 -0400 -@@ -30,9 +30,9 @@ +@@ -30,10 +30,9 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : --bin_PROGRAMS = mailq$(EXEEXT) nullmailer-inject$(EXEEXT) +-bin_PROGRAMS = mailq$(EXEEXT) nullmailer-inject$(EXEEXT) \ +- nullmailer-smtpd$(EXEEXT) -sbin_PROGRAMS = nullmailer-queue$(EXEEXT) nullmailer-send$(EXEEXT) \ - sendmail$(EXEEXT) -+bin_PROGRAMS = nullmailer-inject$(EXEEXT) ++bin_PROGRAMS = nullmailer-inject$(EXEEXT) nullmailer-smtpd$(EXEEXT) +sbin_PROGRAMS = nullmailer-queue$(EXEEXT) nullmailer-send$(EXEEXT) +libexec_PROGRAMS = mailq$(EXEEXT) sendmail$(EXEEXT) subdir = src Modified: head/mail/nullmailer/pkg-plist ============================================================================== --- head/mail/nullmailer/pkg-plist Wed Jan 16 18:15:33 2013 (r310508) +++ head/mail/nullmailer/pkg-plist Wed Jan 16 18:49:50 2013 (r310509) @@ -5,6 +5,7 @@ libexec/nullmailer/mailq @exec chown %%NULLMAIL_USER%% %D/libexec/nullmailer/mailq libexec/nullmailer/sendmail bin/nullmailer-inject +bin/nullmailer-smtpd sbin/nullmailer-queue @exec chmod u+s %D/sbin/nullmailer-queue @exec chown %%NULLMAIL_USER%% %D/sbin/nullmailer-queue