Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/ser: ser-0.9.4.ebuild
Date: Thu, 28 Oct 2010 10:11:53
Message-Id: 20101028101149.B3D3520051@flycatcher.gentoo.org
1 ssuominen 10/10/28 10:11:49
2
3 Modified: ser-0.9.4.ebuild
4 Log:
5 quoting
6
7 (Portage version: 2.2.0_alpha1/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.10 net-misc/ser/ser-0.9.4.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ser/ser-0.9.4.ebuild?rev=1.10&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ser/ser-0.9.4.ebuild?rev=1.10&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ser/ser-0.9.4.ebuild?r1=1.9&r2=1.10
15
16 Index: ser-0.9.4.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.4.ebuild,v
19 retrieving revision 1.9
20 retrieving revision 1.10
21 diff -u -r1.9 -r1.10
22 --- ser-0.9.4.ebuild 17 Jun 2010 21:56:41 -0000 1.9
23 +++ ser-0.9.4.ebuild 28 Oct 2010 10:11:49 -0000 1.10
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.4.ebuild,v 1.9 2010/06/17 21:56:41 patrick Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.4.ebuild,v 1.10 2010/10/28 10:11:49 ssuominen Exp $
29
30 inherit eutils flag-o-matic
31
32 @@ -48,7 +48,7 @@
33 # unpack ser source
34 unpack ${P}_src.tar.gz
35
36 - cd ${S}
37 + cd "${S}"
38 use ipv6 || \
39 sed -i -e "s/-DUSE_IPV6//g" Makefile.defs
40
41 @@ -86,28 +86,28 @@
42 # ugly i know...
43 for x in ${extmodules}; do
44 MY_A=$(eval echo ${x}-\${$(echo ${x} | tr "[:lower:]" "[:upper:]")_PV}-${PN}-0.9.0)
45 - mkdir -p ${S}/modules/${x}
46 - cd ${S}/modules/${x}
47 + mkdir -p "${S}"/modules/${x}
48 + cd "${S}"/modules/${x}
49 unpack ${MY_A}.tar.gz
50 # fix makefiles
51 if [[ -f ${FILESDIR}/${MY_A}.diff ]]; then
52 - epatch ${FILESDIR}/${MY_A}.diff
53 + epatch "${FILESDIR}"/${MY_A}.diff
54 fi
55 done
56
57 if use mysql || use postgres; then
58 sed -i -e "s:^#DEFS+=-DSQL_ACC$:DEFS+=-DSQL_ACC:" \
59 - ${S}/modules/acc/Makefile
60 + "${S}"/modules/acc/Makefile
61 fi
62
63 # remove sasl if openldap hasn't been built with it
64 if use ldap && ! built_with_use net-nds/openldap sasl; then
65 sed -i -e "s:-lsasl::g" \
66 - ${S}/modules/ldap/Makefile
67 + "${S}"/modules/ldap/Makefile
68
69 if use ssl; then
70 sed -i -e "s:-lsasl::g" \
71 - ${S}/modules/ldaps/Makefile
72 + "${S}"/modules/ldaps/Makefile
73 fi
74 fi
75 }
76 @@ -126,34 +126,34 @@
77 src_install () {
78 make install \
79 prefix="" \
80 - bin-prefix=${D}/usr/sbin \
81 + bin-prefix="${D}"/usr/sbin \
82 bin-dir="" \
83 - cfg-prefix=${D}/etc \
84 + cfg-prefix="${D}"/etc \
85 cfg-dir=ser/ \
86 cfg-target=/etc/ser/ \
87 - modules-prefix=${D}/usr/lib/ser \
88 + modules-prefix="${D}"/usr/lib/ser \
89 modules-dir=modules \
90 modules-target=/usr/lib/ser/modules/ \
91 - man-prefix=${D}/usr/share/man \
92 + man-prefix="${D}"/usr/share/man \
93 man-dir="" \
94 - doc-prefix=${D}/usr/share/doc \
95 + doc-prefix="${D}"/usr/share/doc \
96 doc-dir=${P} || die
97
98 - newinitd ${FILESDIR}/ser.rc6 ser
99 - newconfd ${FILESDIR}/ser.confd ser
100 + newinitd "${FILESDIR}"/ser.rc6 ser
101 + newconfd "${FILESDIR}"/ser.confd ser
102 exeinto /usr/sbin
103 newexe scripts/harv_ser.sh harv_ser.sh
104 newexe scripts/sc serctl
105 newexe scripts/ser_mysql.sh ser_mysql.sh
106
107 - chown -R root:ser ${D}/etc/ser
108 - chmod 750 ${D}/etc/ser
109 - chmod 640 ${D}/etc/ser/*
110 + chown -R root:ser "${D}"/etc/ser
111 + chmod 750 "${D}"/etc/ser
112 + chmod 640 "${D}"/etc/ser/*
113
114 # fix manpages
115 sed -i -e "s:^.B /ser-${PV}AUTHORS:.B /usr/share/doc/${PF}/AUTHORS:" \
116 -e "s:^.B /ser:.B /usr/sbin/ser:" \
117 - ${D}/usr/share/man/*/*
118 + "${D}"/usr/share/man/*/*
119 }
120
121 pkg_preinst() {
122 @@ -165,8 +165,8 @@
123 if [[ $previous_installed_version = 0 ]] ; then
124 einfo "Changing permissions on ${ROOT}etc/ser"
125
126 - chown -R root:ser ${ROOT}/etc/ser
127 - chmod 750 ${ROOT}/etc/ser
128 - chmod 640 ${ROOT}/etc/ser/*
129 + chown -R root:ser "${ROOT}"/etc/ser
130 + chmod 750 "${ROOT}"/etc/ser
131 + chmod 640 "${ROOT}"/etc/ser/*
132 fi
133 }