From 9af4976e6ab9b173fa81c95b5718c73e93554bc3 Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 23 Jan 2006 21:13:16 +0000 Subject: From the "Did-anyone-ever-try-this-at-all" department: Give up with trying to find ingenious ways to ensure that the version expression gets correctly quoted to cc, it somehow differes between direct invocations and runs from pkgsrc. Just hard-code the value for now. --- x11/xorg-libs/distinfo | 3 ++- x11/xorg-libs/patches/patch-ba | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 x11/xorg-libs/patches/patch-ba diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index db8ebcee1bb..79a2e355108 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2006/01/20 17:53:32 xtraeme Exp $ +$NetBSD: distinfo,v 1.30 2006/01/23 21:13:16 joerg Exp $ SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8 @@ -33,5 +33,6 @@ SHA1 (patch-av) = 052de5919a40751062a008d6f590872f84284d9f SHA1 (patch-aw) = 4289ec24e811efd6f74acca6c6842ee5f77cc5f7 SHA1 (patch-ay) = 4403bc18ab13f582e4a36d6f873bbd7aaaceacf5 SHA1 (patch-az) = a236a896e4e58f0d21d5745fb4b452300f2b77c6 +SHA1 (patch-ba) = bf99c7ea9c07f048b8338f0a1f6b92e9f692879e SHA1 (patch-bc) = b735c3f0cfd5ac161eff941a9878c6840ee45788 SHA1 (patch-bl) = ccfd290ebffc08b9cd03b7eb83a9671b0e16baec diff --git a/x11/xorg-libs/patches/patch-ba b/x11/xorg-libs/patches/patch-ba new file mode 100644 index 00000000000..5d32dc79a68 --- /dev/null +++ b/x11/xorg-libs/patches/patch-ba @@ -0,0 +1,13 @@ +$NetBSD: patch-ba,v 1.4 2006/01/23 21:13:16 joerg Exp $ + +--- programs/Xserver/hw/dmx/Imakefile.orig 2006-01-23 20:51:46.000000000 +0000 ++++ programs/Xserver/hw/dmx/Imakefile +@@ -82,7 +82,7 @@ OBJS = dmxinit.o \ + + #ifdef XVendorRelease + VENDORRELEASE = XVendorRelease +- VENDOR_RELEASE = -DVENDOR_RELEASE="$(VENDORRELEASE)" ++ VENDOR_RELEASE = -DVENDOR_RELEASE=102040630 + #endif + + VENDOR_DEFINES = $(VENDOR_STRING) $(VENDOR_RELEASE) -- cgit v1.2.3