From d6af8788d9b5664dbdfa117dcb739475e29a6d48 Mon Sep 17 00:00:00 2001
From: Dejan Lesjak <lesi@FreeBSD.org>
Date: Fri, 25 May 2007 20:59:30 +0000
Subject: Don't bail out on clean installs, just create convenience symlink
instead.
PR: ports/112796
Discussed with: flz, kris
---
x11/xorg-libraries/Makefile | 6 +++++-
x11/xorg-libraries/pkg-plist | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
(limited to 'x11')
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index 031d35a2744a..e6b3c877b5a2 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xorg-libraries
PORTVERSION= 7.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
@@ -64,9 +65,12 @@ RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
${X11BASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \
${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX
-.if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING)
+.if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING) && exists(/usr/X11R6)
pre-everything::
@test -L /usr/X11R6 || ( echo "Read ${PORTSDIR}/UPDATING for the procedure to upgrade or install xorg 7.2." && /usr/bin/false )
+.elif !exists(/usr/X11R6) && !defined(WITHOUT_X11R6_SYMLINK)
+pre-everything::
+ ${LN} -s ${X11BASE} /usr/X11R6 || ${TRUE}
.endif
do-install:
diff --git a/x11/xorg-libraries/pkg-plist b/x11/xorg-libraries/pkg-plist
index 80a1d8f053b2..54c62ef26b9c 100644
--- a/x11/xorg-libraries/pkg-plist
+++ b/x11/xorg-libraries/pkg-plist
@@ -1,2 +1,3 @@
libdata/xorg/libraries
+@exec test -e /usr/X11R6 || ln -s %%PREFIX%% /usr/X11R6 || true
@dirrmtry libdata/xorg
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0