diff options
| author | crees <crees@FreeBSD.org> | 2012-05-26 20:43:29 +0800 |
|---|---|---|
| committer | crees <crees@FreeBSD.org> | 2012-05-26 20:43:29 +0800 |
| commit | 3483441b14cad103830d2c368890346a29208ffe (patch) | |
| tree | d2111b5dc6446324522b36698589eede38a38193 | |
| parent | 64816c94914f0826ec5b6d8fce60841bb687a32a (diff) | |
| download | freebsd-ports-gnome-3483441b14cad103830d2c368890346a29208ffe.tar.gz freebsd-ports-gnome-3483441b14cad103830d2c368890346a29208ffe.tar.zst freebsd-ports-gnome-3483441b14cad103830d2c368890346a29208ffe.zip | |
Remove obsolete OSVERSION check; <7 is no longer supported by the Ports Tree
PR: ports/168277
Submitted by: crees
Approved by: Dewey Hylton <freenx@deweyonline.com> (maintainer)
| -rw-r--r-- | net/freenx/Makefile | 9 | ||||
| -rw-r--r-- | net/freenx/files/extra-patch-freenx-nxserver | 11 | ||||
| -rw-r--r-- | net/freenx/files/extra-patch-freenx-nxsetup | 20 |
3 files changed, 1 insertions, 39 deletions
diff --git a/net/freenx/Makefile b/net/freenx/Makefile index f3d7ddafae45..692ecb9d41ab 100644 --- a/net/freenx/Makefile +++ b/net/freenx/Makefile @@ -25,13 +25,6 @@ BUILD_WRKSRC= ${WRKSRC}/nxserver-helper 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 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/freenx/files/extra-patch-freenx-nxserver b/net/freenx/files/extra-patch-freenx-nxserver deleted file mode 100644 index f49e06be47e0..000000000000 --- a/net/freenx/files/extra-patch-freenx-nxserver +++ /dev/null @@ -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" - } - diff --git a/net/freenx/files/extra-patch-freenx-nxsetup b/net/freenx/files/extra-patch-freenx-nxsetup deleted file mode 100644 index bab1c8bbd7be..000000000000 --- a/net/freenx/files/extra-patch-freenx-nxsetup +++ /dev/null @@ -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 - } - |