From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 1 00:30:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7B953D58 for ; Mon, 1 Jul 2013 00:30:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 6302F1182 for ; Mon, 1 Jul 2013 00:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r610U0HM035728 for ; Mon, 1 Jul 2013 00:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r610U0ua035727; Mon, 1 Jul 2013 00:30:00 GMT (envelope-from gnats) Resent-Date: Mon, 1 Jul 2013 00:30:00 GMT Resent-Message-Id: <201307010030.r610U0ua035727@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sevan Janiyan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 39C22CF8; Mon, 1 Jul 2013 00:21:39 +0000 (UTC) (envelope-from sevan@z29.zvq.me) Received: from z29.zvq.me (z29.zvq.me [178.251.98.172]) by mx1.freebsd.org (Postfix) with ESMTP id 91C8F114F; Mon, 1 Jul 2013 00:21:38 +0000 (UTC) Received: from z29.zvq.me (localhost [127.0.0.1]) by z29.zvq.me (8.14.7/8.14.7) with ESMTP id r610LaNl031359; Mon, 1 Jul 2013 04:21:36 +0400 (MSK) (envelope-from sevan@z29.zvq.me) Received: (from sevan@localhost) by z29.zvq.me (8.14.7/8.14.7/Submit) id r610LaiO031358; Mon, 1 Jul 2013 04:21:36 +0400 (MSK) (envelope-from sevan) Message-Id: <201307010021.r610LaiO031358@z29.zvq.me> Date: Mon, 1 Jul 2013 04:21:36 +0400 (MSK) From: Sevan Janiyan To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/180139: [PATCH] sysutils/rsyslog7: Make UUID support optional Cc: brd@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jul 2013 00:30:00 -0000 >Number: 180139 >Category: ports >Synopsis: [PATCH] sysutils/rsyslog7: Make UUID support optional >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 Jul 01 00:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Sevan Janiyan >Release: FreeBSD 10.0-CURRENT amd64 >Organization: Dream Industries >Environment: System: FreeBSD 10.0-CURRENT FreeBSD 10.0-CURRENT #4 r252362: Sat Jun 29 04:03:50 MSK >Description: UUID support is provided via e2fsprogs-libuuid which conflicts with ossp-uuid This causes problems if you want to have postgresql*-contrib installed with OSSP_UUID option enabled. Enabled E2FS_UUID option by default so that there is no change in functionality. Port maintainer (brd@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- rsyslog-7.2.7.patch begins here --- diff -ruN /usr/ports/sysutils/rsyslog7/Makefile ./Makefile --- /usr/ports/sysutils/rsyslog7/Makefile 2013-05-26 00:10:11.000000000 +0400 +++ ./Makefile 2013-07-01 04:10:05.714194899 +0400 @@ -11,8 +11,7 @@ LIB_DEPENDS= ee:${PORTSDIR}/devel/libee \ estr:${PORTSDIR}/devel/libestr \ json.0:${PORTSDIR}/devel/json-c \ - sysinfo:${PORTSDIR}/devel/libsysinfo \ - uuid:${PORTSDIR}/misc/e2fsprogs-libuuid + sysinfo:${PORTSDIR}/devel/libsysinfo USE_LDCONFIG= yes @@ -20,7 +19,8 @@ PORTDOCS= * PORTEXAMPLES= * -OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP +OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP E2FS_UUID +OPTIONS_DEFAULT= E2FS_UUID DBI_DESC= LibDBI output module for rsyslog GNUTLS_DESC= GNUTLS module for rsyslog @@ -30,6 +30,7 @@ RELP_DESC= RELP input/output module for rsyslog RFC3195_DESC= RFC3195 input support for rsyslog SNMP_DESC= SNMP trap sender for rsyslog +E2FS_UUID_DESC= Universally unique identifier support for rsyslog .include @@ -115,6 +116,12 @@ CONFIGURE_ARGS+=--disable-snmp .endif +.if ${PORT_OPTIONS:ME2FS_UUID} +LIB_DEPENDS+= uuid:${PORTSDIR}/misc/e2fsprogs-libuuid +.else +CONFIGURE_ARGS+=--disable-uuid +.endif + .ifdef WITH_MYSQL_MICROSECONDS EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds .endif --- rsyslog-7.2.7.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: