diff options
author | tron <tron@pkgsrc.org> | 2002-06-23 11:46:03 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2002-06-23 11:46:03 +0000 |
commit | 40cf685184a07ece16ab971e4fad72a6178733ef (patch) | |
tree | 70a6722f957aa169e84440212b2e32c2a71ce3f7 | |
parent | 46838a42a747db674c45d9d5eb7da6e147fb7882 (diff) | |
download | pkgsrc-40cf685184a07ece16ab971e4fad72a6178733ef.tar.gz |
Improve buildlink support by adding the required "-I" and "-L" definitions
only once in "site.config.m4" and not in each configuration file.
-rw-r--r-- | mail/sendmail/Makefile | 10 | ||||
-rw-r--r-- | mail/sendmail/files/site.config.m4 | 4 | ||||
-rw-r--r-- | mail/sendmail/files/site.config.m4-db2 | 2 | ||||
-rw-r--r-- | mail/sendmail/files/site.config.m4-ldap | 3 | ||||
-rw-r--r-- | mail/sendmail/files/site.config.m4-starttls | 2 | ||||
-rw-r--r-- | mail/sendmail/files/site.config.m4-tcpwrappers | 3 |
6 files changed, 12 insertions, 12 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 60b45b14f8f..a8c5e350fd0 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2002/06/17 21:08:16 tron Exp $ +# $NetBSD: Makefile,v 1.50 2002/06/23 11:46:03 tron Exp $ DISTNAME= sendmail.8.11.6 PKGNAME= sendmail-8.11.6 @@ -33,13 +33,15 @@ SITECONFIG= ${WRKSRC}/devtools/Site/site.config.m4 BUILD_DEFS+= USE_WIDEPATCH USE_INET6 USE_TCPWRAPPERS USE_LDAP USE_DB2 \ USE_STARTTLS - -.include "../../mk/bsd.prefs.mk" - MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC PLIST_SRC= ${WRKDIR}/.PLIST_SRC DESCR_SRC= ${WRKDIR}/.DESCR_SRC +.include "../../mk/bsd.prefs.mk" +# Make sure that ${BUILDLINK_DIR} is defined even no "buildlink.mk" gets +# included below. +.include "../../mk/bsd.buildlink.mk" + .if ${OPSYS} == "SunOS" USE_DB2?= YES .else diff --git a/mail/sendmail/files/site.config.m4 b/mail/sendmail/files/site.config.m4 index 571c64c7e0f..d0073176d88 100644 --- a/mail/sendmail/files/site.config.m4 +++ b/mail/sendmail/files/site.config.m4 @@ -1,4 +1,4 @@ -# $NetBSD: site.config.m4,v 1.1 2000/07/24 04:23:02 itojun Exp $ +# $NetBSD: site.config.m4,v 1.2 2002/06/23 11:46:04 tron Exp $ # pathnames specific to pkgsrc # @@ -8,3 +8,5 @@ define(`confSBINDIR', `${PREFIX}/sbin') define(`confUBINDIR', `${PREFIX}/bin') define(`confHFDIR', `${PREFIX}/share/misc') define(`confMANROOT', `${PREFIX}/man/cat') +APPENDDEF(`confENVDEF', `-I${BUILDLINK_DIR}/include') +APPENDDEF(`confLIBS', `-L${BUILDLINK_DIR}/lib') diff --git a/mail/sendmail/files/site.config.m4-db2 b/mail/sendmail/files/site.config.m4-db2 index 01924fc895f..f1abc5b472a 100644 --- a/mail/sendmail/files/site.config.m4-db2 +++ b/mail/sendmail/files/site.config.m4-db2 @@ -1,3 +1,3 @@ # enable db2 APPENDDEF(`confENVDEF', `-I${BUILDLINK_DIR}/include/db2') -APPENDDEF(`confLIBS', `-L${BUILDLINK_DIR}/lib -ldb2') +APPENDDEF(`confLIBS', `-ldb2') diff --git a/mail/sendmail/files/site.config.m4-ldap b/mail/sendmail/files/site.config.m4-ldap index a497cd25e0d..f4b873105a7 100644 --- a/mail/sendmail/files/site.config.m4-ldap +++ b/mail/sendmail/files/site.config.m4-ldap @@ -1,4 +1,3 @@ # enable ldap APPENDDEF(`confMAPDEF', `-DLDAPMAP') -APPENDDEF(`confENVDEF', `-I${BUILDLINK_DIR}/include') -APPENDDEF(`confLIBS', `-L${LOCALBASE}/lib -lldap -llber') +APPENDDEF(`confLIBS', `-lldap -llber') diff --git a/mail/sendmail/files/site.config.m4-starttls b/mail/sendmail/files/site.config.m4-starttls index 72fdd2ee7ec..d475ce82440 100644 --- a/mail/sendmail/files/site.config.m4-starttls +++ b/mail/sendmail/files/site.config.m4-starttls @@ -1,5 +1,3 @@ # enable STARTTLS -APPENDDEF(`confENVDEF', `-I${BUILDLINK_DIR}/include') -APPENDDEF(`confLIBS', `-L${BUILDLINK_DIR}/lib') APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -D_FFR_TLS_TOREK') APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto') diff --git a/mail/sendmail/files/site.config.m4-tcpwrappers b/mail/sendmail/files/site.config.m4-tcpwrappers index e5f069a4592..2f9cb92e336 100644 --- a/mail/sendmail/files/site.config.m4-tcpwrappers +++ b/mail/sendmail/files/site.config.m4-tcpwrappers @@ -1,4 +1,3 @@ # enable tcpwrappers -APPENDDEF(`confENVDEF', `-I${BUILDLINK_DIR}/include -DTCPWRAPPERS') -APPENDDEF(`confLIBS', `-L${BUILDLINK_DIR}/lib') +APPENDDEF(`confENVDEF', `-DTCPWRAPPERS') APPENDDEF(`conf_sendmail_LIBS', `-lwrap') |