Attachment 146635 Details for Bug 193231 – patch to security/broccoli

patch to security/broccoli

patch.txt (text/plain), 1.61 KB, created by Craig Leres on 2014-09-01 18:53:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Craig Leres

Created: 2014-09-01 18:53:05 UTC

Size: 1.61 KB

patch

obsolete

>--- Makefile.orig	2014-08-11 16:24:35.000000000 -0700
>+++ Makefile	2014-09-01 11:47:59.000000000 -0700
>@@ -19,7 +19,7 @@
> 
> EXTRACT_AFTER_ARGS=	${DISTNAME}/aux/broccoli
> 
>-USES=		cmake:outsource
>+USES=		cmake:outsource python
> USE_LDCONFIG=	yes
> CMAKE_SOURCE_PATH=	${WRKSRC}/aux/broccoli
> 
>@@ -44,7 +44,6 @@
> RUBY_DESC=	Build ruby bindings for broccoli
> 
> DEBUG_CMAKE_ON=	-D ENABLE_DEBUG:BOOL=true
>-PYTHON_USE=	python=yes
> PYTHON_CMAKE_ON=	-D PY_MOD_INSTALL_DIR:PATH=${PYTHON_SITELIBDIR}
> PYTHON_CMAKE_OFF=	-D DISABLE_PYTHON_BINDINGS:BOOL=true
> RUBY_USE=	ruby=yes
>@@ -57,14 +56,14 @@
> 	# pkg_install needs PREFIX in order to make a package from STAGEDIR/PREFIX.
> 	@${MKDIR} ${PREFIX}
> .endif
>-.if defined(BRO_PREFIX) && empty(${PORT_OPTIONS:MPYTHON})
>-	# Move lib/pythonX.X tree into BRO_PREFIX
>-	${MV} ${STAGEDIR}${PYTHON_LIBDIR} ${STAGEDIR}${PREFIX}/lib
>+.if defined(BRO_PREFIX) && !empty(PORT_OPTIONS:MPYTHON)
>+# Move lib/pythonX.X tree into BRO_PREFIX
>+	@${MV} ${STAGEDIR}${PYTHON_LIBDIR} ${STAGEDIR}${PREFIX}/lib
> .endif
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
> 	@${MV} ${STAGEDIR}${PREFIX}/etc/broccoli.conf ${STAGEDIR}${PREFIX}/etc/broccoli.conf.example
> .if !empty(${PORT_OPTIONS:MPYTHON}) && defined(BRO_PREFIX)
>-	# bsd.python.mk isn't PREFIX-safe yet.
>+# bsd.python.mk isn't PREFIX-safe yet.
> 	@${MV} ${STAGEDIR}${PYTHON_LIBDIR} ${STAGEDIR}${PYTHONPREFIX_LIBDIR}
> .endif
> 
>--- pkg-plist.orig	2014-08-10 23:56:16.000000000 -0700
>+++ pkg-plist	2014-09-01 11:47:59.000000000 -0700
>@@ -21,4 +21,3 @@
> %%CLEANUP_PREFIX%%@dirrmtry include
> %%CLEANUP_PREFIX%%@dirrmtry etc
> %%CLEANUP_PREFIX%%@dirrmtry bin
>-%%CLEANUP_PREFIX%%@unexec rmdir %D || :

Flags:

leres: maintainer-approval+

Actions: View

Attachments on bug 193231: 146635