Date: Thu, 10 Jun 2010 02:03:36 +0700 From: Alexey Dokuchaev <danfe@nsu.ru> To: x11@freebsd.org Subject: seeking approval: cleanup x11/wrapper port Message-ID: <20100609190336.GA36058@regency.nsu.ru>
next in thread | raw e-mail | index | archive | help
--fUYQa+Pmc3FrFX/N
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
hi there,
may i suggest the following improvements made to x11/wrapper port:
- 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)
? thanks.
./danfe
--fUYQa+Pmc3FrFX/N
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff
Index: Makefile
===================================================================
RCS file: /mnt/fbsd/development/FreeBSD-CVS/ports/x11/wrapper/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile 7 Feb 2010 15:25:21 -0000 1.35
+++ Makefile 8 Jun 2010 23:38:44 -0000
@@ -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: ports/x11/wrapper/Makefile,v 1.35 2010/02/07 15:25:21 rnoland Exp $
#
@@ -13,27 +13,25 @@
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>
Index: pkg-descr
===================================================================
RCS file: /mnt/fbsd/development/FreeBSD-CVS/ports/x11/wrapper/pkg-descr,v
retrieving revision 1.5
diff -u -r1.5 pkg-descr
--- pkg-descr 15 Mar 2005 06:12:06 -0000 1.5
+++ pkg-descr 9 Jun 2010 00:36:59 -0000
@@ -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
--fUYQa+Pmc3FrFX/N--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100609190336.GA36058>