summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorveego <veego@pkgsrc.org>2000-06-14 16:40:53 +0000
committerveego <veego@pkgsrc.org>2000-06-14 16:40:53 +0000
commit11d320ea11ba07d293ae0de73d1d3c66021fb409 (patch)
tree5439caacd48d41e4ce2b7bc9574b468cb5d31df0 /mail
parent5360945a7b1221f159a576f74bc3ea3bceb510e1 (diff)
downloadpkgsrc-11d320ea11ba07d293ae0de73d1d3c66021fb409.tar.gz
Now fix the libwrap compile problem on NetBSD.
Thanks to Matthias Scheler for noticing it.
Diffstat (limited to 'mail')
-rw-r--r--mail/sendmail/Makefile8
-rw-r--r--mail/sendmail/patches/patch-aa6
-rw-r--r--mail/sendmail/patches/patch-ab22
3 files changed, 32 insertions, 4 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 71df98ea481..6d99f7d8e3f 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/06/14 13:02:16 veego Exp $
+# $NetBSD: Makefile,v 1.15 2000/06/14 16:40:53 veego Exp $
DISTNAME= sendmail.8.9.3
PKGNAME= sendmail-8.9.3
@@ -60,6 +60,12 @@ MAKE_ENV+= LDAP_CONF="-DLDAPMAP" \
MAKE_ENV+= LDAP_CONF="" LDAP_ENVDEF="" LDAP_LIBS=""
.endif
+.if ${OPSYS} == "NetBSD"
+MAKE_ENV+= TCPD_CONF="-DTCPWRAPPERS" TCPD_LIBS="-lwrap"
+.else
+MAKE_ENV+= TCPD_CONF="" TCPD_LIBS=""
+.endif
+
post-patch:
.if defined(USE_INET6) && ${USE_INET6} == YES
@(${CP} ${FILESDIR}/site.config-v6 ${WRKSRC})
diff --git a/mail/sendmail/patches/patch-aa b/mail/sendmail/patches/patch-aa
index a62aaf8479c..cc5f1c0e322 100644
--- a/mail/sendmail/patches/patch-aa
+++ b/mail/sendmail/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2000/06/14 13:02:18 veego Exp $
+$NetBSD: patch-aa,v 1.10 2000/06/14 16:40:55 veego Exp $
--- BuildTools/OS/NetBSD.orig Tue Dec 29 18:39:50 1998
+++ BuildTools/OS/NetBSD Tue Jun 13 19:34:47 2000
@@ -7,9 +7,9 @@ $NetBSD: patch-aa,v 1.9 2000/06/14 13:02:18 veego Exp $
-define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
-define(`confENVDEF', ` -DNETISO')
+define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX ${LDAP_CONF}')
-+define(`confENVDEF', ` -DNETISO -DTCPWRAPPERS ${DB_ENVDEF} ${LDAP_ENVDEF}')
++define(`confENVDEF', ` -DNETISO ${DB_ENVDEF} ${LDAP_ENVDEF}')
define(`confDEPEND_TYPE', `CC-M')
-+define(`confLIBS', `-lwrap ${DB_LIBS} ${LDAP_LIBS} ${LDFLAGS}')
++define(`confLIBS', `${DB_LIBS} ${LDAP_LIBS} ${LDFLAGS}')
+define(`confEBINDIR', `${PREFIX}/libexec/sendmail')
+define(`confMBINDIR', `${PREFIX}/libexec/sendmail')
+define(`confSBINDIR', `${PREFIX}/sbin')
diff --git a/mail/sendmail/patches/patch-ab b/mail/sendmail/patches/patch-ab
new file mode 100644
index 00000000000..018c0b35124
--- /dev/null
+++ b/mail/sendmail/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.5 2000/06/14 16:40:55 veego Exp $
+
+--- src/Makefile.m4.orig Wed Jun 30 11:58:18 1999
++++ src/Makefile.m4 Wed Jun 30 11:58:40 1999
+@@ -27,7 +27,7 @@
+ MAPDEF= ifdef(`confMAPDEF', `confMAPDEF')
+
+ # environment definitions (e.g., -D_AIX3)
+-ENVDEF= ifdef(`confENVDEF', `confENVDEF')
++ENVDEF= ifdef(`confENVDEF', `confENVDEF') ${TCPD_CONF}
+
+ # see also conf.h for additional compilation flags
+
+@@ -42,7 +42,7 @@
+
+ # libraries required on your system
+ # delete -l44bsd if you are not running BIND 4.9.x
+-LIBS= ifdef(`confLIBS', `confLIBS')
++LIBS= ifdef(`confLIBS', `confLIBS') ${TCPD_LIBS}
+
+ # location of sendmail binary (usually /usr/sbin or /usr/lib)
+ BINDIR= ${DESTDIR}ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')