diff options
| author | eadler <eadler@FreeBSD.org> | 2012-02-28 01:45:44 +0800 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2012-02-28 01:45:44 +0800 |
| commit | 1fcf1ead832c651299784f12c052127530dfbc6c (patch) | |
| tree | 6aa64a97a46a77bab457816b8d1aff227d45a91a /x11/xorg-libraries | |
| parent | 38c2848dfad152deac17b5c0a837a5e87b593968 (diff) | |
| download | freebsd-ports-gnome-1fcf1ead832c651299784f12c052127530dfbc6c.tar.gz freebsd-ports-gnome-1fcf1ead832c651299784f12c052127530dfbc6c.tar.zst freebsd-ports-gnome-1fcf1ead832c651299784f12c052127530dfbc6c.zip | |
Remove old cruft.
No current version of any software should use /etc/X11R6 so the symlink is no longer required.
Reviewed by: kwm
Diffstat (limited to 'x11/xorg-libraries')
| -rw-r--r-- | x11/xorg-libraries/Makefile | 17 | ||||
| -rw-r--r-- | x11/xorg-libraries/pkg-plist | 1 |
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 |