Move install sed into a real patch and make sure failures in subdirs are caught ...

Package-Manager: portage-2.1.2_rc3-r5

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index d15d9eec4d32853ad9357de6f6c087876563cd7a..0743de242b8415b1a94a42e2c0b1ed51125b05ed 100644 (file)
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.22 2006/10/22 19:49:01 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.23 2006/12/19 22:19:33 vapier Exp $
+
+  19 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  files/3.12.4/apcupsd.in.patch, files/3.12.4/etc.patch,
+  +files/3.12.4/exit-status-build.patch, +files/3.12.4/no-strip.patch,
+  apcupsd-3.12.4.ebuild:
+  Move install sed into a real patch and make sure failures in subdirs are
+  caught #156980.
 
   22 Oct 2006; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.15-r1.ebuild,
   apcupsd-3.10.16-r3.ebuild, apcupsd-3.10.17-r1.ebuild,

diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index cc771ace6c63a7d5e0992ac6751c82a0df24cf59..b052b1b6f2f6c79951579e0c6d051b272f046e86 100644 (file)
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -77,17 +77,25 @@ AUX 3.12.3/etc.patch 3710 RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 SHA1 e
 MD5 ceb8a56c8234598dad868dcf3b366e9f files/3.12.3/etc.patch 3710
 RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 files/3.12.3/etc.patch 3710
 SHA256 046cca492d0ff932c9c5b5cf2e36d48d5cdb8a0a6cbac19791d3be72ba92813f files/3.12.3/etc.patch 3710
-AUX 3.12.4/apcupsd.in.patch 315 RMD160 65ad8ff91d1280cdfc817aa15428dc3f3ecff250 SHA1 f62f104f790a60ae84e6570b9f181b838a4868ca SHA256 230e8e436fffef7c2bac52dfe522a160fdf6c27f1a15215ba8acdc2c73665e78
-MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.12.4/apcupsd.in.patch 315
-RMD160 65ad8ff91d1280cdfc817aa15428dc3f3ecff250 files/3.12.4/apcupsd.in.patch 315
-SHA256 230e8e436fffef7c2bac52dfe522a160fdf6c27f1a15215ba8acdc2c73665e78 files/3.12.4/apcupsd.in.patch 315
-AUX 3.12.4/etc.patch 3710 RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 SHA1 ed4127a156151296be54e92fe328cdc4744daea9 SHA256 046cca492d0ff932c9c5b5cf2e36d48d5cdb8a0a6cbac19791d3be72ba92813f
-MD5 ceb8a56c8234598dad868dcf3b366e9f files/3.12.4/etc.patch 3710
-RMD160 c20497fd4f137cfecb3962610bfcc2c57f62c890 files/3.12.4/etc.patch 3710
-SHA256 046cca492d0ff932c9c5b5cf2e36d48d5cdb8a0a6cbac19791d3be72ba92813f files/3.12.4/etc.patch 3710
+AUX 3.12.4/apcupsd.in.patch 273 RMD160 46efa88a7716a0e26f905528335e8d4994a9b704 SHA1 8e976c8f3316b8b7a056a9a5a3a432be66131854 SHA256 c07f3085f5b39d319f220898b84a8ffe27c872cb6d70d90bd7211af11c3b2c08
+MD5 b16ab90b6b83806a03c27aef26c4d0f0 files/3.12.4/apcupsd.in.patch 273
+RMD160 46efa88a7716a0e26f905528335e8d4994a9b704 files/3.12.4/apcupsd.in.patch 273
+SHA256 c07f3085f5b39d319f220898b84a8ffe27c872cb6d70d90bd7211af11c3b2c08 files/3.12.4/apcupsd.in.patch 273
+AUX 3.12.4/etc.patch 3500 RMD160 650857be571e1304b42d277e50447346e392e9eb SHA1 b4601ef7000560bc1446cb0686cde73edf92ccbe SHA256 ee4fc73d658e44183b68e0281dfcb24d30eb265b635cf0aa87e5fe9e15330f45
+MD5 26480cbe6d33e888c1c6e062c273b1d4 files/3.12.4/etc.patch 3500
+RMD160 650857be571e1304b42d277e50447346e392e9eb files/3.12.4/etc.patch 3500
+SHA256 ee4fc73d658e44183b68e0281dfcb24d30eb265b635cf0aa87e5fe9e15330f45 files/3.12.4/etc.patch 3500
+AUX 3.12.4/exit-status-build.patch 356 RMD160 6f50bd1b8dc3a1cfc3739beea21a2ff2caafb6b3 SHA1 64606aae1a36761fef50672ad4a781ba16c49529 SHA256 a1d03e2ef099e8bb89be6edf0f5370460cc12aa732b609528a4851b50d93357e
+MD5 455eb7bf5aec1780794aca89643f4069 files/3.12.4/exit-status-build.patch 356
+RMD160 6f50bd1b8dc3a1cfc3739beea21a2ff2caafb6b3 files/3.12.4/exit-status-build.patch 356
+SHA256 a1d03e2ef099e8bb89be6edf0f5370460cc12aa732b609528a4851b50d93357e files/3.12.4/exit-status-build.patch 356
+AUX 3.12.4/no-strip.patch 2181 RMD160 aa2d852fa223e2c5b18426a5334a1e3ee05b9cdc SHA1 b7952c4102fd810cb325c3cd6ab58592aa3cf527 SHA256 d45668c87581c1f5dd3a235578b291af157678480536d501c7f60b1cdfb0edab
+MD5 c5bc045a431ba29cf985dd90d9555d27 files/3.12.4/no-strip.patch 2181
+RMD160 aa2d852fa223e2c5b18426a5334a1e3ee05b9cdc files/3.12.4/no-strip.patch 2181
+SHA256 d45668c87581c1f5dd3a235578b291af157678480536d501c7f60b1cdfb0edab files/3.12.4/no-strip.patch 2181
 DIST apcupsd-3.10.15.tar.gz 3858266 RMD160 a8f0b69a5622057ccf8ff97c1f1f56ef1305d9c1 SHA256 04179f7369a3a24816e94605b973ba739a2b22e80e2765159f457515a6c96e5a
 DIST apcupsd-3.10.16.tar.gz 5037822 RMD160 e0db09c40c9ae103ac7fce66280050d0fa328688 SHA256 2d9f280fde4b9e64cc8bba8e79d1f0e153a35dfe4aaec02cfc00cf7bc0bec31e
