Date: Mon, 1 Jul 2013 04:21:36 +0400 (MSK) From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@freebsd.org Cc: brd@FreeBSD.org Subject: ports/180139: [PATCH] sysutils/rsyslog7: Make UUID support optional Message-ID: <201307010021.r610LaiO031358@z29.zvq.me> Resent-Message-ID: <201307010030.r610U0ua035727@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk> @@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307010021.r610LaiO031358>