[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Yuta SATOH" <nigoro.gentoo@0x100.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/
Date: Thu, 16 May 2013 11:17:57 +0000 (UTC)	[thread overview]
Message-ID: <1368702860.31eb367106285c6745b245cbe9e4c990adb23a7e.yuta_satoh@gentoo> (raw)

commit:     31eb367106285c6745b245cbe9e4c990adb23a7e
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu May 16 11:14:20 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu May 16 11:14:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=31eb3671

freebsd-mk-defs-9.9999-gentoo.patch: Since source code has been changed, update the patch.

---
 sys-freebsd/freebsd-mk-defs/Manifest               |    2 +-
 .../files/freebsd-mk-defs-9.9999-gentoo.patch      |  175 +++++++++++---------
 2 files changed, 96 insertions(+), 81 deletions(-)

diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index bb30f47..e3a2a84 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -2,5 +2,5 @@ AUX freebsd-mk-defs-9.0-gentoo.patch 11525 SHA256 da5204dc5f421d918fab06c6a57962
 AUX freebsd-mk-defs-9.0-gnu.patch 2353 SHA256 49c84f315d006d443c4cef4123cd02aee72fef93d967c164977d83af8e6f5b6e SHA512 536745ae047ce1dd5ffacf46401e16218e7245efaef0d69b2a38dd907eddcef2089798dbe653d614aa34d71472a890e467a5c8fad79c1762d24a5a87a01d8cc8 WHIRLPOOL a617d4f956cbb6accc7f56dc28e341e233e1d3e24ed7526be5f89d59b555a0ebe18d9a74cc82ba1c65b1ec32cf8cee4675103ee49771dbd7754d6ea9dfdb6e7e
 AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924
 AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
-AUX freebsd-mk-defs-9.9999-gentoo.patch 12081 SHA256 a0540a1f186c4de58e27d7054b61fff987170068372fe0e5ecc4a7127b1fb4fb SHA512 a1ccd789a7378a35a45780ba4617be347ef3ebf8f0832a07ec034614090a5a84cd6d8ad59a91c7a3c20ceb7172e483637896dd5ed91ec8f044f6ebde66173e19 WHIRLPOOL 17718fca1a838be0dd129e693336592ec63bb2bc6659bee55d79e729318aac83b43a4882c6cf3c79cf4cc1ff565ceef24b4eb81534e07008aeb7910606ec390c
+AUX freebsd-mk-defs-9.9999-gentoo.patch 12207 SHA256 2d491dfda925ef04e3982dddc50ae8851ecbdf4e4c081c97c70b565c8834f52d SHA512 a99165302462f353e81f966174a473ec5a8189d62f5a21abc6c7ad67292705046d2be208f61acd545a315d4b57f3a97dff568000b9d3c97551e72571ea1a2de9 WHIRLPOOL 48be8e60479365528a18c4d4fbc933407fe7944fd5eb4588c202e61107e3ee59f6fcb4fcab89b61d58d3878f2891f1b0d120863ed8fbe5f333e7b1db2567e9c2
 EBUILD freebsd-mk-defs-9.9999.ebuild 773 SHA256 71d299b8108c607500cfa489d0d889ddabceee47bda1ffd731ee7e3923593d22 SHA512 c0a3da9b72ead3b00c9024e0743a2726ec64163dd562226ada159968efd8afcc078daf8cf4b99a9ca3864b9dd34b3908e397b35fb329a06c3fbc805ba167d25b WHIRLPOOL 5bacda2c2ff1b4f2dc40dc351320a49a088e1fff2022689d22d6a06f16bac85ae6e96083671f815cff5e0dcf2c9504c25c00728fa97c103768f2854e981fb980

diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch
index c4061e8..0753043 100644
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch
@@ -1,9 +1,24 @@
-tested revision 244898
+tested revision 250694.
 
-diff -Nur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk
---- share.orig/mk/bsd.doc.mk	2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.doc.mk	2012-12-31 17:23:24.000000000 +0900
-@@ -135,10 +135,12 @@
+
+diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
+index d9f0ccf..9cf6b4f 100644
+--- a/share/mk/bsd.compiler.mk
++++ b/share/mk/bsd.compiler.mk
+@@ -1,7 +1,7 @@
+ # $FreeBSD$
+ 
+ .if !defined(COMPILER_TYPE)
+-. if ${CC:T:Mgcc*}
++. if ${CC:T:M*gcc*}
+ COMPILER_TYPE:=	gcc  
+ . elif ${CC:T:Mclang}
+ COMPILER_TYPE:=	clang
+diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
+index 49b2d9b..c2a8c5c 100644
+--- a/share/mk/bsd.doc.mk
++++ b/share/mk/bsd.doc.mk
+@@ -135,10 +135,12 @@ CLEANFILES+=	${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
  realinstall:
  .for _dev in ${PRINTERDEVICE:Mhtml}
  	cd ${SRCDIR}; \
@@ -16,10 +31,11 @@ diff -Nur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk
  	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
  	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
  .endfor
-diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
---- share.orig/mk/bsd.files.mk	2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.files.mk	2012-12-31 17:23:24.000000000 +0900
-@@ -39,6 +39,7 @@
+diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
+index 240f958..67f0cf9 100644
+--- a/share/mk/bsd.files.mk
++++ b/share/mk/bsd.files.mk
+@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?=	${file:T}
  .endif
  installfiles: _${group}INS_${file:T}
  _${group}INS_${file:T}: ${file}
@@ -27,7 +43,7 @@ diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
  	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
  	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
  	    ${.ALLSRC} \
-@@ -51,10 +52,12 @@
+@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
  installfiles: _${group}INS
  _${group}INS: ${_${group}FILES}
  .if defined(${group}NAME)
@@ -40,10 +56,11 @@ diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
  	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
  	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
  .endif
-diff -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
---- share.orig/mk/bsd.incs.mk	2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.incs.mk	2012-12-31 17:23:24.000000000 +0900
-@@ -41,6 +41,9 @@
+diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
+index 74c378b..7d2c7a0 100644
+--- a/share/mk/bsd.incs.mk
++++ b/share/mk/bsd.incs.mk
+@@ -41,6 +41,9 @@ ${group}NAME_${header:T}?=	${header:T}
  .endif
  installincludes: _${group}INS_${header:T}
  _${group}INS_${header:T}: ${header}
@@ -53,7 +70,7 @@ diff -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
  	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
  	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
  	    ${.ALLSRC} \
-@@ -53,9 +56,13 @@
+@@ -53,9 +56,13 @@ _${group}INCS+= ${header}
  installincludes: _${group}INS
  _${group}INS: ${_${group}INCS}
  .if defined(${group}NAME)
@@ -67,10 +84,11 @@ diff -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
  	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
  	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
  .endif
-diff -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
---- share.orig/mk/bsd.info.mk	2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.info.mk	2012-12-31 17:23:24.000000000 +0900
-@@ -83,6 +83,7 @@
+diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
+index c54b435..d283240 100644
+--- a/share/mk/bsd.info.mk
++++ b/share/mk/bsd.info.mk
+@@ -83,6 +83,7 @@ INFO2HTML?=	info2html
  TEX?=		tex
  DVIPS?=		dvips
  DVIPS2ASCII?=	dvips2ascii
@@ -78,7 +96,7 @@ diff -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
  
  .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
  
-@@ -144,15 +145,17 @@
+@@ -144,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}:	${x}
  INSTALLINFODIRS+= ${x:S/$/-install/}
  ${x:S/$/-install/}:
  .if !empty(.MAKEFLAGS:M-j)
@@ -100,10 +118,11 @@ diff -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
  	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
  .endif
  .endfor
-diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
---- share.orig/mk/bsd.lib.mk	2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.lib.mk	2012-12-31 17:23:24.000000000 +0900
-@@ -41,10 +41,6 @@
+diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
+index 6b99a4d..f53f655 100644
+--- a/share/mk/bsd.lib.mk
++++ b/share/mk/bsd.lib.mk
+@@ -41,10 +41,6 @@ CTFFLAGS+= -g
  .endif
  .endif
  
@@ -114,7 +133,7 @@ diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
  .include <bsd.libnames.mk>
  
  # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
-@@ -259,14 +255,17 @@
+@@ -259,14 +255,17 @@ realinstall: _libinstall
  .ORDER: beforeinstall _libinstall
  _libinstall:
  .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
@@ -132,7 +151,7 @@ diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
  	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
  	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
  	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
-@@ -304,10 +303,12 @@
+@@ -304,10 +303,12 @@ _libinstall:
  .endif # SHLIB_LINK
  .endif # SHIB_NAME
  .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
@@ -145,10 +164,11 @@ diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
  	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
  	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
  .endif
-diff -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk
---- share.orig/mk/bsd.libnames.mk	2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.libnames.mk	2012-12-31 17:23:24.000000000 +0900
-@@ -50,7 +50,7 @@
+diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
+index a3dbf3b..2cf726c 100644
+--- a/share/mk/bsd.libnames.mk
++++ b/share/mk/bsd.libnames.mk
+@@ -50,7 +50,7 @@ LIBDWARF?=	${DESTDIR}${LIBDIR}/libdwarf.a
  LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
  LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
  LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
@@ -157,7 +177,7 @@ diff -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk
  LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
  LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
  LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeycap.a
  LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
  LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
  LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
@@ -166,31 +186,33 @@ diff -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk
  LIBLN?=		"don't use LIBLN, use LIBL"
  .if ${MK_BIND} != "no"
  LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
-diff -Nur share.orig/mk/bsd.links.mk share/mk/bsd.links.mk
---- share.orig/mk/bsd.links.mk	2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.links.mk	2012-12-31 17:23:24.000000000 +0900
-@@ -15,6 +15,8 @@
+diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
+index 1e4d57e..fcb81fe 100644
+--- a/share/mk/bsd.links.mk
++++ b/share/mk/bsd.links.mk
+@@ -15,6 +15,8 @@ _installlinks:
  		t=${DESTDIR}$$1; \
  		shift; \
  		${ECHO} $$t -\> $$l; \
 +		d=`dirname $$t`; \
 +		test -d $$d || mkdir $$d; \
- 		ln -f $$l $$t; \
+ 		${INSTALL_LINK} $$l $$t; \
  	done; true
  .endif
-@@ -26,6 +28,8 @@
+@@ -26,6 +28,8 @@ _installlinks:
  		t=${DESTDIR}$$1; \
  		shift; \
  		${ECHO} $$t -\> $$l; \
 +		d=`dirname $$t`; \
 +		test -d $$d || mkdir $$d; \
- 		ln -fs $$l $$t; \
+ 		${INSTALL_SYMLINK} $$l $$t; \
  	done; true
  .endif
-diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
---- share.orig/mk/bsd.man.mk	2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.man.mk	2012-12-31 17:23:24.000000000 +0900
-@@ -165,9 +165,11 @@
+diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
+index 6445ba3..fabffa2 100644
+--- a/share/mk/bsd.man.mk
++++ b/share/mk/bsd.man.mk
+@@ -165,9 +165,11 @@ _maninstall: ${MAN}
  .if defined(NO_MANCOMPRESS)
  .if defined(MANFILTER)
  .for __page in ${MAN}
@@ -202,7 +224,7 @@ diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
  	${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
  		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
  .endif
-@@ -181,11 +183,14 @@
+@@ -181,11 +183,14 @@ _maninstall: ${MAN}
  		esac; \
  		page=$$1; shift; sect=$$1; shift; \
  		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
@@ -217,7 +239,7 @@ diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
  	${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
  		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
  .endfor
-@@ -193,9 +198,11 @@
+@@ -193,9 +198,11 @@ _maninstall: ${MAN}
  .endif
  .else
  .for __page in ${MAN}
@@ -229,10 +251,11 @@ diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
  	${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
  		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
  .endif
-diff -Nur share.orig/mk/bsd.nls.mk share/mk/bsd.nls.mk
---- share.orig/mk/bsd.nls.mk	2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.nls.mk	2012-12-31 17:23:24.000000000 +0900
-@@ -62,7 +62,8 @@
+diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
+index 48093eb..69f56bc 100644
+--- a/share/mk/bsd.nls.mk
++++ b/share/mk/bsd.nls.mk
+@@ -62,7 +62,8 @@ NLSDIR?=	${SHAREDIR}/nls
  # installation rules
  #
  .for file in ${NLS}
@@ -242,11 +265,12 @@ diff -Nur share.orig/mk/bsd.nls.mk share/mk/bsd.nls.mk
  .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
  NLSLINKS+=	${file:R}
  .endif
-diff -Nur share.orig/mk/bsd.own.mk share/mk/bsd.own.mk
---- share.orig/mk/bsd.own.mk	2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.own.mk	2012-12-31 17:23:24.000000000 +0900
-@@ -182,9 +182,6 @@
- INCLUDEDIR?=	/usr/include
+diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
+index b871f91..bbcd667 100644
+--- a/share/mk/bsd.own.mk
++++ b/share/mk/bsd.own.mk
+@@ -191,9 +191,6 @@ INSTALL_LINK?=		${INSTALL} ${HRDLINK}
+ INSTALL_SYMLINK?=	${INSTALL} ${SYMLINK}
  
  # Common variables
 -.if !defined(DEBUG_FLAGS)
@@ -255,10 +279,11 @@ diff -Nur share.orig/mk/bsd.own.mk share/mk/bsd.own.mk
  
  COMPRESS_CMD?=	gzip -cn
  COMPRESS_EXT?=	.gz
-diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
---- share.orig/mk/bsd.prog.mk	2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.prog.mk	2012-12-31 17:23:24.000000000 +0900
-@@ -28,10 +28,6 @@
+diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
+index 24f6e1c..48f62d4 100644
+--- a/share/mk/bsd.prog.mk
++++ b/share/mk/bsd.prog.mk
+@@ -28,10 +28,6 @@ CTFFLAGS+= -g
  CFLAGS+=${CRUNCH_CFLAGS}
  .endif
  
@@ -269,7 +294,7 @@ diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
  .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
  LDFLAGS+= -static
  .endif
-@@ -154,6 +150,7 @@
+@@ -153,6 +149,7 @@ realinstall: _proginstall
  .ORDER: beforeinstall _proginstall
  _proginstall:
  .if defined(PROG)
@@ -277,7 +302,7 @@ diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
  .if defined(PROGNAME)
  	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
  	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
-@@ -185,6 +182,7 @@
+@@ -184,6 +181,7 @@ SCRIPTSGRP_${script:T}?=	${SCRIPTSGRP}
  SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
  _scriptsinstall: _SCRIPTSINS_${script:T}
  _SCRIPTSINS_${script:T}: ${script}
@@ -285,10 +310,11 @@ diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
  	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
  	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
  	    ${.ALLSRC} \
-diff -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk
---- share.orig/mk/bsd.sys.mk	2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.sys.mk	2012-12-31 17:26:29.000000000 +0900
-@@ -30,10 +30,6 @@
+diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
+index 21c3352..5bfaa8e 100644
+--- a/share/mk/bsd.sys.mk
++++ b/share/mk/bsd.sys.mk
+@@ -30,10 +30,6 @@ CFLAGS+=	-std=${CSTD}
  .if defined(WARNS)
  .if ${WARNS} >= 1
  CWARNFLAGS+=	-Wsystem-headers
@@ -299,7 +325,7 @@ diff -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk
  .endif # WARNS >= 1
  .if ${WARNS} >= 2
  CWARNFLAGS+=	-Wall -Wno-format-y2k
-@@ -95,10 +91,6 @@
+@@ -95,10 +91,6 @@ CWARNFLAGS+=	-Wformat=2 -Wno-format-extra-args
  CWARNFLAGS+=	-Wno-format-nonliteral
  .endif # WARNS <= 3
  .endif # CLANG
@@ -310,10 +336,11 @@ diff -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk
  .endif # WFORMAT > 0
  .endif # WFORMAT
  .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang))
-diff -Nur share.orig/mk/sys.mk share/mk/sys.mk
---- share.orig/mk/sys.mk	2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/sys.mk	2012-12-31 17:23:24.000000000 +0900
-@@ -305,12 +305,6 @@
+diff --git a/share/mk/sys.mk b/share/mk/sys.mk
+index e8ec4c1..e98501e 100644
+--- a/share/mk/sys.mk
++++ b/share/mk/sys.mk
+@@ -305,12 +305,6 @@ YFLAGS		?=	-d
  	rm -f ${.PREFIX}.tmp.c
  	${CTFCONVERT_CMD}
  
@@ -326,15 +353,3 @@ diff -Nur share.orig/mk/sys.mk share/mk/sys.mk
  .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
  SHELL=	${__MAKE_SHELL}
  .SHELL: path=${__MAKE_SHELL}
-diff -Nur share.orig/mk/bsd.compiler.mk share/mk/bsd.compiler.mk
---- share.orig/mk/bsd.compiler.mk	2013-01-01 00:35:05.000000000 +0900
-+++ share/mk/bsd.compiler.mk	2013-01-01 00:36:22.000000000 +0900
-@@ -1,7 +1,7 @@
- # $FreeBSD$
- 
- .if !defined(COMPILER_TYPE)
--. if ${CC:T:Mgcc*}
-+. if ${CC:T:M*gcc*}
- COMPILER_TYPE:=	gcc  
- . elif ${CC:T:Mclang}
- COMPILER_TYPE:=	clang

next             reply	other threads:[~2013-05-16 11:18 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-16 11:17 Yuta SATOH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-09-30 11:40 [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/ Yuta SATOH
2014-07-13  3:14 Yuta SATOH
2013-10-15 12:03 Yuta SATOH
2013-09-15 13:25 Yuta SATOH
2013-08-30 18:30 Yuta SATOH
2013-07-17 11:16 Yuta SATOH
2013-06-18 12:57 Yuta SATOH
2013-01-01  1:31 Yuta SATOH
2012-09-11 17:10 Alexis Ballier

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:bb30f47 dfblob:e3a2a84 dfblob:c4061e8 dfblob:0753043 )
 OR (
bs:"[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1368702860.31eb367106285c6745b245cbe9e4c990adb23a7e.yuta_satoh@gentoo \
    --to=nigoro.gentoo@0x100.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox