diff options
| -rw-r--r-- | databases/courier-authlib-mysql/Makefile | 1 | ||||
| -rw-r--r-- | databases/courier-authlib-pgsql/Makefile | 1 | ||||
| -rw-r--r-- | databases/courier-authlib-userdb/Makefile | 1 | ||||
| -rw-r--r-- | databases/courier-authlib-usergdbm/Makefile | 1 | ||||
| -rw-r--r-- | mail/courier-authlib-vchkpw/Makefile | 1 | ||||
| -rw-r--r-- | mail/sqwebmail/Makefile | 5 | ||||
| -rw-r--r-- | net/courier-authlib-ldap/Makefile | 1 | ||||
| -rw-r--r-- | security/courier-authlib-base/Makefile | 1 | ||||
| -rw-r--r-- | security/courier-authlib/Makefile | 5 | ||||
| -rw-r--r-- | security/courier-authlib/files/patch-Makefile.in | 18 |
10 files changed, 15 insertions, 20 deletions
diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile index 31618e69856f..ed1f9ecdf3c9 100644 --- a/databases/courier-authlib-mysql/Makefile +++ b/databases/courier-authlib-mysql/Makefile @@ -8,5 +8,4 @@ CATEGORIES= databases mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/courier-authlib-pgsql/Makefile b/databases/courier-authlib-pgsql/Makefile index 6adb9661c33b..96728bfdbf9a 100644 --- a/databases/courier-authlib-pgsql/Makefile +++ b/databases/courier-authlib-pgsql/Makefile @@ -8,5 +8,4 @@ CATEGORIES= databases mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/courier-authlib-userdb/Makefile b/databases/courier-authlib-userdb/Makefile index 5279af52266f..a649063773fa 100644 --- a/databases/courier-authlib-userdb/Makefile +++ b/databases/courier-authlib-userdb/Makefile @@ -8,5 +8,4 @@ CATEGORIES= databases mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/courier-authlib-usergdbm/Makefile b/databases/courier-authlib-usergdbm/Makefile index 819621077f70..f5e5791c6a8d 100644 --- a/databases/courier-authlib-usergdbm/Makefile +++ b/databases/courier-authlib-usergdbm/Makefile @@ -8,5 +8,4 @@ CATEGORIES= databases mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/mail/courier-authlib-vchkpw/Makefile b/mail/courier-authlib-vchkpw/Makefile index 3ce37d296445..0040d21c2681 100644 --- a/mail/courier-authlib-vchkpw/Makefile +++ b/mail/courier-authlib-vchkpw/Makefile @@ -8,5 +8,4 @@ CATEGORIES= mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 94a3ad6ff87c..c51a89875a40 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -29,7 +29,6 @@ SENTRENAME_DESC= Periodic rename the Sent folder CHARSET_DESC= charsets FAM_USES= fam -NO_STAGE= yes .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" CGIBINDIR?= www/cgi-bin-dist @@ -189,9 +188,9 @@ post-patch: @${REINPLACE_CMD} -e 's|mkdir -p|${MKDIR}|g' ${WRKSRC}/libs/pcp/configure .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for a in ${EXTRA_DOCS} - ${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR} .endfor .endif @${ECHO_MSG} "" diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile index 191568f929fe..3911d4cb5235 100644 --- a/net/courier-authlib-ldap/Makefile +++ b/net/courier-authlib-ldap/Makefile @@ -8,5 +8,4 @@ CATEGORIES= net mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/security/courier-authlib-base/Makefile b/security/courier-authlib-base/Makefile index 74e8de08da92..fbcd9102edd8 100644 --- a/security/courier-authlib-base/Makefile +++ b/security/courier-authlib-base/Makefile @@ -8,5 +8,4 @@ CATEGORIES= security mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index b68608425b09..287047792459 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -26,7 +26,6 @@ PATCHDIR= /dev/null OPTIONS_DEFINE+= GDBM -NO_STAGE= yes .include "${.CURDIR}/Makefile.opt" .else # !defined(PKGNAMESUFFIX) @@ -208,9 +207,9 @@ pre-install: post-install: .if ${PORT_OPTIONS:MDOCS} - @${INSTALL} ${_SHROWNGRP} -d ${DOCSDIR} + @${INSTALL} ${_SHROWNGRP} -d ${STAGEDIR}${DOCSDIR} .for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif .endif # !defined(PKGNAMESUFFIX) diff --git a/security/courier-authlib/files/patch-Makefile.in b/security/courier-authlib/files/patch-Makefile.in index ddc1cf505db9..d32eb9754d12 100644 --- a/security/courier-authlib/files/patch-Makefile.in +++ b/security/courier-authlib/files/patch-Makefile.in @@ -226,13 +226,13 @@ @HAVE_LDAP_FALSE@ @: +@HAVE_LDAP_TRUE@install-ldapschema: -+@HAVE_LDAP_TRUE@ $(mkinstalldirs) ${sysconfdir}/openldap/schema ++@HAVE_LDAP_TRUE@ $(mkinstalldirs) ${DESTDIR}${sysconfdir}/openldap/schema +@HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \ -+@HAVE_LDAP_TRUE@ ${sysconfdir}/openldap/schema/authldap.schema.default -+@HAVE_LDAP_TRUE@ if test ! -f ${sysconfdir}/openldap/schema/authldap.schema ; then \ -+@HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \ -+@HAVE_LDAP_TRUE@ ${sysconfdir}/openldap/schema/authldap.schema ; \ -+@HAVE_LDAP_TRUE@ fi ++@HAVE_LDAP_TRUE@ ${DESTDIR}${sysconfdir}/openldap/schema/authldap.schema.default ++@HAVE_LDAP_TRUE@# if test ! -f ${sysconfdir}/openldap/schema/authldap.schema ; then \ ++@HAVE_LDAP_TRUE@# $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \ ++@HAVE_LDAP_TRUE@# ${sysconfdir}/openldap/schema/authldap.schema ; \ ++@HAVE_LDAP_TRUE@# fi + +@HAVE_LDAP_FALSE@install-ldapschema: +@HAVE_LDAP_FALSE@ @: @@ -273,7 +273,7 @@ authdaemonrc.h: echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h -@@ -2003,24 +2063,26 @@ +@@ -2003,24 +2063,30 @@ # automake still a bit stupid... install-data-hook: install-authdaemonrc install-authpgsqlrc \ @@ -299,6 +299,10 @@ +@HAVE_BASE_TRUE@ chmod 755 $(DESTDIR)$(pkglibexecdir) +@HAVE_BASE_TRUE@ -chown @mailuser@ $(DESTDIR)$(pkglibexecdir) +@HAVE_BASE_TRUE@ -chgrp @mailgroup@ $(DESTDIR)$(pkglibexecdir) ++@HAVE_USERDB_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || : ++@HAVE_USERDB_TRUE@ chmod 755 $(DESTDIR)$(pkglibexecdir) ++@HAVE_USERDB_TRUE@ -chown @mailuser@ $(DESTDIR)$(pkglibexecdir) ++@HAVE_USERDB_TRUE@ -chgrp @mailgroup@ $(DESTDIR)$(pkglibexecdir) +@HAVE_BASE_TRUE@ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond +@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || : +@HAVE_BASE_TRUE@ chmod 750 $(DESTDIR)@authdaemonvar@ |