install -C works on freebsd, dont remove it uncondtionally

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

3 files changed, 13 insertions, 12 deletions

diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index 6ac7ecb185b8..d32d1f434d97 100644
--- a/sys-freebsd/freebsd-mk-defs/ChangeLog
+++ b/sys-freebsd/freebsd-mk-defs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-mk-defs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.37 2011/11/07 12:26:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.38 2011/11/07 12:48:14 aballier Exp $
+
+  07 Nov 2011; Alexis Ballier <aballier@gentoo.org>
+  files/freebsd-mk-defs-9.0-gentoo.patch:
+  install -C works on freebsd, dont remove it uncondtionally
 
 *freebsd-mk-defs-9.0_rc1 (07 Nov 2011)
 
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index d85881f8aeb9..677818ffb1b6 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -5,7 +5,7 @@ AUX freebsd-mk-defs-7.1-gentoo.patch 11056 RMD160 1c6568153bce5f1193c14cc25e6313
 AUX freebsd-mk-defs-7.1-gnu.patch 4022 RMD160 cc82950abb0d798e99bbba6fb70b420756af8ff8 SHA1 ca5029934f253b9321f1af6fb9a82cade54a47ef SHA256 d10ac0750d533d42ca792584f393d0c2327e62aaf0fa2bf83636aebb68dc47ea
 AUX freebsd-mk-defs-8.0-gentoo.patch 11076 RMD160 96d87a4a2bf07278f7ef2c0b5c5dde73f1dc929d SHA1 f2d46e19d4b2f7d169652ff68c7d078f36185176 SHA256 5510a8e9530c3585374bba26942c46c9bc799da3ae0de9b6fa8bd364088260c5
 AUX freebsd-mk-defs-8.0-gnu.patch 4074 RMD160 a6571210e35ae4abe158b6231cd13aebe0046a0e SHA1 99c97fb846c811d940b59d610fc1db9767312611 SHA256 00034d4d94ec011f595864113d469ec83d11786802b997b2350e955c6d2d64a0
-AUX freebsd-mk-defs-9.0-gentoo.patch 11746 RMD160 6da808864751e5e7449b5a933a683b970c7cf30c SHA1 cfbe88fe83a8b4e38c2684cc52d2e1afbaa43a6b SHA256 ee61feb55c7e98a24c993e019c414a71ba65e63afccd1dbb80031d81a18f546e
+AUX freebsd-mk-defs-9.0-gentoo.patch 11557 RMD160 a46c3709cc4ac486b4f50020194713780ad7dc4a SHA1 35e60fed7b8ee1fb4b1509d9ba53d39eb261f367 SHA256 315cf91aaf83ac42a25c7a0f6006f4cc78997dbd98a163c2d6b088c98fc24672
 DIST freebsd-share-7.2.tar.bz2 3878366 RMD160 11cdb0c952bd442a895a2c36c3c43e15927e5706 SHA1 e389971377f4bad980db2dba01936794296742b1 SHA256 15f28ba51609d319d3edc930cf6fc20850bb493707df907fdeace23d35118bf2
 DIST freebsd-share-8.0.tar.bz2 3754795 RMD160 7da07595137e521dbc3e8bc618f875edf88792fc SHA1 542c46d447aeabbb0bb1f652bcc476713b310644 SHA256 4cbb577bb7e76f87a27d3974459d0e146736d5e8002c49f5661f95f68c2939d1
 DIST freebsd-share-8.2.tar.bz2 3797560 RMD160 88f52550c5656f9a4186eb56e5661218345b2d87 SHA1 5d38349cb2b61d639cae6212677309e8da23e131 SHA256 dd082c6ddbf8e08ec91d9810d51af4111339bed912b0f74d05be283780292ba0
@@ -14,12 +14,12 @@ EBUILD freebsd-mk-defs-7.2.ebuild 879 RMD160 089804b593696a818cc9de284704e942fe6
 EBUILD freebsd-mk-defs-8.0.ebuild 879 RMD160 c1bbd5e97bb7948c7020f50840e6f1db88cf1462 SHA1 f844b6f86536e79942ed3a747488a7087d7f3b42 SHA256 06619dbe8ff3e746da248c6fd0ef79fd60f7e46cb479d8480f38bb0c4ffe47b8
 EBUILD freebsd-mk-defs-8.2.ebuild 879 RMD160 88f45fe8e048302390574226edcf3761dfa0b2bf SHA1 3ff8593feb34da7cb850885ea3c4ef0e5cfd7430 SHA256 212cea22f0e963889075dba7cbdf47a3a4509991c2112965b59bf61a71833bdc
 EBUILD freebsd-mk-defs-9.0_rc1.ebuild 844 RMD160 d0b1d96a66fd30f9163115f9a9884aafdaf74b34 SHA1 f461f70fa91bf6c00686c8fccd6008646d5eaf67 SHA256 88421ed9fb39c7c8ccde6780093fea07efe1b35d233a860bf49853a885fbd611
-MISC ChangeLog 8588 RMD160 3c5520fb0a76053c090c8d793e75fc5008c53992 SHA1 c560ef22c2c959143baa12af7e9a41de16f632f5 SHA256 6dd55aff4c914200369021115e9f326a7dfa0a0b298c479b16e10aa5a6d354a8
+MISC ChangeLog 8744 RMD160 649ed58ac898958f4d2485bf3c5907ef54b5d1a8 SHA1 5a54e093196e5488ea39eadff9932c6b981ec708 SHA256 478e27bd921f4c6ed0b83c1d77bf83e11898fd4e9f5d8b6d7c8899430c9c43f9
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk63zowACgkQvFcC4BYPU0p5JgCeJYBLKiFrCOPv/pESTHoXLUoO
-/xQAn3uwRHySgXRPMpXYC3RI094nZSpv
-=pkEd
+iEYEARECAAYFAk6305MACgkQvFcC4BYPU0pFNACgheHeLp3fadR4O2YQlB7q8y8k
+06MAn03m0V0LrJ7V4oJ/Yqpq+F9nfV+o
+=/mdB
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch
index 9fb84d1c066d..96c8050b32bd 100644
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch
@@ -45,11 +45,10 @@ diff -ur share/mk.old/bsd.incs.mk share/mk/bsd.incs.mk
  .endif
  installincludes: _${group}INS_${header:T}
  _${group}INS_${header:T}: ${header}
--	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
 +	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
 +		 -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
 +		 ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
-+	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
+	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
  	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
  	    ${.ALLSRC} \
  	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
@@ -57,16 +56,14 @@ diff -ur share/mk.old/bsd.incs.mk share/mk/bsd.incs.mk
  installincludes: _${group}INS
  _${group}INS: ${_${group}INCS}
  .if defined(${group}NAME)
--	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
 +	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
 +		${DESTDIR}${${group}DIR}
-+	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
  	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
  .else
--	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
 +	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
 +		${DESTDIR}${${group}DIR}
-+	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
  	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
  .endif
  .endif