svn commit: r322106 - in head/mail: . opensmtpd-devel opensmtpd-devel/files

Ashish SHUKLA ashish at FreeBSD.org
Sun Jun 30 21:30:55 UTC 2013 

Author: ashish
Date: Sun Jun 30 21:30:52 2013
New Revision: 322106
URL: http://svnweb.freebsd.org/changeset/ports/322106

Log:
  OpenSMTPD is a FREE implementation of the server-side SMTP protocol as
  defined by RFC 5321, with some additional standard extensions. It
  allows ordinary machines to exchange e-mails with other systems
  speaking the SMTP protocol.
  
  This port packages the development snapshots released by OpenSMTPD team.
  
  WWW:	http://www.OpenSMTPD.org/
  
  Changes:		http://article.gmane.org/gmane.mail.opensmtpd.general/738

Added:
  head/mail/opensmtpd-devel/
     - copied from r322103, head/mail/opensmtpd/
  head/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in   (contents, props changed)
  head/mail/opensmtpd-devel/files/patch-smtpd_backends_table__mysql.c   (contents, props changed)
  head/mail/opensmtpd-devel/files/patch-smtpd_backends_table__postgres.c   (contents, props changed)
  head/mail/opensmtpd-devel/files/patch-smtpd_backends_table__sqlite.c   (contents, props changed)
Deleted:
  head/mail/opensmtpd-devel/files/patch-smtpd_Makefile.am
  head/mail/opensmtpd-devel/files/pkg-message.in
Modified:
  head/mail/Makefile
  head/mail/opensmtpd-devel/Makefile   (contents, props changed)
  head/mail/opensmtpd-devel/distinfo   (contents, props changed)
  head/mail/opensmtpd-devel/pkg-descr   (contents, props changed)
  head/mail/opensmtpd-devel/pkg-plist   (contents, props changed)

Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile	Sun Jun 30 21:25:03 2013	(r322105)
+++ head/mail/Makefile	Sun Jun 30 21:30:52 2013	(r322106)
@@ -317,6 +317,7 @@
     SUBDIR += opendkim
     SUBDIR += opendmarc
     SUBDIR += opensmtpd
+    SUBDIR += opensmtpd-devel
     SUBDIR += openwebmail
     SUBDIR += osbf-lua
     SUBDIR += ovs

Modified: head/mail/opensmtpd-devel/Makefile
==============================================================================
--- head/mail/opensmtpd/Makefile	Sun Jun 30 21:14:14 2013	(r322103)
+++ head/mail/opensmtpd-devel/Makefile	Sun Jun 30 21:30:52 2013	(r322106)
@@ -2,43 +2,80 @@
 # $FreeBSD$
 
 PORTNAME=	opensmtpd
-PORTVERSION=	5.3.3
-PORTEPOCH=	1
+PORTVERSION=	201306271531
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/ \
 		http://distfiles.pirateparty.in/ashish/
+PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-${PORTVERSION}p1
 
 MAINTAINER=	ashish at FreeBSD.org
-COMMENT=	OpenSMTPD is a free MTA
+COMMENT=	OpenSMTPD is a free MTA (development snapshot)
+
+LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	event-1:${PORTSDIR}/devel/libevent
 
-LICENSE_NAME=	ISCL
+OPENSMTPD_SNAPSHOT_VER=	p1
 
-OPTIONS_DEFINE=	PAM
+OPTIONS_DEFINE=	PAM SQLITE MYSQL PGSQL LDAP
 
 OPTIONS_DEFAULT=	PAM
 
-USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/
 
 USE_RC_SUBR=	smtpd
-SUB_FILES=	pkg-install pkg-deinstall pkg-message
+SUB_FILES=	pkg-install pkg-deinstall
 
-CONFLICTS_INSTALL=	postfix-[0-9]* sendmail-[0-9]*
+CONFLICTS_INSTALL=	postfix-[0-9]* sendmail-[0-9]* opensmtpd-[0-9]*
 
 MAN8=		makemap.8 newaliases.8 smtpctl.8 smtpd.8
 MAN5=		smtpd.conf.5 aliases.5 forward.5
 
-USERS=		_smtpd _smtpq _smtpf
+USERS=		_smtpd _smtpq
 GROUPS=		_smtpd
 
 .include <bsd.port.options.mk>
 
 USE_OPENSSL=	yes
 
+.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
+
+.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
+
+.if ${PORT_OPTIONS:MPGSQL}
+USE_PGSQL=	yes
+CONFIGURE_ARGS+=	--with-experimental-postgres
+PLIST_SUB+=	PGSQL=""
+.else
+PLIST_SUB+=	PGSQL="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MLDAP}
+CONFIGURE_ARGS+=	--with-experimental-ldap
+PLIST_SUB+=	LDAP=""
+.else
+PLIST_SUB+=	LDAP="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MPAM}
 CONFIGURE_ARGS+=	--with-pam
 .endif
@@ -48,12 +85,8 @@ CONFIGURE_ARGS+=	--with-pam
 WITH_OPENSSL_PORT=	yes
 .endif
 
-pre-configure:
-		@cd ${WRKSRC} && ./bootstrap
-
 post-install:
 		@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-		@${CAT} ${PKGMESSAGE}
 
 post-deinstall:
 		@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-DEINSTALL

