[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: Sun, 15 Sep 2013 13:25:56 +0000 (UTC)	[thread overview]
Message-ID: <1379251532.add264e9a284b07fc6711679e465e08c19522843.yuta_satoh@gentoo> (raw)

commit:     add264e9a284b07fc6711679e465e08c19522843
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Sep 15 13:25:32 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sun Sep 15 13:25:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=add264e9

freebsd-mk-defs-9999-gentoo.patch: update FreeBSD-10.0 ALPHA1

---
 sys-freebsd/freebsd-mk-defs/Manifest               |  2 +-
 .../files/freebsd-mk-defs-9999-gentoo.patch        | 44 +++++++++++-----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 8eaeecb..1db79e3 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -4,6 +4,6 @@ AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f
 AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
 AUX freebsd-mk-defs-9.2-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd
 AUX freebsd-mk-defs-9.2-gnu.patch 2242 SHA256 95305f335a360549703c73056898e778640c30a60c9f6b104709e7fc0cf75926 SHA512 a5b5c341972bee204d2a5b1f59cefda03aa48fdb7c7c713ceb9d4477e266aecfd137c2101988c48c73c527652ff0828e0a60b8c474904b146238c640c25d7416 WHIRLPOOL 7f7a45ad858a0b1c0cb099cedef05772fb90a752567ec778ec6f379f04e2cc86a8d4756c5c70d18685d42346fe43088622977eced076cf2c5bdbfb90fbb53362
-AUX freebsd-mk-defs-9999-gentoo.patch 12163 SHA256 bcbb924cf7ff0a85ad9458f7943ec311789a4eb2ca8fde1d937ef4e11c5bdc9e SHA512 1a1a483ddf58a2c90bd86251b3a998af3460aac485261491f2541daa92432d7c9a9f1efd8655e0603eab1ce03c9708ba40f50b10a9deb02526c97fa2730891db WHIRLPOOL 4e4546e1d4dc5b8936b74fa0f3b591313501576e34b0fbf44fe729389e2905191f04cc68e162a9459dab83c4ebc44f4a090e5ee631c9485595a3e4f28fb49b8b
+AUX freebsd-mk-defs-9999-gentoo.patch 12183 SHA256 7e859440386e4b7047507a279fa6e5b0737918f65a04f8c75cc8470a20511d39 SHA512 3d257b59873281afbaeaead56abe944cb82cd42fe3b403795009efe452ae9e85f50da845f261e576b39c5110f422dc8929b30451905f7a797541a83983c8a39b WHIRLPOOL 67adf7e146743b0c372197df595ccdfa0725879213dab05656ce033a5189e3d71a7f64462baf4ff4761de572ca61473cadeacf63c76e67aa80543d0916b94a93
 EBUILD freebsd-mk-defs-9.9999.ebuild 770 SHA256 b4fe90bb30dbb83d4d91b873851a7ee33d91268119bcbc9db097aa9b590e9f4c SHA512 1bee20b5d49ecefafc8403161b78bb53bcbd093445752a6583d42f784b012faeb49a2ec909b611904f85e3f57be7f3289dac3726cf3c8b469ce0adfe2607e9cc WHIRLPOOL 2540a7f00794a99f7b2deeab6954f21cbca69d372854c7c9998da460f90cf363f5246235391a245897d9e58c816989ce320573d444ff153f9b3f99153aa86cc3
 EBUILD freebsd-mk-defs-9999_p255489.ebuild 771 SHA256 9946d51246a9240b8fb20913c2d5ba51d24329f6ea4ec9f5eba818dd1196294e SHA512 20c1ac8db64b7b8633ee1f606bfa443b83f2077b57d165ee810170fe5e980e45453eab53302a84d262c2075ecce0809834366846ba697286a09919f69d91126e WHIRLPOOL a593e21bdb8358a88430da985542cecf5bc59e88f218fcc4995bb603e752360d1b06ddd37334e1ad32398a2b82248be9ce5b36d90f824c54d6bf100e5b5cc8f5

diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch
index 27d3b06..2b99754 100644
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch
@@ -1,4 +1,4 @@
-tested revision 255023.
+tested revision 255489
 
 diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
 index 2d648de..e456a4b 100644
@@ -118,7 +118,7 @@ index c54b435..d283240 100644
  .endif
  .endfor
 diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index 66d0a29..3ac8706 100644
+index bb3db64..dbb9bf4 100644
 --- a/share/mk/bsd.lib.mk
 +++ b/share/mk/bsd.lib.mk
 @@ -39,8 +39,6 @@ CFLAGS+= ${DEBUG_FLAGS}
@@ -130,31 +130,31 @@ index 66d0a29..3ac8706 100644
  .endif
  
  .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
-@@ -290,14 +288,17 @@ realinstall: _libinstall
+@@ -302,14 +300,17 @@ realinstall: _libinstall
  .ORDER: beforeinstall _libinstall
  _libinstall:
  .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
++	${INSTALL} -d ${DESTDIR}${_LIBDIR}
  	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
+ 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
  .endif
  .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
++	${INSTALL} -d ${DESTDIR}${_LIBDIR}
  	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
+ 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
  .endif
  .if defined(SHLIB_NAME)
-+	${INSTALL} -d ${DESTDIR}${SHLIBDIR}
++	${INSTALL} -d ${DESTDIR}${_SHLIBDIR}
  	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
  	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
- 	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
-@@ -351,10 +352,12 @@ _libinstall:
+ 	    ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}
+@@ -363,10 +364,12 @@ _libinstall:
  .endif # SHLIB_LINK
  .endif # SHIB_NAME
  .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