-DIST apcupsd-3.10.17.tar.gz 5662277 RMD160 6d1766a8f957d0a08811371d0473e8bf6bd854ef SHA256 8eb6d0dd5fb8973356dd4e335de4e5df3fc559bff4713a87fd29798a46d5e78c
+DIST apcupsd-3.10.17.tar.gz 5662277 RMD160 6d1766a8f957d0a08811371d0473e8bf6bd854ef SHA1 b3c236cb12986b27b55b213eabe7c0b501697d33 SHA256 8eb6d0dd5fb8973356dd4e335de4e5df3fc559bff4713a87fd29798a46d5e78c
 DIST apcupsd-3.10.18.tar.gz 5698299 RMD160 ebaf99e097d836ff8858cf653a825928058f54dd SHA1 a4e0f968be13c833ec25869f686e44c5a34e7964 SHA256 ae42d64e5cb29c8ce291f634139b5c81e888c95686f5c70ac9c250a1d8c02a38
 DIST apcupsd-3.12.2.tar.gz 4219660 RMD160 0076affa09d1dcd5efda36d30a22161c797b9bde SHA1 fc15bf94be00dfaf255a2f4a0bced717525670e9 SHA256 755cd2bffc4090c58979a87ed3f9135afd1846153feb8a39fad95f745adbd347
 DIST apcupsd-3.12.3.tar.gz 4222539 RMD160 0f801e9405f79af6d70e56868d222f80f8bb1583 SHA1 cd5b342ad7766af72999bb6f97447e9144ee3544 SHA256 871dc9957998f9f23a92d3e2bfd38a28aad0a7972a9bd6652c1d045f3db45132
@@ -124,14 +132,14 @@ EBUILD apcupsd-3.12.3.ebuild 3031 RMD160 c18145b871006ee73b4681ea4ad63a11e1f2313
 MD5 762856dea9f3da3eb8c78da2c6cd2725 apcupsd-3.12.3.ebuild 3031
 RMD160 c18145b871006ee73b4681ea4ad63a11e1f2313c apcupsd-3.12.3.ebuild 3031
 SHA256 df9c5dbe920a0a4be9e4f1385990096d970941af4424ac3c6b235eccbf3a65fc apcupsd-3.12.3.ebuild 3031
-EBUILD apcupsd-3.12.4.ebuild 3038 RMD160 104983f95a96683843a4ea58f82aa790c3fb3ebc SHA1 09fa11af7a9b251c1a1eaae021f996c9ef8ee17a SHA256 06d077bfc80c6521d9e52e5172ea83cc251363c645dca1d973f53872def64a59
-MD5 04d08a47e6e33fa8fc2a56ddef968cd6 apcupsd-3.12.4.ebuild 3038
-RMD160 104983f95a96683843a4ea58f82aa790c3fb3ebc apcupsd-3.12.4.ebuild 3038
-SHA256 06d077bfc80c6521d9e52e5172ea83cc251363c645dca1d973f53872def64a59 apcupsd-3.12.4.ebuild 3038
-MISC ChangeLog 14345 RMD160 c99bf1d4c6b63655b44e7ba78b02265cb52a7d42 SHA1 9ac774aa43748db523961cfa922c7b2009aba03f SHA256 35536c3e60cf41444beaf97ca42e8222ed10be081ab260692a79d0b1401f4ba4
-MD5 8b1c23dd122b45f4ffc68bd7bf753fbe ChangeLog 14345
-RMD160 c99bf1d4c6b63655b44e7ba78b02265cb52a7d42 ChangeLog 14345
-SHA256 35536c3e60cf41444beaf97ca42e8222ed10be081ab260692a79d0b1401f4ba4 ChangeLog 14345
+EBUILD apcupsd-3.12.4.ebuild 2929 RMD160 29416b5652ebd09fde41532c793a528f82685cb3 SHA1 3520e480cf67b36543655d13028a57f2407986ac SHA256 4f4da31db365c1e7d4cb97f4e6751f6a40c7255d818feb8e2dc283e0011625c6
+MD5 d94624455d62709b5b2c10a29711d418 apcupsd-3.12.4.ebuild 2929
+RMD160 29416b5652ebd09fde41532c793a528f82685cb3 apcupsd-3.12.4.ebuild 2929
+SHA256 4f4da31db365c1e7d4cb97f4e6751f6a40c7255d818feb8e2dc283e0011625c6 apcupsd-3.12.4.ebuild 2929
+MISC ChangeLog 14641 RMD160 a73914dc203ecedb87d293114e7a1a8caf704368 SHA1 ed8cdf5174efaf7bac069e56f8a99152a7a5a883 SHA256 e7801121a62140c8f306e680594daf90d3d10ad8dfa22405f7028e38e604ddc2
+MD5 c95662e2b42b32bc8bd20fce2830dbff ChangeLog 14641
+RMD160 a73914dc203ecedb87d293114e7a1a8caf704368 ChangeLog 14641
+SHA256 e7801121a62140c8f306e680594daf90d3d10ad8dfa22405f7028e38e604ddc2 ChangeLog 14641
 MISC metadata.xml 226 RMD160 e0ca1098a8ced8b212c797e8d3343fed766ba485 SHA1 360c056f345a7b50026e93de38b0167f4193904f SHA256 ab1d24920d852e21a852c10c1ec15d5d0cfe91752a67e9eca902177081d6e1c2
 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
 RMD160 e0ca1098a8ced8b212c797e8d3343fed766ba485 metadata.xml 226
@@ -166,7 +174,7 @@ SHA256 d5ada22441893d49204b66ed425a7b2b9081e985824ebb9a55b67b3001e98a42 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFO8uKKtJO8LeSoosRAsCVAJ4wYGxW2H05QVgZpfftl9Xz/2HviQCglQlV
-Yf97jcjgIVCp/SGHf8WcIiE=
-=Feq/
+iD8DBQFFiGWIK9sYciBdMQMRArtLAJ4gFVYWOgPkpx/ABsN6sWs5R69cVQCeMXMl
+28OTmhvkybRbcrXUDwAZUG8=
+=pqWM
 -----END PGP SIGNATURE-----

diff --git a/sys-power/apcupsd/apcupsd-3.12.4.ebuild b/sys-power/apcupsd/apcupsd-3.12.4.ebuild
index 9ed18845dfa54533a6b8366dec688090133c1d0a..8bad2ca506ee594da1dd9b890b969fb12a81596e 100644 (file)
--- a/sys-power/apcupsd/apcupsd-3.12.4.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.12.4.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.4.ebuild,v 1.3 2006/10/22 19:49:01 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.4.ebuild,v 1.4 2006/12/19 22:19:33 vapier Exp $
 
