From owner-svn-ports-all@FreeBSD.ORG Sun Jan 19 11:24:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46B32B75; Sun, 19 Jan 2014 11:24:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 26D201501; Sun, 19 Jan 2014 11:24:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0JBOP86071483; Sun, 19 Jan 2014 11:24:25 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0JBOOuH071474; Sun, 19 Jan 2014 11:24:24 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201401191124.s0JBOOuH071474@svn.freebsd.org> From: Martin Matuska Date: Sun, 19 Jan 2014 11:24:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340262 - in head: databases/proftpd-mod_sql_mysql databases/proftpd-mod_sql_odbc databases/proftpd-mod_sql_postgres databases/proftpd-mod_sql_sqlite ftp/proftpd net/proftpd-mod_ldap X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jan 2014 11:24:26 -0000 Author: mm Date: Sun Jan 19 11:24:24 2014 New Revision: 340262 URL: http://svnweb.freebsd.org/changeset/ports/340262 QAT: https://qat.redports.org/buildarchive/r340262/ Log: Add STAGE support to ProFTPD Modified: head/databases/proftpd-mod_sql_mysql/Makefile head/databases/proftpd-mod_sql_odbc/Makefile head/databases/proftpd-mod_sql_postgres/Makefile head/databases/proftpd-mod_sql_sqlite/Makefile head/ftp/proftpd/Makefile head/net/proftpd-mod_ldap/Makefile Modified: head/databases/proftpd-mod_sql_mysql/Makefile ============================================================================== --- head/databases/proftpd-mod_sql_mysql/Makefile Sun Jan 19 11:00:28 2014 (r340261) +++ head/databases/proftpd-mod_sql_mysql/Makefile Sun Jan 19 11:24:24 2014 (r340262) @@ -22,5 +22,4 @@ LIBDIRS= ${LOCALBASE}/lib _BUILDING_PROFTPD_MODULE= ${PORTNAME} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/proftpd-mod_sql_odbc/Makefile ============================================================================== --- head/databases/proftpd-mod_sql_odbc/Makefile Sun Jan 19 11:00:28 2014 (r340261) +++ head/databases/proftpd-mod_sql_odbc/Makefile Sun Jan 19 11:24:24 2014 (r340262) @@ -25,5 +25,4 @@ LIBDIRS= ${LOCALBASE}/lib _BUILDING_PROFTPD_MODULE= ${PORTNAME} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/proftpd-mod_sql_postgres/Makefile ============================================================================== --- head/databases/proftpd-mod_sql_postgres/Makefile Sun Jan 19 11:00:28 2014 (r340261) +++ head/databases/proftpd-mod_sql_postgres/Makefile Sun Jan 19 11:24:24 2014 (r340262) @@ -22,5 +22,4 @@ LIBDIRS= ${LOCALBASE}/lib _BUILDING_PROFTPD_MODULE= ${PORTNAME} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/proftpd-mod_sql_sqlite/Makefile ============================================================================== --- head/databases/proftpd-mod_sql_sqlite/Makefile Sun Jan 19 11:00:28 2014 (r340261) +++ head/databases/proftpd-mod_sql_sqlite/Makefile Sun Jan 19 11:24:24 2014 (r340262) @@ -22,5 +22,4 @@ LIBDIRS= ${LOCALBASE}/lib _BUILDING_PROFTPD_MODULE= ${PORTNAME} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/ftp/proftpd/Makefile ============================================================================== --- head/ftp/proftpd/Makefile Sun Jan 19 11:00:28 2014 (r340261) +++ head/ftp/proftpd/Makefile Sun Jan 19 11:24:24 2014 (r340262) @@ -96,7 +96,6 @@ PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATED .endif #!defined(_BUILDING_PROFTPD_MODULE) -NO_STAGE= yes .include .if defined(USE_OPENSSL) @@ -246,25 +245,29 @@ post-configure: .if defined(_BUILDING_PROFTPD_MODULE) pre-build: @cd ${WRKSRC} && ${MAKE} include/buildstamp.h + +pre-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/proftpd + .else post-install: - @cd ${PREFIX}/etc/ && ${CP} -n proftpd.conf.sample proftpd.conf || ${TRUE} - @${MKDIR} ${LOCALSTATEDIR}/proftpd - @cd ${PREFIX}/etc/proftpd && ${CP} -n dhparams.pem.sample dhparams.pem || ${TRUE} - @cd ${PREFIX}/etc/proftpd && ${CP} -n blacklist.dat.sample blacklist.dat || ${TRUE} + @cd ${STAGEDIR}${PREFIX}/etc/ && ${CP} -n proftpd.conf.sample proftpd.conf || ${TRUE} + @${MKDIR} ${STAGEDIR}${LOCALSTATEDIR}/proftpd + @cd ${STAGEDIR}${PREFIX}/etc/proftpd && ${CP} -n dhparams.pem.sample dhparams.pem || ${TRUE} + @cd ${STAGEIDR}${PREFIX}/etc/proftpd && ${CP} -n blacklist.dat.sample blacklist.dat || ${TRUE} .if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${DOCSDIR} - @cd ${WRKSRC} && ${CP} README* RELEASE_NOTES ${DOCSDIR} - @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} license.txt ${DOCSDIR} + @${INSTALL} -d ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC} && ${CP} README* RELEASE_NOTES ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} license.txt ${STAGEDIR}${DOCSDIR} . if ${PORT_OPTIONS:MHTMLDOCS} - @${INSTALL} -d ${DOCSDIR}/html - @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} Configuration.html faq.html ${DOCSDIR}/html - @${CP} -RP ${WRKSRC}/doc/contrib ${DOCSDIR}/html/contrib - @${CP} -RP ${WRKSRC}/doc/modules ${DOCSDIR}/html/modules - @${CP} -RP ${WRKSRC}/doc/howto ${DOCSDIR}/html/howto + @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/html + @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} Configuration.html faq.html ${STAGEDIR}${DOCSDIR}/html + @${CP} -RP ${WRKSRC}/doc/contrib ${STAGEDIR}${DOCSDIR}/html/contrib + @${CP} -RP ${WRKSRC}/doc/modules ${STAGEDIR}${DOCSDIR}/html/modules + @${CP} -RP ${WRKSRC}/doc/howto ${STAGEDIR}${DOCSDIR}/html/howto . endif .endif - @${INSTALL_MAN} ${WRKSRC}/src/ftpdctl.8 ${MAN8PREFIX}/man/man8/ + @${INSTALL_MAN} ${WRKSRC}/src/ftpdctl.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/ .endif #!defined(_BUILDING_PROFTPD_MODULE) .include Modified: head/net/proftpd-mod_ldap/Makefile ============================================================================== --- head/net/proftpd-mod_ldap/Makefile Sun Jan 19 11:00:28 2014 (r340261) +++ head/net/proftpd-mod_ldap/Makefile Sun Jan 19 11:24:24 2014 (r340262) @@ -24,5 +24,4 @@ LIBDIRS= ${LOCALBASE}/lib _BUILDING_PROFTPD_MODULE= ${PORTNAME} \ mod_quotatab_ldap -NO_STAGE= yes .include "${MASTERDIR}/Makefile"