diff options
| -rw-r--r-- | x11/wrapper/Makefile | 1 | ||||
| -rw-r--r-- | x11/wrapper/pkg-deinstall | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile index 2796799e80df..a34dac809572 100644 --- a/x11/wrapper/Makefile +++ b/x11/wrapper/Makefile @@ -24,7 +24,6 @@ USE_X_PREFIX= yes XSERVER= -DXSERVER_PATH=\"/usr/X11R6/bin/Xorg\" PKGNAMEPREFIX= xorg- COMMENT= Wrapper for X.org X11 server -BROKEN= Incomplete pkg-plist .elif ${X_WINDOW_SYSTEM:L} == xfree86-4 XSERVER= -DXSERVER_PATH=\"/usr/X11R6/bin/XFree86\" RUN_DEPENDS= XFree86:${PORTSDIR}/x11-servers/XFree86-4-Server diff --git a/x11/wrapper/pkg-deinstall b/x11/wrapper/pkg-deinstall index 7b96fa96538b..6108b7064d70 100644 --- a/x11/wrapper/pkg-deinstall +++ b/x11/wrapper/pkg-deinstall @@ -1,4 +1,16 @@ #!/bin/sh if [ -e ${PKG_PREFIX}/bin/X.bck ]; then mv ${PKG_PREFIX}/bin/X.bck ${PKG_PREFIX}/bin/X +else + if [ -x ${PKG_PREFIX}/bin/XFree86 ]; then + ln -sf ${PKG_PREFIX}/bin/XFree86 ${PKG_PREFIX}/bin/X + exit 0 + elif [ -x ${PKG_PREFIX}/bin/Xorg ]; then + ln -sf ${PKG_PREFIX}/bin/Xorg ${PKG_PREFIX}/bin/X + exit 0 + else + rm -f ${PKG_PREFIX}/bin/X + fi fi +[ -x ${PKG_PREFIX}/bin/XFree86 ] && chmod u+s ${PKG_PREFIX}/bin/XFree86 +[ -x ${PKG_PREFIX}/bin/Xorg ] && chmod u+s ${PKG_PREFIX}/bin/Xorg |