+WEBAPP_MANUAL_SLOT="yes"
 inherit eutils webapp
 
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
@@ -9,13 +10,11 @@ HOMEPAGE="http://www.apcupsd.org/"
 SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
-WEBAPP_MANUAL_SLOT="yes"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="doc snmp usb cgi threads ncurses nls"
 
-DEPEND="doc? ( virtual/tetex
-               dev-tex/latex2html )
+DEPEND="doc? ( virtual/tetex dev-tex/latex2html )
        cgi? ( >=media-libs/gd-1.8.4 )
        ncurses? ( sys-libs/ncurses )
        nls? ( sys-devel/gettext )
@@ -29,15 +28,11 @@ pkg_setup() {
 
 src_unpack() {
        unpack ${A}
-       cd ${S}/platforms/gentoo
-       epatch ${FILESDIR}/${PV}/apcupsd.in.patch
-
-       cd ${S}/platforms
-       epatch ${FILESDIR}/${PV}/etc.patch
-
-       # Avoid usage of install -s, leave to portage stripping binaries
-       sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
-               ${S}/src/Makefile.in ${S}/src/cgi/Makefile.in
+       cd "${S}"
+       epatch "${FILESDIR}"/${PV}/apcupsd.in.patch
+       epatch "${FILESDIR}"/${PV}/etc.patch
+       epatch "${FILESDIR}"/${PV}/exit-status-build.patch
+       epatch "${FILESDIR}"/${PV}/no-strip.patch
 }
 
 src_compile() {
@@ -80,7 +75,7 @@ src_compile() {
 src_install() {
        use cgi && webapp_src_preinst
 
-       make DESTDIR=${D} install || die "installed failed"
+       emake DESTDIR="${D}" install || die "installed failed"
        rm -f "${D}"/etc/init.d/halt
 
        insinto /etc/apcupsd

diff --git a/sys-power/apcupsd/files/3.12.4/apcupsd.in.patch b/sys-power/apcupsd/files/3.12.4/apcupsd.in.patch
index 7bcb0f41c086b48b373fc03e2b92f081ab04afc6..69dad9d74d1c8b6e498632f368c64dc27ad4bc45 100644 (file)
--- a/sys-power/apcupsd/files/3.12.4/apcupsd.in.patch
+++ b/sys-power/apcupsd/files/3.12.4/apcupsd.in.patch
@@ -1,5 +1,5 @@
---- apcupsd.in 2002-09-14 14:03:18.000000000 +0200
-+++ apcupsd.in.new     2003-11-06 16:34:28.000000000 +0100
+--- platforms/gentoo/apcupsd.in
++++ platforms/gentoo/apcupsd.in
 @@ -6,6 +6,12 @@
  APCPID=@PIDDIR@/apcupsd.pid
  APCUPSD=@sbindir@/apcupsd

diff --git a/sys-power/apcupsd/files/3.12.4/etc.patch b/sys-power/apcupsd/files/3.12.4/etc.patch
index a3acfdbd6fe46ab8adf84fbe5462ceee465124b2..a4951f8dae43d0cbe758d3c131b6621603def5f4 100644 (file)
--- a/sys-power/apcupsd/files/3.12.4/etc.patch
+++ b/sys-power/apcupsd/files/3.12.4/etc.patch
@@ -1,6 +1,5 @@
-diff -cwb etc.bak/changeme.in etc/changeme.in
-*** etc.bak/changeme.in        Sun Mar 19 01:39:52 2006
---- etc/changeme.in    Sun Mar 19 01:41:31 2006
+*** platforms/etc.bak/changeme.in      Sun Mar 19 01:39:52 2006
+--- platforms/etc/changeme.in  Sun Mar 19 01:41:31 2006
 ***************
 *** 13,21 ****
   #
@@ -23,9 +22,8 @@ diff -cwb etc.bak/changeme.in etc/changeme.in
      @sbindir@/apcaccess status
 ! ) | $APCUPSD_MAIL $SYSADMIN
   exit 0
-diff -cwb etc.bak/commfailure.in etc/commfailure.in
-*** etc.bak/commfailure.in     Sun Mar 19 01:39:52 2006
---- etc/commfailure.in Sun Mar 19 01:41:51 2006
+*** platforms/etc.bak/commfailure.in   Sun Mar 19 01:39:52 2006
+--- platforms/etc/commfailure.in       Sun Mar 19 01:41:51 2006
 ***************
 *** 13,21 ****
   #
@@ -48,9 +46,8 @@ diff -cwb etc.bak/commfailure.in etc/commfailure.in
      @sbindir@/apcaccess status
 ! ) | $APCUPSD_MAIL $SYSADMIN
   exit 0
-diff -cwb etc.bak/commok.in etc/commok.in
-*** etc.bak/commok.in  Sun Mar 19 01:39:52 2006
---- etc/commok.in      Sun Mar 19 01:42:05 2006
+*** platforms/etc.bak/commok.in        Sun Mar 19 01:39:52 2006
+--- platforms/etc/commok.in    Sun Mar 19 01:42:05 2006
 ***************
 *** 13,21 ****
   #
@@ -73,9 +70,8 @@ diff -cwb etc.bak/commok.in etc/commok.in
      @sbindir@/apcaccess status
 ! ) | $APCUPSD_MAIL $SYSADMIN
   exit 0
-diff -cwb etc.bak/masterconnect.in etc/masterconnect.in
-*** etc.bak/masterconnect.in   Sun Mar 19 01:39:52 2006
---- etc/masterconnect.in       Sun Mar 19 01:42:22 2006
+*** platforms/etc.bak/masterconnect.in Sun Mar 19 01:39:52 2006
+--- platforms/etc/masterconnect.in     Sun Mar 19 01:42:22 2006
 ***************
 *** 13,21 ****
   #
@@ -98,9 +94,8 @@ diff -cwb etc.bak/masterconnect.in etc/masterconnect.in
      @sbindir@/apcaccess status
 ! ) | $APCUPSD_MAIL $SYSADMIN
   exit 0
-diff -cwb etc.bak/mastertimeout.in etc/mastertimeout.in
-*** etc.bak/mastertimeout.in   Sun Mar 19 01:39:52 2006
---- etc/mastertimeout.in       Sun Mar 19 01:42:35 2006
+*** platforms/etc.bak/mastertimeout.in Sun Mar 19 01:39:52 2006
+--- platforms/etc/mastertimeout.in     Sun Mar 19 01:42:35 2006
 ***************
 *** 13,21 ****
   #
@@ -123,9 +118,8 @@ diff -cwb etc.bak/mastertimeout.in etc/mastertimeout.in
      @sbindir@/apcaccess status
 ! ) | $APCUPSD_MAIL $SYSADMIN
   exit 0
-diff -cwb etc.bak/offbattery.in etc/offbattery.in
-*** etc.bak/offbattery.in      Sun Mar 19 01:39:52 2006
---- etc/offbattery.in  Sun Mar 19 01:42:53 2006
+*** platforms/etc.bak/offbattery.in    Sun Mar 19 01:39:52 2006
+--- platforms/etc/offbattery.in        Sun Mar 19 01:42:53 2006
 ***************
 *** 13,21 ****
   #
@@ -148,9 +142,8 @@ diff -cwb etc.bak/offbattery.in etc/offbattery.in
      @sbindir@/apcaccess status
 ! ) | $APCUPSD_MAIL $SYSADMIN
   exit 0
-diff -cwb etc.bak/onbattery.in etc/onbattery.in
-*** etc.bak/onbattery.in       Sun Mar 19 01:39:52 2006
---- etc/onbattery.in   Sun Mar 19 01:43:10 2006
+*** platforms/etc.bak/onbattery.in     Sun Mar 19 01:39:52 2006
+--- platforms/etc/onbattery.in Sun Mar 19 01:43:10 2006
 ***************
 *** 13,21 ****
   #

diff --git a/sys-power/apcupsd/files/3.12.4/exit-status-build.patch b/sys-power/apcupsd/files/3.12.4/exit-status-build.patch
new file mode 100644 (file)
index 0000000..bce9504
--- /dev/null
+++ b/sys-power/apcupsd/files/3.12.4/exit-status-build.patch
@@ -0,0 +1,15 @@
+if a subdir fails, we need to abort
+
+--- autoconf/targets.mak
++++ autoconf/targets.mak
+@@ -20,9 +20,7 @@
+           for file in . ${subdirs}; \
+           do \
+               (cd $$file && if test "$$file" != "."; then $(MAKE) DESTDIR=$(DESTDIR) all; fi); \
+-                if test "$$?" != "0"; then \
+-                   break; \
+-                fi; \
++                test "$$?" != "0" && exit 1 ; \
+           done; \
+       fi
+ 

