From owner-svn-ports-all@FreeBSD.ORG Sun Sep 29 18:14:24 2013 Return-Path: Delivered-To: svn-ports-all@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 ESMTP id 1701948B for ; Sun, 29 Sep 2013 18:14:24 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E1BA321BC for ; Sun, 29 Sep 2013 18:14:22 +0000 (UTC) Received: from [192.168.0.100] ([87.139.233.65]) by mail.gmx.com (mrgmx001) with ESMTPSA (Nemesis) id 0MH07e-1Ve50W0IWg-00Dr7y for ; Sun, 29 Sep 2013 20:14:14 +0200 Message-ID: <52486E02.2010903@gmx.de> Date: Sun, 29 Sep 2013 20:14:26 +0200 From: olli hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: Grzegorz Blach Subject: Re: svn commit: r328633 - head/databases/hiredis References: <201309290002.r8T02xs2055149@svn.freebsd.org> In-Reply-To: <201309290002.r8T02xs2055149@svn.freebsd.org> X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:YAJYXPYNN7DDkTmCn1WGRGehiKj6KLv7tYzrk3zr8Su9mrw9xXJ 29gBp2A9xgsaoZ1zpVssn4721BUQCI3eTFPTDckhylkEvzE6tUifnwF5oYMnVQbzn5e9Lcn /2ftJCMT8N7d0OeKqPasBgmOjfASV5dVXwTaWoI9C4FNznKywNnLxff2pP4B0UsgJUiLibY WGUZGtEt+lSVOYFrbFLRg== Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 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, 29 Sep 2013 18:14:24 -0000 On 2013-09-29 02:02, Grzegorz Blach wrote: > Author: gblach > Date: Sun Sep 29 00:02:58 2013 > New Revision: 328633 > URL: http://svnweb.freebsd.org/changeset/ports/328633 > > Log: > - Convert USE_GMAKE=yes to USES=gmake > - Support staging > > Approved by: crees, tabthorpe (mentors, implicit) > > Modified: > head/databases/hiredis/Makefile > > Modified: head/databases/hiredis/Makefile > ============================================================================== > --- head/databases/hiredis/Makefile Sat Sep 28 23:56:01 2013 (r328632) > +++ head/databases/hiredis/Makefile Sun Sep 29 00:02:58 2013 (r328633) > @@ -15,11 +15,11 @@ GH_ACCOUNT= redis > GH_TAGNAME= v${PORTVERSION} > GH_COMMIT= 0fff0f1 > > -USE_GMAKE= yes > +USES= gmake > +MAKE_ARGS+= PREFIX=${STAGEDIR}${PREFIX} > CFLAGS+= -fPIC > USE_LDCONFIG= yes > > -NO_STAGE= yes > post-patch: > @${REINPLACE_CMD} -e '/^REAL_/s/ \$$(ARCH)//' ${WRKSRC}/Makefile > Hi Grzegorz, this is a cleaner patch, maybe push it to upstream Index: Makefile =================================================================== --- Makefile (revision 328722) +++ Makefile (working copy) @@ -16,7 +16,6 @@ GH_COMMIT= 0fff0f1 USES= gmake -MAKE_ARGS+= PREFIX=${STAGEDIR}${PREFIX} CFLAGS+= -fPIC USE_LDCONFIG= yes Index: files/patch-Makefile =================================================================== --- files/patch-Makefile (revision 0) +++ files/patch-Makefile (working copy) @@ -0,0 +1,13 @@ +--- ./Makefile.orig 2013-09-29 20:03:03.000000000 +0200 ++++ ./Makefile 2013-09-29 20:06:55.000000000 +0200 +@@ -107,8 +107,8 @@ + PREFIX?=/usr/local + INCLUDE_PATH?=include/hiredis + LIBRARY_PATH?=lib +-INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH) +-INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH) ++INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH) ++INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH) + + ifeq ($(uname_S),SunOS) + INSTALL?= cp -r -- Regards, olli