aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorEitan Adler <eadler@FreeBSD.org>2012-02-27 17:45:44 +0000
committerEitan Adler <eadler@FreeBSD.org>2012-02-27 17:45:44 +0000
commit3f538e96a8478dac2116c7a9fdff684739906f69 (patch)
tree0c6c181e948db124e412c76007fbc41f9dc5f12e /x11
parent34ec4c9f651b1b0361053eda7b07c01c54a9052d (diff)
downloadports-3f538e96a8478dac2116c7a9fdff684739906f69.tar.gz
ports-3f538e96a8478dac2116c7a9fdff684739906f69.zip
Notes
Diffstat (limited to 'x11')
-rw-r--r--x11/xorg-libraries/Makefile17
-rw-r--r--x11/xorg-libraries/pkg-plist1
2 files changed, 0 insertions, 18 deletions
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index 3e9442a7afb6..585f829facfd 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -58,23 +58,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \
${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \
${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm
-.if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING) && exists(/usr/X11R6)
-pre-everything::
- @if [ ! -L /usr/X11R6 ]; then \
- echo -n "/usr/X11R6 exists, but it is not a symlink. "; \
- echo "Installation cannot proceed."; \
- echo -n "This looks like an incompletely removed old version "; \
- echo -n "of X. In the current version, /usr/X11R6 must be "; \
- echo -n "a symlink if it exists at all."; \
- echo -n "Please read ${PORTSDIR}/UPDATING (entry of 20070519) "; \
- echo -n "for the procedure to upgrade X.org related ports."; \
- /usr/bin/false; \
- fi
-.elif !exists(/usr/X11R6) && !defined(WITHOUT_X11R6_SYMLINK)
-pre-install::
- ${LN} -s ${LOCALBASE} /usr/X11R6 || ${TRUE}
-.endif
-
do-install:
${MKDIR} ${PREFIX}/libdata/xorg
${TOUCH} ${PREFIX}/libdata/xorg/libraries
diff --git a/x11/xorg-libraries/pkg-plist b/x11/xorg-libraries/pkg-plist
index 54c62ef26b9c..80a1d8f053b2 100644
--- a/x11/xorg-libraries/pkg-plist
+++ b/x11/xorg-libraries/pkg-plist
@@ -1,3 +1,2 @@
libdata/xorg/libraries
-@exec test -e /usr/X11R6 || ln -s %%PREFIX%% /usr/X11R6 || true
@dirrmtry libdata/xorg