ports/173740: [PATCH] devel/libevent2: OPTIONSNG & trim Makefile header

[Edward]

>Number:         173740
>Category:       ports
>Synopsis:       [PATCH] devel/libevent2: OPTIONSNG & trim Makefile header
>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:   Tue Nov 20 17:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Edward
>Release:        FreeBSD 8.3-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD optionsng 8.3-RELEASE FreeBSD 8.3-RELEASE #0: Mon Apr  9 21:23:18 UTC
>Description:
- Update to use OPTIONSNG
- Trim Makefile header

Additionally, removed "CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" in Makefile to make portlint happy. Previously, portlint was complaining about:

FATAL: Makefile: LDFLAGS is already passed in CONFIGURE_ENV via bsd.port.mk.  If you need to override the default value, alter LDFLAGS in the Makefile instead with LDFLAGS+=...

Port maintainer (mm at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

begin 644 libevent2-2.0.20.patch
--- Makefile.original	2012-11-18 12:18:01.000000000 +0800
+++ Makefile	2012-11-21 01:19:38.000000000 +0800
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libevent2
-# Date created:				22 February 2011
-# Whom:					Martin Matuska <mm at FreeBSD.org>
-#
-# $FreeBSD: ports/devel/libevent2/Makefile,v 1.14 2012/10/26 11:11:17 bapt Exp $
-#
+# Created by:					Martin Matuska <mm at FreeBSD.org>
+# $FreeBSD$
 
 PORTNAME=	libevent2
 DISTVERSION=	2.0.20
@@ -19,17 +15,19 @@
 
 USE_GNOME=	lthack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	${PREFIX}/lib/event2
 
-OPTIONS=	OPENSSL "Enable OpenSSL support" on \
-		THREADS "Enable threads support" on
+OPTIONS_DEFINE=	THREADS OPENSSL
+OPTIONS_DEFAULT=	THREADS OPENSSL
+
+THREADS_DESC=	Enable threads support
+OPENSSL_DESC=	Enable OpenSSL support
 
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/event2
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITH_OPENSSL)
+.if !${PORT_OPTIONS:MOPENSSL}
 CONFIGURE_ARGS+=	--disable-openssl
 PLIST_SUB+=		OPENSSL="@comment "
 .else
@@ -41,7 +39,7 @@
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITH_THREADS)
+.if !${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=	--disable-thread-support
 PLIST_SUB+=		THREADS="@comment "
 .else
end

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