Date: Wed, 17 Jul 2013 18:28:35 +0200 (CEST) From: Tijl Coosemans <tijl@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/180612: [patch] devel/subversion: let bindings ports load options file. Message-ID: <201307171628.r6HGSZvU004021@kalimero.tijl.coosemans.org> Resent-Message-ID: <201307171630.r6HGU2GR093743@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180612
>Category: ports
>Synopsis: [patch] devel/subversion: let bindings ports load options file.
>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: Wed Jul 17 16:30:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Tijl Coosemans
>Release: FreeBSD 10.0-CURRENT i386
>Organization:
>Environment:
>Description:
- Set OPTIONS_NAME to let bindings ports load the new options file.
Leave OPTIONSFILE for now to load the old file on systems where
it hasn't been moved to the new location yet.
- Remove an old hack.
>How-To-Repeat:
>Fix:
--- subversion.patch begins here ---
Index: devel/subversion/Makefile.common
===================================================================
--- devel/subversion/Makefile.common (revision 323178)
+++ devel/subversion/Makefile.common (working copy)
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --without-swig \
CONFLICTS_BUILD+= ${PORTNAME}-1.[6|7].[0-9]*
LIB_DEPENDS+= svn_client-1.0:${PORTSDIR}/devel/subversion
OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
-OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
+OPTIONS_NAME= devel_subversion
.endif
.include <bsd.port.options.mk>
Index: devel/subversion16/Makefile.common
===================================================================
--- devel/subversion16/Makefile.common (revision 323099)
+++ devel/subversion16/Makefile.common (working copy)
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --with-ssl \
CONFLICTS_BUILD+= ${PORTNAME}-1.[7|8].[0-9]*
LIB_DEPENDS+= svn_client-1.0:${PORTSDIR}/devel/subversion16
OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}16/options
-OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
+OPTIONS_NAME= devel_subversion16
.endif
.include <bsd.port.options.mk>
Index: devel/subversion17/Makefile.common
===================================================================
--- devel/subversion17/Makefile.common (revision 323099)
+++ devel/subversion17/Makefile.common (working copy)
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --with-ssl \
CONFLICTS_BUILD+= ${PORTNAME}-1.[6|8].[0-9]*
LIB_DEPENDS+= svn_client-1.0:${PORTSDIR}/devel/subversion17
OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
-OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
+OPTIONS_NAME= devel_subversion17
.endif
.include <bsd.port.options.mk>
--- subversion.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?201307171628.r6HGSZvU004021>