| 1 |
voyageur 07/09/18 21:52:53 |
| 2 |
|
| 3 |
Modified: nxserver-freeedition-3.0.0-r3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix variables quoting, clean up install part |
| 6 |
(Portage version: 2.1.3.9) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: nxserver-freeedition-3.0.0-r3.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- nxserver-freeedition-3.0.0-r3.ebuild 18 Sep 2007 21:01:47 -0000 1.1 |
| 22 |
+++ nxserver-freeedition-3.0.0-r3.ebuild 18 Sep 2007 21:52:53 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild,v 1.1 2007/09/18 21:01:47 voyageur Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild,v 1.2 2007/09/18 21:52:53 voyageur Exp $ |
| 28 |
|
| 29 |
inherit eutils |
| 30 |
|
| 31 |
@@ -33,8 +33,8 @@ |
| 32 |
src_unpack() |
| 33 |
{ |
| 34 |
unpack ${A} |
| 35 |
- cd ${S} |
| 36 |
- epatch ${FILESDIR}/nxserver-3.0.0-r3-setup.patch |
| 37 |
+ cd "${S}" |
| 38 |
+ epatch "${FILESDIR}"/nxserver-3.0.0-r3-setup.patch |
| 39 |
} |
| 40 |
|
| 41 |
src_install() |
| 42 |
@@ -43,11 +43,9 @@ |
| 43 |
# with libraries installed for FreeNX |
| 44 |
|
| 45 |
into /usr/NX |
| 46 |
- for x in nxserver ; do |
| 47 |
- dobin bin/$x |
| 48 |
- done |
| 49 |
+ dobin bin/nxserver |
| 50 |
|
| 51 |
- dodir /usr/NX/etc |
| 52 |
+ dodir /usr/NX/etc/keys |
| 53 |
insinto /usr/NX/etc |
| 54 |
doins etc/administrators.db.sample |
| 55 |
doins etc/guests.db.sample |
| 56 |
@@ -58,15 +56,12 @@ |
| 57 |
|
| 58 |
newins etc/server-debian.cfg.sample server-gentoo.cfg.sample |
| 59 |
|
| 60 |
- cp -R etc/keys ${D}/usr/NX/etc || die |
| 61 |
+ insinto /usr/NX |
| 62 |
+ doins -r home lib scripts |
| 63 |
+ cp -R share "${D}"/usr/NX || die "Unable to install share folder" |
| 64 |
+ cp -R var "${D}"/usr/NX || die "Unable to install var folder" |
| 65 |
|
| 66 |
- cp -R home ${D}/usr/NX || die |
| 67 |
- cp -R lib ${D}/usr/NX || die |
| 68 |
- cp -R scripts ${D}/usr/NX || die |
| 69 |
- cp -R share ${D}/usr/NX || die |
| 70 |
- cp -R var ${D}/usr/NX || die |
| 71 |
- |
| 72 |
- newinitd ${FILESDIR}/nxserver-2.1.0-init nxserver |
| 73 |
+ newinitd "${FILESDIR}"/nxserver-2.1.0-init nxserver |
| 74 |
} |
| 75 |
|
| 76 |
pkg_postinst () |
| 77 |
@@ -77,10 +72,10 @@ |
| 78 |
# only run install when no configuration file is found |
| 79 |
if [ -f /usr/NX/etc/server.cfg ]; then |
| 80 |
einfo "Running NoMachine's update script" |
| 81 |
- ${ROOT}/usr/NX/scripts/setup/nxserver --update |
| 82 |
+ "${ROOT}"/usr/NX/scripts/setup/nxserver --update |
| 83 |
else |
| 84 |
einfo "Running NoMachine's setup script" |
| 85 |
- ${ROOT}/usr/NX/scripts/setup/nxserver --install |
| 86 |
+ "${ROOT}"/usr/NX/scripts/setup/nxserver --install |
| 87 |
fi |
| 88 |
|
| 89 |
elog "Remember to add nxserver to your default runlevel" |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.14 net-misc/nxserver-freeedition/ChangeLog |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog?rev=1.14&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog?rev=1.14&content-type=text/plain |
| 97 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog?r1=1.13&r2=1.14 |
| 98 |
|
| 99 |
Index: ChangeLog |
| 100 |
=================================================================== |
| 101 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v |
| 102 |
retrieving revision 1.13 |
| 103 |
retrieving revision 1.14 |
| 104 |
diff -u -r1.13 -r1.14 |
| 105 |
--- ChangeLog 18 Sep 2007 21:01:47 -0000 1.13 |
| 106 |
+++ ChangeLog 18 Sep 2007 21:52:53 -0000 1.14 |
| 107 |
@@ -1,6 +1,11 @@ |
| 108 |
# ChangeLog for net-misc/nxserver-freeedition |
| 109 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.13 2007/09/18 21:01:47 voyageur Exp $ |
| 111 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.14 2007/09/18 21:52:53 voyageur Exp $ |
| 112 |
+ |
| 113 |
+ 18 Sep 2007; Bernard Cafarelli <voyageur@g.o> |
| 114 |
+ nxserver-freeedition-3.0.0-r3.ebuild: |
| 115 |
+ Fix variables quoting, thanks opfer |
| 116 |
+ Also clean up the install section |
| 117 |
|
| 118 |
*nxserver-freeedition-3.0.0-r3 (18 Sep 2007) |
| 119 |
|
| 120 |
|
| 121 |
|
| 122 |
|
| 123 |
-- |
| 124 |
gentoo-commits@g.o mailing list |
Archives