Sat Sep 13 04:44:41 2008 UTC ()
Rely on the presence of a pkgconfig file instead of a libtool archive, in
order to make the detection work with native X.Org on NetBSD, where .la
files are not installed.


(cube)
diff -r1.1 -r1.1.10.1 pkgsrc/x11/libXinerama/builtin.mk
cvs diff -r1.1 -r1.1.10.1 pkgsrc/x11/libXinerama/builtin.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXinerama/builtin.mk 2007/12/16 23:08:05 1.1
+++ pkgsrc/x11/libXinerama/builtin.mk 2008/09/13 04:44:41 1.1.10.1
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: builtin.mk,v 1.1 2007/12/16 23:08:05 tron Exp $ 1# $NetBSD: builtin.mk,v 1.1.10.1 2008/09/13 04:44:41 cube Exp $
2 2
3BUILTIN_PKG:= libXinerama 3BUILTIN_PKG:= libXinerama
4 4
5BUILTIN_FIND_FILES_VAR:= LIB_XINERAMA 5BUILTIN_FIND_FILES_VAR:= LIB_XINERAMA
6BUILTIN_FIND_FILES.LIB_XINERAMA=${X11BASE}/lib/libXinerama.la 6BUILTIN_FIND_FILES.LIB_XINERAMA=${X11BASE}/lib/pkgconfig/xinerama.pc
7 7
8.include "../../mk/buildlink3/bsd.builtin.mk" 8.include "../../mk/buildlink3/bsd.builtin.mk"
9 9
10### 10###
11### Determine if there is a built-in implementation of the package and 11### Determine if there is a built-in implementation of the package and
12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
13### 13###
14.if ${X11BASE} == ${LOCALBASE} 14.if ${X11BASE} == ${LOCALBASE}
15IS_BUILTIN.libXinerama= no 15IS_BUILTIN.libXinerama= no
16.elif !defined(IS_BUILTIN.libXinerama) 16.elif !defined(IS_BUILTIN.libXinerama)
17IS_BUILTIN.libXinerama= no 17IS_BUILTIN.libXinerama= no
18. if empty(LIB_XINERAMA:M__nonexistent__) 18. if empty(LIB_XINERAMA:M__nonexistent__)
19IS_BUILTIN.libXinerama= yes 19IS_BUILTIN.libXinerama= yes