++	${INSTALL} -d ${DESTDIR}${_LIBDIR}
  	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
+ 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}
  .endif
  .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
 +	${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
@@ -162,26 +162,26 @@ index 66d0a29..3ac8706 100644
  	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
  .endif
 diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
-index f78a656..59e3511 100644
+index 00d38ff..86792f4 100644
 --- a/share/mk/bsd.libnames.mk
 +++ b/share/mk/bsd.libnames.mk
-@@ -52,7 +52,7 @@ LIBDWARF?=	${DESTDIR}${LIBDIR}/libdwarf.a
- LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
+@@ -53,7 +53,7 @@ LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
  LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
+ LIBEXECINFO?=	${DESTDIR}${LIBDIR}/libexecinfo.a
  LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
 -LIBFL?=		"don't use LIBFL, use LIBL"
 +LIBFL?=		${DESTDIR}${LIBDIR}/libfl.a
  LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
  LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
  LIBGCC?=	${DESTDIR}${LIBDIR}/libgcc.a
-@@ -85,7 +85,7 @@ LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeycap.a
+@@ -88,7 +88,7 @@ LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeycap.a
  LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
  LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
  LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
 -LIBL?=		${DESTDIR}${LIBDIR}/libl.a
 +LIBL?=		${DESTDIR}${LIBDIR}/libfl.a
  .if ${MK_LDNS} != "no"
- LIBLDNS?=	${DESTDIR}${LIBDIR}/libldns.a
+ LIBLDNS?=	${DESTDIR}${LIBPRIVATEDIR}/libldns.a
  .endif
 diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
 index 1e4d57e..fcb81fe 100644
@@ -263,10 +263,10 @@ index 48093eb..69f56bc 100644
  NLSLINKS+=	${file:R}
  .endif
 diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
-index da758d5..7461f68 100644
+index 8f7f0b9..189ccec 100644
 --- a/share/mk/bsd.own.mk
 +++ b/share/mk/bsd.own.mk
-@@ -199,9 +199,6 @@ INSTALL_LINK?=		${INSTALL} ${HRDLINK}
+@@ -202,9 +202,6 @@ INSTALL_LINK?=		${INSTALL} ${HRDLINK}
  INSTALL_SYMLINK?=	${INSTALL} ${SYMLINK}
  
  # Common variables
@@ -277,7 +277,7 @@ index da758d5..7461f68 100644
  COMPRESS_CMD?=	gzip -cn
  COMPRESS_EXT?=	.gz
 diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index f4546dc..372bb98 100644
+index 22ddfb5..f6a4939 100644
 --- a/share/mk/bsd.prog.mk
 +++ b/share/mk/bsd.prog.mk
 @@ -44,10 +44,6 @@ CTFFLAGS+= -g
@@ -291,7 +291,7 @@ index f4546dc..372bb98 100644
  .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
  LDFLAGS+= -static
  .endif
-@@ -197,6 +193,7 @@ realinstall: _proginstall
+@@ -201,6 +197,7 @@ realinstall: _proginstall
  .ORDER: beforeinstall _proginstall
  _proginstall:
  .if defined(PROG)
@@ -299,7 +299,7 @@ index f4546dc..372bb98 100644
  	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
  	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
  .if ${MK_DEBUG_FILES} != "no"
-@@ -230,6 +227,7 @@ SCRIPTSGRP_${script:T}?=	${SCRIPTSGRP}
+@@ -234,6 +231,7 @@ SCRIPTSGRP_${script:T}?=	${SCRIPTSGRP}
  SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
  _scriptsinstall: _SCRIPTSINS_${script:T}
  _SCRIPTSINS_${script:T}: ${script}

next             reply	other threads:[~2013-09-15 13:26 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-15 13:25 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-08-30 18:30 Yuta SATOH
2013-07-17 11:16 Yuta SATOH
2013-06-18 12:57 Yuta SATOH
2013-05-16 11:17 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:8eaeecb dfblob:1db79e3 dfblob:27d3b06 dfblob:2b99754 )
 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=1379251532.add264e9a284b07fc6711679e465e08c19522843.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