summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-08-30 23:43:06 +0800
committerzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-08-30 23:43:06 +0800
commit52b09cb660f84118d1308a53fcc04b0db14ffce7 (patch)
tree8fa593f5a5a26cdbbedd2f73f10508cf14d9bbfd
parent23b8bf5c76215173e0146d6868000d7aab89630a (diff)
downloadxorg-devel-ports-52b09cb660f84118d1308a53fcc04b0db14ffce7.tar
xorg-devel-ports-52b09cb660f84118d1308a53fcc04b0db14ffce7.tar.gz
xorg-devel-ports-52b09cb660f84118d1308a53fcc04b0db14ffce7.tar.bz2
xorg-devel-ports-52b09cb660f84118d1308a53fcc04b0db14ffce7.tar.lz
xorg-devel-ports-52b09cb660f84118d1308a53fcc04b0db14ffce7.tar.xz
xorg-devel-ports-52b09cb660f84118d1308a53fcc04b0db14ffce7.tar.zst
xorg-devel-ports-52b09cb660f84118d1308a53fcc04b0db14ffce7.zip
Fix plist when compiling version 7.2.0.
Plug another use before initialized. git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1101 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--x11-drivers/xf86-video-ati/Makefile2
-rw-r--r--x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c6
-rw-r--r--x11-drivers/xf86-video-ati/pkg-plist14
3 files changed, 12 insertions, 10 deletions
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 7e4afd2..8793cdb 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -17,10 +17,12 @@ MAN4= ati.4x radeon.4x
.if ${OSVERSION} < 1000051
ATI_VERSION= 6.14.6
CONFIGURE_ARGS+=--disable-kms
+PLIST_SUB+= OLD=""
.else
ATI_VERSION= 7.2.0
CONFIGURE_ARGS+=--disable-udev
EXTRA_PATCHES+= ${FILESDIR}/extra-src__radeon_kms.c
+PLIST_SUB+= OLD="@comment "
.endif
.include <bsd.port.post.mk>
diff --git a/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c b/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
index 30bbc72..b49c76b 100644
--- a/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
+++ b/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
@@ -1,6 +1,6 @@
---- src/radeon_kms.c.orig 2013-03-02 12:22:34.000000000 +0100
-+++ src/radeon_kms.c 2013-03-02 12:26:26.000000000 +0100
-@@ -564,7 +564,7 @@
+--- src/radeon_kms.c.orig 2013-08-30 17:34:45.402399526 +0200
++++ src/radeon_kms.c 2013-08-30 17:36:31.138391972 +0200
+@@ -606,7 +606,7 @@
dev->domain, dev->bus, dev->dev, dev->func);
#endif
diff --git a/x11-drivers/xf86-video-ati/pkg-plist b/x11-drivers/xf86-video-ati/pkg-plist
index 52b1421..1c0799f 100644
--- a/x11-drivers/xf86-video-ati/pkg-plist
+++ b/x11-drivers/xf86-video-ati/pkg-plist
@@ -2,13 +2,13 @@ lib/xorg/modules/drivers/ati_drv.la
lib/xorg/modules/drivers/ati_drv.so
lib/xorg/modules/drivers/radeon_drv.la
lib/xorg/modules/drivers/radeon_drv.so
-lib/xorg/modules/multimedia/theatre200_drv.la
-lib/xorg/modules/multimedia/theatre200_drv.so
-lib/xorg/modules/multimedia/theatre_detect_drv.la
-lib/xorg/modules/multimedia/theatre_detect_drv.so
-lib/xorg/modules/multimedia/theatre_drv.la
-lib/xorg/modules/multimedia/theatre_drv.so
+%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.la
+%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.so
+%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.la
+%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so
+%%OLD%%lib/xorg/modules/multimedia/theatre_drv.la
+%%OLD%%lib/xorg/modules/multimedia/theatre_drv.so
@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules/multimedia
+%%OLD%%@dirrmtry lib/xorg/modules/multimedia
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg