From jbeich@tormail.org  Sun Jul 22 09:28:13 2012
Return-Path: <jbeich@tormail.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BAB6C106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 22 Jul 2012 09:28:13 +0000 (UTC)
	(envelope-from jbeich@tormail.org)
Received: from server2.allsitecontrol.com (server2.allsitecontrol.com [63.143.36.210])
	by mx1.freebsd.org (Postfix) with ESMTP id 80EC98FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 22 Jul 2012 09:28:13 +0000 (UTC)
Received: from [199.48.147.37] (port=64714 helo=internal.tormail.org)
	by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128)
	(Exim 4.77)
	(envelope-from <jbeich@tormail.org>)
	id 1SssSD-003DSS-Nw
	for FreeBSD-gnats-submit@freebsd.org; Sun, 22 Jul 2012 05:28:01 -0400
Received: from jbeich by internal.tormail.org with local (Exim 4.63)
	(envelope-from <jbeich@tormail.org>)
	id 1SssQg-0002AC-HL
	for FreeBSD-gnats-submit@freebsd.org; Sun, 22 Jul 2012 09:26:23 +0000
Message-Id: <1SssQg-0002AC-HL@internal.tormail.org>
Date: Sun, 22 Jul 2012 04:26:16 -0500
From: Jan Beich <jbeich@tormail.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] sysutils/tmux: simplify libevent flags

>Number:         170064
>Category:       ports
>Synopsis:       [patch] sysutils/tmux: simplify libevent flags
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gahr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 22 09:30:10 UTC 2012
>Closed-Date:    Mon Aug 06 08:16:44 UTC 2012
>Last-Modified:  Mon Aug  6 08:20:03 UTC 2012
>Originator:     Jan Beich
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
>Description:
- leverage pkg-config[1] for libevent2 cflags/libs
- make LIBEVENT_(CFLAGS|LIBS) for libevent14 similar[2] to libevent2
- get rid of autoconf

[1] http://sourceforge.net/tracker/?func=detail&aid=3427624&group_id=200378&atid=973264
[2] -O2 -fno-strict-aliasing -pipe is not related to libevent
>How-To-Repeat:
>Fix:
--- event.diff begins here ---
Index: sysutils/tmux/Makefile
===================================================================
--- sysutils/tmux/Makefile	(revision 301267)
+++ sysutils/tmux/Makefile	(working copy)
@@ -15,7 +15,7 @@ COMMENT=	A Terminal Multiplexer
 
 LICENSE=	BSD
 
-USE_AUTOTOOLS=	autoconf
+GNU_CONFIGURE=	yes
 
 MAN1=		tmux.1
 
@@ -30,22 +30,17 @@ OPTIONS=	LIBEVENT2	"Use libevent version 2" Off \
 		LIBEVENT_STATIC	"Build with static libevent" Off \
 		BACKSPACE 	"Build with tty/keys patch" Off
 
-CONFIGURE_ENV+=	"LIBEVENT_CFLAGS=${CFLAGS}" \
-		"LIBEVENT_LIBS=${LDFLAGS} -levent"
-
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_LIBEVENT2)
 LIB_DEPENDS=	event-2.0:${PORTSDIR}/devel/libevent2
-CFLAGS+=	-I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib/event2
 . if defined(WITH_LIBEVENT_STATIC)
 LESTATIC=	${LOCALBASE}/lib/event2/libevent.a
 . endif
 .else
 LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV+=	LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \
+		LIBEVENT_LIBS="-L${LOCALBASE}/lib -levent"
 . if defined(WITH_LIBEVENT_STATIC)
 LESTATIC=	${LOCALBASE}/lib/libevent.a
 . endif
@@ -59,8 +54,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' \
 		${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h ${WRKSRC}/CHANGES
 	${REINPLACE_CMD} -e '/LIBS=/s/-lrt//' ${WRKSRC}/${CONFIGURE_SCRIPT}
+
+post-configure:
 .if defined(WITH_LIBEVENT_STATIC)
-	${REINPLACE_CMD} -e 's|$$LIBEVENT_LIBS |${LESTATIC} |' ${WRKSRC}/configure.ac
+	${REINPLACE_CMD} -e '/LIBS/s|-levent[^[:blank:]]*|${LESTATIC}|' \
+		${WRKSRC}/${MAKEFILE}
 .endif
 
 do-install:
