Date: Wed, 23 May 2012 20:05:31 GMT From: Chris Rees <crees@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/168277: [PATCH] net/freenx remove obsolete OSVERSION check Message-ID: <201205232005.q4NK5VwH027061@freefall.freebsd.org> Resent-Message-ID: <201205232010.q4NKA6dl027789@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 168277
>Category: ports
>Synopsis: [PATCH] net/freenx remove obsolete OSVERSION check
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed May 23 20:10:06 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Chris Rees
>Release: FreeBSD 9.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 9.0-STABLE FreeBSD 9.0-STABLE #6 r235139: Tue May 8 21:19:03 UTC 2012 simon@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386
>Description:
FreeBSD ports tree doesn't support <7.x, so this check is unnecessary. I've also removed the patchfiles that are conditional on it.
>How-To-Repeat:
>Fix:
--- net-freenx.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/freenx/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 28 Mar 2010 06:41:13 -0000 1.14
+++ Makefile 23 May 2012 19:54:50 -0000
@@ -25,13 +25,6 @@
NXPREFIX?= ${PREFIX}/NX
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 601101
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-freenx-nxserver \
- ${PATCHDIR}/extra-patch-freenx-nxsetup
-.endif
-
post-patch:
@cd ${WRKSRC} && ${REINPLACE_CMD} -e "s|/usr/local/|${PREFIX}/|" \
-e "s|!/bin/bash|!${PREFIX}/bin/bash|" \
@@ -53,4 +46,4 @@
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: files/extra-patch-freenx-nxserver
===================================================================
RCS file: files/extra-patch-freenx-nxserver
diff -N files/extra-patch-freenx-nxserver
--- files/extra-patch-freenx-nxserver 10 Apr 2008 10:24:15 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- nxserver.orig Mon Jan 22 19:22:50 2007
-+++ nxserver
-@@ -1444,7 +1444,7 @@
-
- [ ${#CMD_CHUSER} -ge 32 ] && cmd_abort "Error: User $CMD_CHUSER must be shorter than 32 characters."
- egrep -q "^$CMD_CHUSER:" $NX_ETC_DIR/passwords && cmd_abort "Error: User $CMD_CHUSER already in database."
-- getent passwd "$CMD_CHUSER" >/dev/null || cmd_abort "Error: User $CMD_CHUSER not existing on local system. Can't add."
-+ egrep -q "^$CMD_CHUSER:" /etc/passwd >/dev/null || cmd_abort "Error: User $CMD_CHUSER not existing on local system. Can't add."
- passdb_add_user "$CMD_CHUSER"
- }
-
Index: files/extra-patch-freenx-nxsetup
===================================================================
RCS file: files/extra-patch-freenx-nxsetup
diff -N files/extra-patch-freenx-nxsetup
--- files/extra-patch-freenx-nxsetup 10 Apr 2008 10:24:15 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- nxsetup.orig Mon Jan 22 19:22:50 2007
-+++ nxsetup
-@@ -135,7 +135,7 @@
- then
- egrep "^nx:" /etc/passwd >/dev/null
- else
-- getent passwd nx >/dev/null
-+ egrep -q "^nx:" /etc/passwd >/dev/null
- fi
- }
- nx_group_exists()
-@@ -145,7 +145,7 @@
- then
- egrep "^nx:" /etc/group >/dev/null
- else
-- getent group nx >/dev/null
-+ egrep -q "^nx:" /etc/group >/dev/null
- fi
- }
-
--- net-freenx.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205232005.q4NK5VwH027061>