Modified: head/mail/opensmtpd-devel/distinfo
==============================================================================
--- head/mail/opensmtpd/distinfo	Sun Jun 30 21:14:14 2013	(r322103)
+++ head/mail/opensmtpd-devel/distinfo	Sun Jun 30 21:30:52 2013	(r322106)
@@ -1,2 +1,2 @@
-SHA256 (opensmtpd-5.3.3p1.tar.gz) = 34f0e208e6fdde5c5c25bb11f468436c4d6148a8b640c32117869cad140b823c
-SIZE (opensmtpd-5.3.3p1.tar.gz) = 343733
+SHA256 (opensmtpd-201306271531p1.tar.gz) = 4c831a87b0d6834410b01a0ef13adeca9539391b341b50648aca1a53f6df062c
+SIZE (opensmtpd-201306271531p1.tar.gz) = 771055

Added: head/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in	Sun Jun 30 21:30:52 2013	(r322106)
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- mk/smtpd/Makefile.in.orig
++++ mk/smtpd/Makefile.in
+@@ -1837,11 +1837,7 @@
+ 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+ 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+ 
+-	@if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then			\
+-		$(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf; \
+-	else									\
+-		echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \
+-	fi
++	$(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf.sample
+ 
+ 	$(INSTALL) -m 644 aliases.5.out		$(DESTDIR)$(mandir)/$(mansubdir)5/aliases.5
+ 	$(INSTALL) -m 644 forward.5.out		$(DESTDIR)$(mandir)/$(mansubdir)5/forward.5

Added: head/mail/opensmtpd-devel/files/patch-smtpd_backends_table__mysql.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/opensmtpd-devel/files/patch-smtpd_backends_table__mysql.c	Sun Jun 30 21:30:52 2013	(r322106)
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- smtpd/backends/table_mysql.c.orig
++++ smtpd/backends/table_mysql.c
+@@ -22,6 +22,7 @@
+ 
+ #include <ctype.h>
+ #include <fcntl.h>
++#include <getopt.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

Added: head/mail/opensmtpd-devel/files/patch-smtpd_backends_table__postgres.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/opensmtpd-devel/files/patch-smtpd_backends_table__postgres.c	Sun Jun 30 21:30:52 2013	(r322106)
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- smtpd/backends/table_postgres.c.orig
++++ smtpd/backends/table_postgres.c
+@@ -22,12 +22,13 @@
+ 
+ #include <ctype.h>
+ #include <fcntl.h>
++#include <getopt.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
+ 
+-#include <postgresql/libpq-fe.h>
++#include <libpq-fe.h>
+ 
+ #include "smtpd-defines.h"
+ #include "smtpd-api.h"

Added: head/mail/opensmtpd-devel/files/patch-smtpd_backends_table__sqlite.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/opensmtpd-devel/files/patch-smtpd_backends_table__sqlite.c	Sun Jun 30 21:30:52 2013	(r322106)
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- smtpd/backends/table_sqlite.c.orig
++++ smtpd/backends/table_sqlite.c
+@@ -22,6 +22,7 @@
+ 
+ #include <ctype.h>
+ #include <fcntl.h>
++#include <getopt.h>
+ #include <sqlite3.h>
+ #include <stdio.h>
+ #include <stdlib.h>

Modified: head/mail/opensmtpd-devel/pkg-descr
==============================================================================
--- head/mail/opensmtpd/pkg-descr	Sun Jun 30 21:14:14 2013	(r322103)
+++ head/mail/opensmtpd-devel/pkg-descr	Sun Jun 30 21:30:52 2013	(r322106)
@@ -3,4 +3,6 @@ defined by RFC 5321, with some additiona
 allows ordinary machines to exchange e-mails with other systems
 speaking the SMTP protocol.
 
+This port packages the development snapshots released by OpenSMTPD team.
+
 WWW:	http://www.OpenSMTPD.org/

Modified: head/mail/opensmtpd-devel/pkg-plist
==============================================================================
--- head/mail/opensmtpd/pkg-plist	Sun Jun 30 21:14:14 2013	(r322103)
+++ head/mail/opensmtpd-devel/pkg-plist	Sun Jun 30 21:30:52 2013	(r322106)
@@ -1,9 +1,22 @@
 bin/mailq
 bin/newaliases
-bin/smtpscript
 etc/mail/smtpd.conf.sample
 libexec/mail.local
 libexec/opensmtpd/makemap
+libexec/opensmtpd/backend-queue-null
+libexec/opensmtpd/backend-queue-ram
+libexec/opensmtpd/backend-queue-stub
+libexec/opensmtpd/backend-table-stub
+%%MYSQL%%libexec/opensmtpd/backend-table-mysql
+%%SQLITE%%libexec/opensmtpd/backend-table-sqlite
+%%LDAP%%libexec/opensmtpd/backend-table-ldap
+%%PGSQL%%libexec/opensmtpd/backend-table-postgres
+libexec/opensmtpd/backend-scheduler-ram
+libexec/opensmtpd/backend-scheduler-stub
+libexec/opensmtpd/filter-dnsbl
+libexec/opensmtpd/filter-monkey
+libexec/opensmtpd/filter-stub
+libexec/opensmtpd/filter-trace
 sbin/makemap
 sbin/smtpctl
 sbin/smtpd

More information about the svn-ports-head mailing list