From owner-svn-ports-all@FreeBSD.ORG Thu Jun 12 13:28:43 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 0E15F379; Thu, 12 Jun 2014 13:28:43 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EF2EE2BA2; Thu, 12 Jun 2014 13:28:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5CDSgHi046565; Thu, 12 Jun 2014 13:28:42 GMT (envelope-from jadawin@svn.freebsd.org) Received: (from jadawin@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5CDSg2A046563; Thu, 12 Jun 2014 13:28:42 GMT (envelope-from jadawin@svn.freebsd.org) Message-Id: <201406121328.s5CDSg2A046563@svn.freebsd.org> From: Philippe Audeoud Date: Thu, 12 Jun 2014 13:28:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357596 - head/www/usermanager 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.18 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: Thu, 12 Jun 2014 13:28:43 -0000 Author: jadawin Date: Thu Jun 12 13:28:42 2014 New Revision: 357596 URL: http://svnweb.freebsd.org/changeset/ports/357596 QAT: https://qat.redports.org/buildarchive/r357596/ Log: - Add stage support Modified: head/www/usermanager/Makefile head/www/usermanager/pkg-plist Modified: head/www/usermanager/Makefile ============================================================================== --- head/www/usermanager/Makefile Thu Jun 12 12:58:17 2014 (r357595) +++ head/www/usermanager/Makefile Thu Jun 12 13:28:42 2014 (r357596) @@ -22,7 +22,6 @@ PLIST_SUB+= INSTALLDIR=${INSTALLDIR} _INSTDIR= www/data/UserManager INSTALLDIR?= ${_INSTDIR} -NO_STAGE= yes pre-fetch: .if ${INSTALLDIR} == ${_INSTDIR} @${ECHO_MSG} "" @@ -35,14 +34,10 @@ post-patch: -e 's|%%INSTALLDIR%%|${INSTALLDIR}|g' ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} do-install: - @${MKDIR} ${PREFIX}/${INSTALLDIR} - @${CP} -Rp ${WRKSRC}/* ${PREFIX}/${INSTALLDIR} - @${CHMOD} 666 ${PREFIX}/${INSTALLDIR}/config.php - @${ECHO_CMD} "" - -post-install: -.if !defined(BATCH) - @${CAT} ${PKGMESSAGE} -.endif + @${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLDIR} + @${CP} -Rp ${WRKSRC}/* ${STAGEDIR}${PREFIX}/${INSTALLDIR} + @${CHMOD} 666 ${STAGEDIR}${PREFIX}/${INSTALLDIR}/config.php + @${MV} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/config.php \ + ${STAGEDIR}${PREFIX}/${INSTALLDIR}/config.php.sample .include Modified: head/www/usermanager/pkg-plist ============================================================================== --- head/www/usermanager/pkg-plist Thu Jun 12 12:58:17 2014 (r357595) +++ head/www/usermanager/pkg-plist Thu Jun 12 13:28:42 2014 (r357596) @@ -1,5 +1,5 @@ %%INSTALLDIR%%/CHANGELOG -%%INSTALLDIR%%/config.php +@sample %%INSTALLDIR%%/config.php.sample %%INSTALLDIR%%/index.php %%INSTALLDIR%%/install.php %%INSTALLDIR%%/readme.txt