From 1bbd8a073be08079c0b7d43b28e0ba6f3131c8c7 Mon Sep 17 00:00:00 2001 From: Alexander Leidinger Date: Tue, 13 Jun 2006 19:44:38 +0000 Subject: Only remove linux_base-fc4 owned directory, if linux_base-fc4 is not installed. This is supposed to fix the exp-build run. In colaboration with: Boris Samorodov --- x11/linux-f10-xorg-libs/Makefile | 2 +- x11/linux-f10-xorg-libs/pkg-plist | 3 +-- x11/linux-f8-xorg-libs/Makefile | 2 +- x11/linux-f8-xorg-libs/pkg-plist | 3 +-- x11/linux-xorg-libs/Makefile | 2 +- x11/linux-xorg-libs/pkg-plist | 3 +-- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/x11/linux-f10-xorg-libs/Makefile b/x11/linux-f10-xorg-libs/Makefile index a88ef6d1ff84..bc6b20f0a8ec 100644 --- a/x11/linux-f10-xorg-libs/Makefile +++ b/x11/linux-f10-xorg-libs/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-libs PORTVERSION= 6.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 linux DISTFILES= xorg-x11-libs-${PORTVERSION}-37.FC4.49.2.${LINUX_RPM_ARCH}.rpm \ xorg-x11-deprecated-libs-6.8.2-31.${LINUX_RPM_ARCH}.rpm diff --git a/x11/linux-f10-xorg-libs/pkg-plist b/x11/linux-f10-xorg-libs/pkg-plist index 11a0fd688105..b6e97c11289f 100644 --- a/x11/linux-f10-xorg-libs/pkg-plist +++ b/x11/linux-f10-xorg-libs/pkg-plist @@ -310,5 +310,4 @@ usr/X11R6/lib/libxkbui.so.1.0 @dirrm usr/X11R6/lib/X11/locale/C @dirrm usr/X11R6/lib/X11/locale @dirrm usr/X11R6/lib/X11 -@comment The following needs to be revised when the default linux base is FC4 or newer -@dirrmtry etc/ld.so.conf.d +@unexec grep -q Stentz %D/etc/fedora-release || rmdir %D/etc/ld.so.conf.d diff --git a/x11/linux-f8-xorg-libs/Makefile b/x11/linux-f8-xorg-libs/Makefile index a88ef6d1ff84..bc6b20f0a8ec 100644 --- a/x11/linux-f8-xorg-libs/Makefile +++ b/x11/linux-f8-xorg-libs/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-libs PORTVERSION= 6.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 linux DISTFILES= xorg-x11-libs-${PORTVERSION}-37.FC4.49.2.${LINUX_RPM_ARCH}.rpm \ xorg-x11-deprecated-libs-6.8.2-31.${LINUX_RPM_ARCH}.rpm diff --git a/x11/linux-f8-xorg-libs/pkg-plist b/x11/linux-f8-xorg-libs/pkg-plist index 11a0fd688105..b6e97c11289f 100644 --- a/x11/linux-f8-xorg-libs/pkg-plist +++ b/x11/linux-f8-xorg-libs/pkg-plist @@ -310,5 +310,4 @@ usr/X11R6/lib/libxkbui.so.1.0 @dirrm usr/X11R6/lib/X11/locale/C @dirrm usr/X11R6/lib/X11/locale @dirrm usr/X11R6/lib/X11 -@comment The following needs to be revised when the default linux base is FC4 or newer -@dirrmtry etc/ld.so.conf.d +@unexec grep -q Stentz %D/etc/fedora-release || rmdir %D/etc/ld.so.conf.d diff --git a/x11/linux-xorg-libs/Makefile b/x11/linux-xorg-libs/Makefile index a88ef6d1ff84..bc6b20f0a8ec 100644 --- a/x11/linux-xorg-libs/Makefile +++ b/x11/linux-xorg-libs/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-libs PORTVERSION= 6.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 linux DISTFILES= xorg-x11-libs-${PORTVERSION}-37.FC4.49.2.${LINUX_RPM_ARCH}.rpm \ xorg-x11-deprecated-libs-6.8.2-31.${LINUX_RPM_ARCH}.rpm diff --git a/x11/linux-xorg-libs/pkg-plist b/x11/linux-xorg-libs/pkg-plist index 11a0fd688105..b6e97c11289f 100644 --- a/x11/linux-xorg-libs/pkg-plist +++ b/x11/linux-xorg-libs/pkg-plist @@ -310,5 +310,4 @@ usr/X11R6/lib/libxkbui.so.1.0 @dirrm usr/X11R6/lib/X11/locale/C @dirrm usr/X11R6/lib/X11/locale @dirrm usr/X11R6/lib/X11 -@comment The following needs to be revised when the default linux base is FC4 or newer -@dirrmtry etc/ld.so.conf.d +@unexec grep -q Stentz %D/etc/fedora-release || rmdir %D/etc/ld.so.conf.d -- cgit v1.2.3