summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2014-08-17 19:03:32 +0000
committerjoerg <joerg>2014-08-17 19:03:32 +0000
commitd427ea3e3e89317b1241043115be8d512fb9e0b5 (patch)
tree74ae4691062ef7e1504d584e0eb93841b35aabc4
parent781d752c8e75acda18abc25d3c8cd1cc92da19b3 (diff)
downloadpkgsrc-d427ea3e3e89317b1241043115be8d512fb9e0b5.tar.gz
Replace bootstrap script with working direct invocations of autotools.
-rw-r--r--mail/opensmtpd/Makefile8
-rw-r--r--mail/opensmtpd/distinfo3
-rw-r--r--mail/opensmtpd/patches/patch-bootstrap15
3 files changed, 7 insertions, 19 deletions
diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile
index 7901fb276f3..030188af9bc 100644
--- a/mail/opensmtpd/Makefile
+++ b/mail/opensmtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/02/12 23:18:09 tron Exp $
+# $NetBSD: Makefile,v 1.3 2014/08/17 19:03:32 joerg Exp $
VERSION= 5.3.3p1
DISTNAME= opensmtpd-${VERSION}
@@ -51,7 +51,11 @@ 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 \
diff --git a/mail/opensmtpd/distinfo b/mail/opensmtpd/distinfo
index d9f125e60bf..eee1995b578 100644
--- a/mail/opensmtpd/distinfo
+++ b/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
diff --git a/mail/opensmtpd/patches/patch-bootstrap b/mail/opensmtpd/patches/patch-bootstrap
deleted file mode 100644
index df020843fa2..00000000000
--- a/mail/opensmtpd/patches/patch-bootstrap
+++ /dev/null
@@ -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