From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 13 17:10:02 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3D2BC55 for ; Tue, 13 May 2014 17:10:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 CD2D62B1A for ; Tue, 13 May 2014 17:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4DHA1tL085818 for ; Tue, 13 May 2014 17:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4DHA1c5085817; Tue, 13 May 2014 17:10:01 GMT (envelope-from gnats) Resent-Date: Tue, 13 May 2014 17:10:01 GMT Resent-Message-Id: <201405131710.s4DHA1c5085817@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Zsolt Udvari Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0B4499DE for ; Tue, 13 May 2014 17:06:14 +0000 (UTC) Received: from mail-ee0-x231.google.com (mail-ee0-x231.google.com [IPv6:2a00:1450:4013:c00::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 962822ADB for ; Tue, 13 May 2014 17:06:13 +0000 (UTC) Received: by mail-ee0-f49.google.com with SMTP id e53so618270eek.36 for ; Tue, 13 May 2014 10:06:11 -0700 (PDT) Received: from bsd-zsolt (91.83.186.245.pool.invitel.hu. [91.83.186.245]) by mx.google.com with ESMTPSA id u46sm41491387eel.1.2014.05.13.10.06.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 May 2014 10:06:10 -0700 (PDT) Received: by bsd-zsolt (sSMTP sendmail emulation); Tue, 13 May 2014 19:05:30 +0200 Message-Id: <53725102.46ad0e0a.5ee5.ffffe6d7@mx.google.com> Date: Tue, 13 May 2014 19:05:30 +0200 From: Zsolt Udvari Reply-To: Zsolt Udvari To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/189777: [patch] www/codeigniter staging, change url Cc: udvzsolt@gmail.com X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2014 17:10:02 -0000 >Number: 189777 >Category: ports >Synopsis: [patch] www/codeigniter staging, change url >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue May 13 17:10:01 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Zsolt Udvari >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD bsd-zsolt 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: www/codeigniter staging support change url to http://ellislab.com/codeigniter >How-To-Repeat: >Fix: --- codeigniter.diff begins here --- diff -ur codeigniter.orig/Makefile codeigniter/Makefile --- codeigniter.orig/Makefile 2014-05-13 18:52:44.000000000 +0200 +++ codeigniter/Makefile 2014-05-13 19:02:33.000000000 +0200 @@ -13,6 +13,8 @@ USES= zip +NEED_ROOT=yes + CONFLICTS= codeigniter-1.[0-9]* NO_BUILD= yes @@ -73,7 +75,6 @@ PGSQL_DESC= Install PostgreSQL support for PHP SQLITE_DESC= Install SQLite support for PHP -NO_STAGE= yes .include .if ${PORT_OPTIONS:MAPACHE} @@ -159,24 +160,24 @@ @${ECHO_MSG} "" do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${WWWDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${STAGEDIR}${WWWDIR} @for i in ${CI_CONF_FILES}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$i ${WWWDIR}/$$i.sample; \ + ${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${WWWDIR}/$$i.sample; \ done - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \ - ${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST} - @${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 - @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \ + ${STAGEDIR}${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 + @${ECHO_CMD} '@exec ${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | \ ${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST} - @${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 - @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \ + @${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${ECHO_CMD} '@exec ${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | \ ${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST} post-install: @for i in ${CI_CONF_FILES}; do \ - if [ ! -f ${WWWDIR}/$$i ]; then \ - ${CP} -p ${WWWDIR}/$$i.sample ${WWWDIR}/$$i; \ + if [ ! -f ${STAGEDIR}${WWWDIR}/$$i ]; then \ + ${CP} -p ${STAGEDIR}${WWWDIR}/$$i.sample ${STAGEDIR}${WWWDIR}/$$i; \ else \ ${ECHO_MSG} "===> Customized ${WWWDIR}/$$i has not been overwritten"; \ if [ ! -z "$UPGRADE_TOOL" ]; then \ @@ -197,7 +198,7 @@ fi .endif .if ${PORT_OPTIONS:MDOCS} - @cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${DOCSDIR} + @cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} diff -ur codeigniter.orig/pkg-descr codeigniter/pkg-descr --- codeigniter.orig/pkg-descr 2014-05-13 18:52:44.000000000 +0200 +++ codeigniter/pkg-descr 2014-05-13 19:03:06.000000000 +0200 @@ -2,4 +2,4 @@ built for PHP coders who need a simple and elegant toolkit to create full-featured web applications. -WWW: http://codeigniter.com/ +WWW: http://ellislab.com/codeigniter --- codeigniter.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: