Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Jun 2013 19:44:59 +0200 (CEST)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/179933: [patch] www/serf: remove gmake dependency
Message-ID:  <201306241744.r5OHixmc048801@kalimero.tijl.coosemans.org>
Resent-Message-ID: <201306241750.r5OHo191080940@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         179933
>Category:       ports
>Synopsis:       [patch] www/serf: remove gmake dependency
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 24 17:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Tijl Coosemans
>Release:        FreeBSD 10.0-CURRENT i386
>Organization:
>Environment:
>Description:
I'm going over devel/subversion dependencies to see if any can be
removed. The attached patch removes gmake from www/serf and some
other small changes:
- Put PROJECTHOST together with MASTER_SITES.
- Replace NOPORTDOCS with DOCS option.
- Remove USE_GMAKE.
- Silence post-patch.
- Rename check target to regression-test such that pointyhat runs
  the tests.
- Put parentheses around "cd <dir> && <command>" as recommended
  by make(1).
>How-To-Repeat:
>Fix:

--- serf.patch begins here ---
Index: www/serf/Makefile
===================================================================
--- www/serf/Makefile	(revision 321639)
+++ www/serf/Makefile	(working copy)
@@ -6,33 +6,35 @@ PORTVERSION=	1.2.1
 CATEGORIES=	www
 MASTER_SITES=	GOOGLE_CODE
 MASTER_SITE_SUBDIR=	db
+PROJECTHOST=	serf
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Serf HTTP client library
 
 LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr1
 
-MAKE_JOBS_SAFE=	yes
+OPTIONS_DEFINE=	DOCS
 
-PROJECTHOST=	serf
+MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USES=	pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/bin/apr-1-config \
 			--with-apr-util=${LOCALBASE}/bin/apu-1-config
 
+.include <bsd.port.options.mk>
+
 post-patch:
-	${REINPLACE_CMD} -e '/^Requires.private/d' ${WRKSRC}/serf.pc.in
+	@${REINPLACE_CMD} -e '/^Requires.private/d' ${WRKSRC}/serf.pc.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/design-guide.txt ${DOCSDIR}
 .endif
 
-check:
-	@cd ${WRKSRC}/ && ${MAKE} check
+regression-test:
+	@(cd ${WRKSRC} && ${MAKE} check)
 
 .include <bsd.port.mk>
--- serf.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306241744.r5OHixmc048801>