Date: Wed, 11 Jun 2014 16:32:47 +0000 (UTC) From: Oliver Lehmann <oliver@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357504 - in head: databases/courier-authlib-mysql databases/courier-authlib-pgsql databases/courier-authlib-userdb databases/courier-authlib-usergdbm mail/courier-authlib-vchkpw mail/s... Message-ID: <201406111632.s5BGWl4l070860@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: oliver Date: Wed Jun 11 16:32:47 2014 New Revision: 357504 URL: http://svnweb.freebsd.org/changeset/ports/357504 QAT: https://qat.redports.org/buildarchive/r357504/ Log: add STAGE support Modified: head/databases/courier-authlib-mysql/Makefile head/databases/courier-authlib-pgsql/Makefile head/databases/courier-authlib-userdb/Makefile head/databases/courier-authlib-usergdbm/Makefile head/mail/courier-authlib-vchkpw/Makefile head/mail/sqwebmail/Makefile head/net/courier-authlib-ldap/Makefile head/security/courier-authlib-base/Makefile head/security/courier-authlib/Makefile head/security/courier-authlib/files/patch-Makefile.in Modified: head/databases/courier-authlib-mysql/Makefile ============================================================================== --- head/databases/courier-authlib-mysql/Makefile Wed Jun 11 16:21:29 2014 (r357503) +++ head/databases/courier-authlib-mysql/Makefile Wed Jun 11 16:32:47 2014 (r357504) @@ -8,5 +8,4 @@ CATEGORIES= databases mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/courier-authlib-pgsql/Makefile ============================================================================== --- head/databases/courier-authlib-pgsql/Makefile Wed Jun 11 16:21:29 2014 (r357503) +++ head/databases/courier-authlib-pgsql/Makefile Wed Jun 11 16:32:47 2014 (r357504) @@ -8,5 +8,4 @@ CATEGORIES= databases mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/courier-authlib-userdb/Makefile ============================================================================== --- head/databases/courier-authlib-userdb/Makefile Wed Jun 11 16:21:29 2014 (r357503) +++ head/databases/courier-authlib-userdb/Makefile Wed Jun 11 16:32:47 2014 (r357504) @@ -8,5 +8,4 @@ CATEGORIES= databases mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/courier-authlib-usergdbm/Makefile ============================================================================== --- head/databases/courier-authlib-usergdbm/Makefile Wed Jun 11 16:21:29 2014 (r357503) +++ head/databases/courier-authlib-usergdbm/Makefile Wed Jun 11 16:32:47 2014 (r357504) @@ -8,5 +8,4 @@ CATEGORIES= databases mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/mail/courier-authlib-vchkpw/Makefile ============================================================================== --- head/mail/courier-authlib-vchkpw/Makefile Wed Jun 11 16:21:29 2014 (r357503) +++ head/mail/courier-authlib-vchkpw/Makefile Wed Jun 11 16:32:47 2014 (r357504) @@ -8,5 +8,4 @@ CATEGORIES= mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/mail/sqwebmail/Makefile ============================================================================== --- head/mail/sqwebmail/Makefile Wed Jun 11 16:21:29 2014 (r357503) +++ head/mail/sqwebmail/Makefile Wed Jun 11 16:32:47 2014 (r357504) @@ -29,7 +29,6 @@ SENTRENAME_DESC= Periodic rename the Sen 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} "" Modified: head/net/courier-authlib-ldap/Makefile ============================================================================== --- head/net/courier-authlib-ldap/Makefile Wed Jun 11 16:21:29 2014 (r357503) +++ head/net/courier-authlib-ldap/Makefile Wed Jun 11 16:32:47 2014 (r357504) @@ -8,5 +8,4 @@ CATEGORIES= net mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/security/courier-authlib-base/Makefile ============================================================================== --- head/security/courier-authlib-base/Makefile Wed Jun 11 16:21:29 2014 (r357503) +++ head/security/courier-authlib-base/Makefile Wed Jun 11 16:32:47 2014 (r357504) @@ -8,5 +8,4 @@ CATEGORIES= security mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/security/courier-authlib/Makefile ============================================================================== --- head/security/courier-authlib/Makefile Wed Jun 11 16:21:29 2014 (r357503) +++ head/security/courier-authlib/Makefile Wed Jun 11 16:32:47 2014 (r357504) @@ -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) Modified: head/security/courier-authlib/files/patch-Makefile.in ============================================================================== --- head/security/courier-authlib/files/patch-Makefile.in Wed Jun 11 16:21:29 2014 (r357503) +++ head/security/courier-authlib/files/patch-Makefile.in Wed Jun 11 16:32:47 2014 (r357504) @@ -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@
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406111632.s5BGWl4l070860>