On 02/08/13 06:57, Brian Callahan wrote:
Hi ports --

I discovered that graphics/evince fails at 'make fake' when you have FLAVOR=no_nautilus (or any combination that includes no_nautilus). The attached patched fixes this.

OK?

~Brian


As suggested by aja@, use .if ${FLAVOR...

This simplifies the diff by a lot, and I think avoids a bump in REVISION (though feel free to correct me if I'm wrong about that).

OK?

~Brian

? evincefix2.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/evince/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- Makefile	15 Oct 2012 09:48:31 -0000	1.85
+++ Makefile	8 Feb 2013 16:38:10 -0000
@@ -124,7 +124,11 @@ CONFIGURE_ARGS+= --disable$s
 .endfor
 
 post-install:
+# This will fail if no_nautilus is found in FLAVOR, so make sure we don't
+# do it if it is.
+.if !${FLAVOR:L:Mno_nautilus}
 	rm ${PREFIX}/lib/nautilus/extensions-${MAJ_V}/*.la
+.endif
 	rm ${PREFIX}/lib/evince/4/backends/*.la
 
 .include <bsd.port.mk>

Reply via email to