--- event.diff ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gahr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jul 22 09:30:51 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170064 
State-Changed-From-To: open->closed 
State-Changed-By: gahr 
State-Changed-When: Mon Aug 6 08:16:42 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170064 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170064: commit references a PR
Date: Mon,  6 Aug 2012 08:16:53 +0000 (UTC)

 Author: gahr
 Date: Mon Aug  6 08:16:31 2012
 New Revision: 302152
 URL: http://svn.freebsd.org/changeset/ports/302152
 
 Log:
   - Simplify libevent flags [1]
   - Use new OPTIONS framework
   
   PR:		170064 [1]
   Submitted by:	Jan Beich <jbeich@tormail.org>
 
 Modified:
   head/sysutils/tmux/Makefile   (contents, props changed)
 
 Modified: head/sysutils/tmux/Makefile
 ==============================================================================
 --- head/sysutils/tmux/Makefile	Mon Aug  6 07:31:43 2012	(r302151)
 +++ head/sysutils/tmux/Makefile	Mon Aug  6 08:16:31 2012	(r302152)
 @@ -15,7 +15,7 @@ COMMENT=	A Terminal Multiplexer
  
  LICENSE=	BSD
  
 -USE_AUTOTOOLS=	autoconf
 +GNU_CONFIGURE=	yes
  
  MAN1=		tmux.1
  
 @@ -26,32 +26,29 @@ PLIST_DIRSTRY=	etc/bash_completion.d
  PORTDOCS=	CHANGES FAQ NOTES
  PORTEXAMPLES=	*
  
 -OPTIONS=	LIBEVENT2	"Use libevent version 2" Off \
 -		LIBEVENT_STATIC	"Build with static libevent" Off \
 -		BACKSPACE 	"Build with tty/keys patch" Off
 +OPTIONS_DEFINE=	LIBEVENT2 LIBEVENT_STATIC BACKSPACE
  
 -CONFIGURE_ENV+=	"LIBEVENT_CFLAGS=${CFLAGS}" \
 -		"LIBEVENT_LIBS=${LDFLAGS} -levent"
 +LIBEVENT2_DESC=	Use libevent version 2
 +LIBEVENT_STATIC_DESC=	Build with static libevent
 +BACKSPACE_DESC=	Build wiht tty/keys patch
  
 -.include <bsd.port.pre.mk>
 +.include <bsd.port.options.mk>
  
 -.if defined(WITH_LIBEVENT2)
 +.if ${PORT_OPTIONS:MLIBEVENT2}
  LIB_DEPENDS=	event-2.0:${PORTSDIR}/devel/libevent2
 -CFLAGS+=	-I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
 -LDFLAGS+=	-L${LOCALBASE}/lib/event2
 -. if defined(WITH_LIBEVENT_STATIC)
 +. if ${PORT_OPTIONS:MLIBEVENT_STATIC}
  LESTATIC=	${LOCALBASE}/lib/event2/libevent.a
  . endif
  .else
  LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
 -CFLAGS+=	-I${LOCALBASE}/include
 -LDFLAGS+=	-L${LOCALBASE}/lib
 +CONFIGURE_ENV+=	LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \
 +		LIBEVENT_LIBS="-L${LOCALBASE}/lib -levent"
  . if defined(WITH_LIBEVENT_STATIC)
  LESTATIC=	${LOCALBASE}/lib/libevent.a
  . endif
  .endif
  
 -.if defined(WITH_BACKSPACE)
 +.if ${PORT_OPTIONS:MBACKSPACE}
  EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tty-keys.c
  .endif
  
 @@ -59,8 +56,11 @@ post-patch:
  	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' \
  		${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h ${WRKSRC}/CHANGES
  	${REINPLACE_CMD} -e '/LIBS=/s/-lrt//' ${WRKSRC}/${CONFIGURE_SCRIPT}
 +
 +post-configure:
  .if defined(WITH_LIBEVENT_STATIC)
 -	${REINPLACE_CMD} -e 's|$$LIBEVENT_LIBS |${LESTATIC} |' ${WRKSRC}/configure.ac
 +	${REINPLACE_CMD} -e '/LIBS/s|-levent[^[:blank:]]*|${LESTATIC}|' \
 +		${WRKSRC}/${MAKEFILE}
  .endif
  
  do-install:
 @@ -82,4 +82,4 @@ post-install:
  	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
  .endif
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
