svn commit: r328633 - head/databases/hiredis

[olli hauer]

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