aboutsummaryrefslogtreecommitdiffstats
path: root/x11/wrapper
diff options
context:
space:
mode:
authordanfe <danfe@FreeBSD.org>2010-07-18 21:19:39 +0800
committerdanfe <danfe@FreeBSD.org>2010-07-18 21:19:39 +0800
commitf08ddcac6b2c5d518c4ae7d33f5cd3a2f53ace52 (patch)
tree0dd60cd7bcac248baac05b7ac61c3071093d5389 /x11/wrapper
parent3ec79659c0ab1c0defbf9014775f883256f77246 (diff)
downloadfreebsd-ports-gnome-f08ddcac6b2c5d518c4ae7d33f5cd3a2f53ace52.tar.gz
freebsd-ports-gnome-f08ddcac6b2c5d518c4ae7d33f5cd3a2f53ace52.tar.zst
freebsd-ports-gnome-f08ddcac6b2c5d518c4ae7d33f5cd3a2f53ace52.zip
- 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)
Diffstat (limited to 'x11/wrapper')
-rw-r--r--x11/wrapper/Makefile16
-rw-r--r--x11/wrapper/pkg-descr4
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