diff options
-rw-r--r-- | pkgtools/x11-links/Makefile | 4 | ||||
-rw-r--r-- | pkgtools/x11-links/buildlink3.mk | 4 | ||||
-rw-r--r-- | pkgtools/x11-links/files/xorg | 5 | ||||
-rw-r--r-- | pkgtools/x11-links/files/xorg.pixman | 9 | ||||
-rw-r--r-- | pkgtools/x11-links/xorg.mk | 3 |
5 files changed, 19 insertions, 6 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 2b888738805..b3b174d9592 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.93 2008/08/22 13:34:39 tron Exp $ +# $NetBSD: Makefile,v 1.94 2008/09/16 12:38:38 tron Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in buildlink3.mk to the correct version, # usually the most recent. -DISTNAME= x11-links-0.37 +DISTNAME= x11-links-0.38 CATEGORIES= pkgtools x11 MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index 8037d63e744..30cc87d4992 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/08/22 13:34:39 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2008/09/16 12:38:38 tron Exp $ # # Don't include this file manually! It will be included as necessary # by bsd.buildlink3.mk. @@ -18,7 +18,7 @@ BUILDLINK_PACKAGES:= x11-links ${BUILDLINK_PACKAGES} BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x11-links .if !empty(X11_LINKS_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.37 +BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.38 BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links BUILDLINK_DEPMETHOD.x11-links?= build diff --git a/pkgtools/x11-links/files/xorg b/pkgtools/x11-links/files/xorg index 53f1726ff66..0fc47ca264f 100644 --- a/pkgtools/x11-links/files/xorg +++ b/pkgtools/x11-links/files/xorg @@ -1,4 +1,4 @@ -# $NetBSD: xorg,v 1.7 2008/08/22 13:34:39 tron Exp $ +# $NetBSD: xorg,v 1.8 2008/09/16 12:38:38 tron Exp $ # # The files listed below are the union of the sets of files installed by # the supported Xorg (and some XFree) distributions, minus the set of files @@ -354,6 +354,9 @@ lib/libXaw.6.dylib lib/libXaw.7.0.dylib lib/libXaw.7.dylib lib/libXaw.8.dylib +lib/libXaw6.6.dylib +lib/libXaw7.7.dylib +lib/libXaw8.8.dylib lib/libXaw.a lib/libXaw.dylib lib/libXaw.so diff --git a/pkgtools/x11-links/files/xorg.pixman b/pkgtools/x11-links/files/xorg.pixman new file mode 100644 index 00000000000..150c9b29235 --- /dev/null +++ b/pkgtools/x11-links/files/xorg.pixman @@ -0,0 +1,9 @@ +# $NetBSD: xorg.pixman,v 1.2 2008/09/16 12:38:38 tron Exp $ +# +include/pixman-1/pixman.h +include/pixman-1/pixman-version.h +lib/libpixman-1.0.11.8.dylib +lib/libpixman-1.0.dylib +lib/libpixman-1.dylib +lib/libpixman-1.la +lib/pkgconfig/pixman-1.pc diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk index d2e05e8d34b..254ded1782a 100644 --- a/pkgtools/x11-links/xorg.mk +++ b/pkgtools/x11-links/xorg.mk @@ -1,4 +1,4 @@ -# $NetBSD: xorg.mk,v 1.9 2008/01/05 16:08:52 tron Exp $ +# $NetBSD: xorg.mk,v 1.10 2008/09/16 12:38:38 tron Exp $ # # This is for X.org, but use "xfree" files also. @@ -29,6 +29,7 @@ FILES_LIST= ${FILESDIR}/xorg .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.include "../../x11/pixman/buildlink3.mk" .include "../../x11/renderproto/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" |