diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2010-07-18 13:19:39 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2010-07-18 13:19:39 +0000 |
| commit | 5860152733437353401ca05a667ff4da1738b4b9 (patch) | |
| tree | 1b6fb1a23607111ff5e7d8d8a1c17f6fd06cc23e /x11/wrapper | |
| parent | 78fa25a4dd46f697e606fddb42084bfad7d05716 (diff) | |
- Remove superfluous (second) COMMENT assignment
- Unmute program installation statement
- Explicitly state that do-fetch target is empty per what bpm suggests
- Clean up Makefile
- Use canonical spelling of X.Org in pkg-descr, kill attribution (port
author is credited in Makefile header)
Approved by: x11 (timeout since 06/10)
Notes
Notes:
svn path=/head/; revision=257912
Diffstat (limited to 'x11/wrapper')
| -rw-r--r-- | x11/wrapper/Makefile | 16 | ||||
| -rw-r--r-- | x11/wrapper/pkg-descr | 4 |
2 files changed, 8 insertions, 12 deletions
diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile index af7b90cbb1bb..15626ff7b297 100644 --- a/x11/wrapper/Makefile +++ b/x11/wrapper/Makefile @@ -1,6 +1,6 @@ -# New ports collection makefile for: wrapper +# New ports collection makefile for: Xwrapper # Date created: 2000-09-18 -# Whom: Trevor Johnson +# Whom: Trevor Johnson <trevor@FreeBSD.org> # # $FreeBSD$ # @@ -13,27 +13,25 @@ DISTNAME= # intentionally left blank EXTRACT_SUFX= # intentionally left blank MAINTAINER= x11@FreeBSD.org -COMMENT= Wrapper for xorg server +COMMENT= Wrapper for X.Org X11 server RUN_DEPENDS= Xorg:${PORTSDIR}/x11-servers/xorg-server NO_WRKSUBDIR= yes -PLIST_FILES= bin/Xwrapper USE_XORG= x11 - -.include <bsd.port.pre.mk> +PLIST_FILES= bin/Xwrapper XSERVER= -DXSERVER_PATH=\"${LOCALBASE}/bin/Xorg\" PKGNAMEPREFIX= xorg- -COMMENT= Wrapper for X.org X11 server do-fetch: + @${DO_NADA} do-build: ${CC} ${CFLAGS} ${XSERVER} -o ${WRKSRC}/Xwrapper ${FILESDIR}/wrapper.c do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/Xwrapper ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/Xwrapper ${PREFIX}/bin @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/wrapper/pkg-descr b/x11/wrapper/pkg-descr index 5632a8d11f9c..fb36c27e2ecc 100644 --- a/x11/wrapper/pkg-descr +++ b/x11/wrapper/pkg-descr @@ -1,9 +1,7 @@ This program runs an X server after sanity-checking the environment and any options passed to it. It is meant to enhance security on -multi-user systems running XFree86 4 or the X11 server from x.org, +multi-user systems running XFree86 4 or the X11 server from X.Org, where the ability to use a startx script is needed. If you have XFree86 3, do not install this: you do not need it and it will not work. If you have no untrusted users or always run the X server from xdm, you do not need this. - -Trevor Johnson |