From owner-svn-ports-head@FreeBSD.ORG Sun May 18 10:22:46 2014 Return-Path: Delivered-To: svn-ports-head@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 22AE81DE; Sun, 18 May 2014 10:22:46 +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 0FD022DD8; Sun, 18 May 2014 10:22:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4IAMj6e085953; Sun, 18 May 2014 10:22:45 GMT (envelope-from tota@svn.freebsd.org) Received: (from tota@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4IAMj3M085950; Sun, 18 May 2014 10:22:45 GMT (envelope-from tota@svn.freebsd.org) Message-Id: <201405181022.s4IAMj3M085950@svn.freebsd.org> From: TAKATSU Tomonari Date: Sun, 18 May 2014 10:22:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354408 - head/www/mod_amazon_proxy X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 May 2014 10:22:46 -0000 Author: tota Date: Sun May 18 10:22:44 2014 New Revision: 354408 URL: http://svnweb.freebsd.org/changeset/ports/354408 QAT: https://qat.redports.org/buildarchive/r354408/ Log: - Convert to new LIB_DEPENDS format - Make use of AP_FAST_BUILD - Support STAGEDIR * Make PORTDOCS and PORTEXAMPLES unconditional to stage - Add OPTIONS_DEFINE for DOCS and EXAMPLES - Unmute INSTALL_DATA - Fix typo in x-generate-tarball target - Replace tab with a single space after WWW: in pkg-descr - Make use of @sample in pkg-plist Modified: head/www/mod_amazon_proxy/Makefile head/www/mod_amazon_proxy/pkg-descr head/www/mod_amazon_proxy/pkg-plist Modified: head/www/mod_amazon_proxy/Makefile ============================================================================== --- head/www/mod_amazon_proxy/Makefile Sun May 18 08:13:56 2014 (r354407) +++ head/www/mod_amazon_proxy/Makefile Sun May 18 10:22:44 2014 (r354408) @@ -10,9 +10,10 @@ MASTER_SITE_SUBDIR= tota/${PORTNAME} MAINTAINER= tota@FreeBSD.org COMMENT= Amazon Auth Proxy for Product Advertising API -LIB_DEPENDS= apreq2:${PORTSDIR}/www/libapreq2 +LIB_DEPENDS= libapreq2.so:${PORTSDIR}/www/libapreq2 USE_APACHE= 22 +AP_FAST_BUILD= yes CONFFILE= httpd-amazon-proxy.conf CONFDIR= ${PREFIX}/${APACHEETCDIR}/Includes @@ -20,36 +21,27 @@ CONFDIR= ${PREFIX}/${APACHEETCDIR}/Inclu PORTDOCS= README PORTEXAMPLES= rpaproxy.yaml -NO_STAGE= yes +OPTIONS_DEFINE= DOCS EXAMPLES + post-patch: @${REINPLACE_CMD} -e 's|modules|${APACHEMODDIR}|' ${WRKSRC}/${CONFFILE}.sample -do-build: - @${APXS} -c ${BUILD_WRKSRC}/${PORTNAME}.c - -do-install: - @${APXS} -i ${INSTALL_WRKSRC}/${PORTNAME}.la - ${INSTALL_DATA} ${WRKSRC}/${CONFFILE}.sample ${CONFDIR} - @if [ ! -f ${CONFDIR}/${CONFFILE} ]; then \ - ${CP} -p ${CONFDIR}/${CONFFILE}.sample ${CONFDIR}/${CONFFILE}; \ - fi -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} -.endif -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${EXAMPLESDIR} -.endif +post-install: + @${MKDIR} ${STAGEDIR}${CONFDIR} + ${INSTALL_DATA} ${WRKSRC}/${CONFFILE}.sample ${STAGEDIR}${CONFDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} x-generate-tarball: ${SETENV} ${FETCH_ENV} ${FETCH_BINARY} -m -o ${PORTNAME}.tar.gz \ https://github.com/machu/mod_amazon_proxy/tarball/master target=`${TAR} -tvf ${PORTNAME}.tar.gz | head -n 1`; \ dir=`${ECHO} $${target} | ${AWK} '{print $$9}' | ${SED} -e 's|/$$||'`; \ - year=`${ECHO} $${target} | ${AWK} '{print $$8}`; \ - month=`${ECHO} $${target} | ${AWK} '{print $$6}`; \ - day=`${ECHO} $${target} | ${AWK} '{print $$7}`; \ + year=`${ECHO} $${target} | ${AWK} '{print $$8}'`; \ + month=`${ECHO} $${target} | ${AWK} '{print $$6}'`; \ + day=`${ECHO} $${target} | ${AWK} '{print $$7}'`; \ date=`date -j -f "%B %d %Y" "$${month} $${day} $${year}" +"%Y%m%d"`; \ ${TAR} -zxf ${PORTNAME}.tar.gz; \ ${RM} ${PORTNAME}.tar.gz; \ Modified: head/www/mod_amazon_proxy/pkg-descr ============================================================================== --- head/www/mod_amazon_proxy/pkg-descr Sun May 18 08:13:56 2014 (r354407) +++ head/www/mod_amazon_proxy/pkg-descr Sun May 18 10:22:44 2014 (r354408) @@ -1,4 +1,4 @@ Authentication Proxy Server of Amazon Product Advertising API for Apache module. -WWW: https://github.com/machu/mod_amazon_proxy +WWW: https://github.com/machu/mod_amazon_proxy Modified: head/www/mod_amazon_proxy/pkg-plist ============================================================================== --- head/www/mod_amazon_proxy/pkg-plist Sun May 18 08:13:56 2014 (r354407) +++ head/www/mod_amazon_proxy/pkg-plist Sun May 18 10:22:44 2014 (r354408) @@ -1,4 +1,2 @@ %%APACHEMODDIR%%/mod_amazon_proxy.so -@unexec if cmp -s %D/%%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf.sample %D/%%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf; then rm -f %D/%%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf; fi -%%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf.sample -@exec [ -f %B/%%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf ] || cp %B/%f %B/%%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf +@sample %%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf.sample