Import of pkgsrc-2015Q1

mail/opensmtpd/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/02/12 23:18:09 tron Exp $
+# $NetBSD: Makefile,v 1.4 2014/08/17 19:05:50 joerg Exp $
 
 VERSION=	5.3.3p1
 DISTNAME=	opensmtpd-${VERSION}
@@ -18,7 +18,7 @@ BUILD_DEFS+=	VARBASE
 
 USE_LANGUAGES=	c
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config yacc
 USE_TOOLS+=	automake aclocal autoheader autoconf
 
 SMTPD_HOME=	${VARBASE}/chroot/smtpd
@@ -51,11 +51,16 @@ post-extract:
 	cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
 
 pre-configure:
-	set -e; cd ${WRKSRC} && ${SH} ./bootstrap
+	cd $(WRKSRC) && ${PREFIX}/bin/libtoolize --copy --force
+	cd $(WRKSRC) && ${TOOLS_CMD.aclocal}
+	cd $(WRKSRC) && ${TOOLS_CMD.autoconf}
+	cd $(WRKSRC) && ${TOOLS_CMD.autoheader}
+	cd $(WRKSRC) && ${TOOLS_CMD.automake} --foreign --add-missing --copy
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf \
 		${DESTDIR}${EXAMPLEDIR}/mailer.conf
 
 .include "../../devel/libevent/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

mail/opensmtpd/distinfo

@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.1 2013/11/18 22:50:01 pettai Exp $
+$NetBSD: distinfo,v 1.2 2014/08/17 19:03:32 joerg Exp $
 
 SHA1 (opensmtpd-5.3.3p1.tar.gz) = a7fc3a15b5dc622410fcedf51bbe62e6b6d64df3
 RMD160 (opensmtpd-5.3.3p1.tar.gz) = 97f63e37fa6ce1f5f58d816088c5b356f99167c3
 Size (opensmtpd-5.3.3p1.tar.gz) = 343733 bytes
-SHA1 (patch-bootstrap) = c53e2d32429fcdfbef126652ac8e38a2b76344cb
 SHA1 (patch-configure.ac) = ed819952951700c057c11200095a72972aafc1f9
 SHA1 (patch-smtpd_Makefile.am) = 4267002ecadceaf68868b9d782d5e6f8571ebc36
 SHA1 (patch-smtpd_queue_fsqueue.c) = 80dae37705378c022c1a76d31ea54a3f907b6c1a

mail/opensmtpd/patches/patch-bootstrap

@@ -1,15 +0,0 @@
-$NetBSD: patch-bootstrap,v 1.1 2013/11/18 22:50:01 pettai Exp $
-
-Add support for newer automake
-
---- bootstrap.orig	2013-11-18 09:00:56.000000000 +0000
-+++ bootstrap
-@@ -36,7 +36,7 @@ aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL
- 
- # Check for automake
- amvers="no"
--for v in 13 12 11 10 9 8 7 6 5; do
-+for v in 14 13 12 11 10 9 8 7 6 5; do
-   if automake-1.${v} --version >/dev/null 2>&1; then
-     amvers="-1.${v}"
-     break