diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 2000-11-03 11:08:12 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 2000-11-03 11:08:12 +0000 |
| commit | 08882f6b5f70eee50ab61c9dd90ae11553f50039 (patch) | |
| tree | 09ddcba91f677f5406089ee21aca80b0ef40c598 /x11/wrapper | |
| parent | 1070a9f5d26d781a759ff00b7a7f33d3609fb030 (diff) | |
| download | ports-08882f6b5f70eee50ab61c9dd90ae11553f50039.tar.gz ports-08882f6b5f70eee50ab61c9dd90ae11553f50039.zip | |
Change wrapper dependency -- depend on wrapper from XFree86-4-Server. Don't
install server with setuid bit. Various fixed from XFree86-4 port.
Submitted by: taguchi@tohoku.iij.ad.jp (XFree86-4-* maintainer)
Notes
Notes:
svn path=/head/; revision=34721
Diffstat (limited to 'x11/wrapper')
| -rw-r--r-- | x11/wrapper/Makefile | 2 | ||||
| -rw-r--r-- | x11/wrapper/pkg-install | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile index 711e705d6ea4..a88b9ca7b6a4 100644 --- a/x11/wrapper/Makefile +++ b/x11/wrapper/Makefile @@ -11,8 +11,6 @@ CATEGORIES= x11 MAINTAINER= trevor@FreeBSD.org -RUN_DEPENDS= XFree86:${PORTSDIR}/x11-servers/XFree86-4-Server - NO_WRKSUBDIR= yes USE_X_PREFIX= yes diff --git a/x11/wrapper/pkg-install b/x11/wrapper/pkg-install index 049b7ca7d8b8..3bbe62675378 100644 --- a/x11/wrapper/pkg-install +++ b/x11/wrapper/pkg-install @@ -5,5 +5,5 @@ if [ "X$2" != "XPOST-INSTALL" ]; then fi /bin/ln -sf ${PKG_PREFIX}/bin/Xwrapper ${PKG_PREFIX}/bin/X -/bin/chmod -s ${PKG_PREFIX}/bin/XFree86 +[ -x ${PKG_PREFIX}/bin/XFree86 ] && /bin/chmod -s ${PKG_PREFIX}/bin/XFree86 /bin/chmod +s ${PKG_PREFIX}/bin/Xwrapper |