diff --git a/sys-power/apcupsd/files/3.12.4/no-strip.patch b/sys-power/apcupsd/files/3.12.4/no-strip.patch
new file mode 100644 (file)
index 0000000..494ba37
--- /dev/null
+++ b/sys-power/apcupsd/files/3.12.4/no-strip.patch
@@ -0,0 +1,63 @@
+let portage handle stripping
+
+--- src/Makefile.in
++++ src/Makefile.in
+@@ -56,9 +56,9 @@
+ install-binary: $(allexe)
+       @$(ECHO) "Installing daemons ..."
+       @$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
+-      @$(INSTALL_PROGRAM) -s -m 700 apcupsd@EXEEXT@ \
++      @$(INSTALL_PROGRAM) -m 700 apcupsd@EXEEXT@ \
+               $(DESTDIR)$(sbindir)/apcupsd@EXEEXT@
+-      @$(INSTALL_PROGRAM) -s -m 700 apctest@EXEEXT@ \
++      @$(INSTALL_PROGRAM) -m 700 apctest@EXEEXT@ \
+               $(DESTDIR)$(sbindir)/apctest@EXEEXT@
+       @$(MAKE) DESTDIR=$(DESTDIR) install-@APCACCESS@
+       @$(MAKE) DESTDIR=$(DESTDIR) install-@SMTP@
+@@ -66,15 +66,15 @@
+       @$(MAKE) DESTDIR=$(DESTDIR) install-@CGI@
+ 
+ install-apcaccess:
+-      @$(INSTALL_PROGRAM) -s -m 755 apcaccess@EXEEXT@ \
++      @$(INSTALL_PROGRAM) -m 755 apcaccess@EXEEXT@ \
+               $(DESTDIR)$(sbindir)/apcaccess@EXEEXT@
+ 
+ install-smtp:
+-      @$(INSTALL_PROGRAM) -s -m 755 smtp@EXEEXT@ \
++      @$(INSTALL_PROGRAM) -m 755 smtp@EXEEXT@ \
+               $(DESTDIR)$(sbindir)/smtp@EXEEXT@
+ 
+ install-powerflute:
+-      @$(INSTALL_PROGRAM) -s -m 755 powerflute@EXEEXT@ \
++      @$(INSTALL_PROGRAM) -m 755 powerflute@EXEEXT@ \
+               $(DESTDIR)$(sbindir)/powerflute@EXEEXT@
+ install-cgi:
+       (cd cgi/; $(MAKE) DESTDIR=$(DESTDIR) install)
+--- src/win32/Makefile.in
++++ src/win32/Makefile.in
+@@ -63,9 +63,9 @@
+ 
+ install:
+       @echo "Installing executables ..."
+-      @$(INSTALL_PROGRAM) -s -m 755 popup.exe $(sbindir)/popup.exe
+-      @$(INSTALL_PROGRAM) -s -m 755 shutdown.exe $(sbindir)/shutdown.exe
+-      @$(INSTALL_PROGRAM) -s -m 755 email.exe $(sbindir)/email.exe
++      @$(INSTALL_PROGRAM) -m 755 popup.exe $(sbindir)/popup.exe
++      @$(INSTALL_PROGRAM) -m 755 shutdown.exe $(sbindir)/shutdown.exe
++      @$(INSTALL_PROGRAM) -m 755 email.exe $(sbindir)/email.exe
+ 
+ # Make a Win32 binary release 
+ binary-release:
+--- src/cgi/Makefile.in
++++ src/cgi/Makefile.in
+@@ -54,8 +54,8 @@
+ 
+ install: all-targets
+       @for p in $(allexe) ; do \
+-          echo $(INSTALL_PROGRAM) -s $$p $(DESTDIR)$(cgibin); \
+-          $(INSTALL_PROGRAM) -s $$p $(DESTDIR)$(cgibin); \
++          echo $(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgibin); \
++          $(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgibin); \
+       done
+       # don't overwrite any existing config file
+       @if test ! -f $(DESTDIR)$(sysconfdir)/apcupsd.css; then \