Re: uuid dance

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

P.S. the attached got farsight2 building for me. One could try the experiment
and apply this to find out the original problem was...

Cheers,

Patrick

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/gupnp/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- Makefile	20 Jul 2018 03:33:53 -0000	1.54
+++ Makefile	3 Aug 2018 08:57:16 -0000
@@ -24,19 +24,11 @@
 #CONFIGURE_ARGS+=	--disable-shared
 #CONFIGURE_ARGS+=	--enable-static
 
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
-pre-configure:
-	cp ${FILESDIR}/uuid.pc ${BUILDLINK_DIR}/lib/pkgconfig/
-.else
-.include "../../devel/libuuid/buildlink3.mk"
-.endif
-
 .include "../../archivers/xz/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.39.90
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/libuuid/buildlink3.mk"
 .include "../../lang/python/application.mk"
 BUILDLINK_API_DEPENDS.libsoup+=	libsoup>=2.48.0
 .include "../../net/libsoup/buildlink3.mk"
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/gupnp/buildlink3.mk,v
retrieving revision 1.36
diff -u -r1.36 buildlink3.mk
--- buildlink3.mk	20 Jul 2018 03:33:53 -0000	1.36
+++ buildlink3.mk	3 Aug 2018 08:57:16 -0000
@@ -9,15 +9,8 @@
 BUILDLINK_ABI_DEPENDS.gupnp+=	gupnp>=1.0.2nb3
 BUILDLINK_PKGSRCDIR.gupnp?=	../../net/gupnp
 
-.include "../../mk/bsd.fast.prefs.mk"
-.if (!empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin") && (!defined(USE_INTERNAL_UUID) || empty(USE_INTERNAL_UUID:M[Yy][Ee][Ss]))
-pre-configure:
-	cp ${BUILDLINK_PKGSRCDIR.gupnp}/files/uuid.pc ${BUILDLINK_DIR}/lib/pkgconfig/
-.else
-.include "../../devel/libuuid/buildlink3.mk"
-.endif
-
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libuuid/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
 .include "../../net/gssdp/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"