Patch for FreeBSD, and don't depend on libbsd there. Re-add previously dropped ~amd64-fbsd and ~x86-fbsd keywords.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 63 insertions, 21 deletions

diff --git a/app-editors/mg/ChangeLog b/app-editors/mg/ChangeLog
index 1843620963c7..01d96e0857c7 100644
--- a/app-editors/mg/ChangeLog
+++ b/app-editors/mg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/mg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/ChangeLog,v 1.69 2014/03/02 15:07:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/ChangeLog,v 1.70 2014/03/03 21:49:00 ulm Exp $
+
+  03 Mar 2014; Ulrich Müller <ulm@gentoo.org> mg-20140220.ebuild,
+  +files/mg-20140220-freebsd.patch:
+  Patch for FreeBSD, and don't depend on libbsd there. Re-add previously
+  dropped ~amd64-fbsd and ~x86-fbsd keywords.
 
   02 Mar 2014; Jeroen Roovers <jer@gentoo.org> mg-20140220.ebuild:
   Marked ~hppa (bug #503166).
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 4f1c2d8a9f1b..1cc77f7bba73 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,25 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX mg-20140220-freebsd.patch 518 SHA256 a858cb27962a310718575f151a7d62b62e82052822d3d43c6e371c0dc95131a5 SHA512 baf730849cf0ebafc38a88e4ac149ab6bf064719fcfcf7ffee47434feb1ac62936e59c08fc631d1ee559a614e081c817c2925f02ab1aec96ce85f17d15e7ff98 WHIRLPOOL c88bdd0199fb06d71b2dc09ab6a8322ebfb3bba81a1d42984b6f6313567eb6385001adf00ac8c01f17c13539b6ee5c7c114308ff450a911102f44fb460ccd46b
 DIST mg-20110905.tar.gz 138805 SHA256 1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229 SHA512 b490a5a3526d35839353e138f33ac924c5afbbf7e5c9faa20ceccb82e1dc1e6a3f0726b32bac7d43dcf8a410b1b8525067da5557cf669c52a9e32d1d2f45a8a4 WHIRLPOOL 64dd179462a8c9e53946c756a4975ffd2e5bf1758a300fa699032542a6e2470f9ed03f9fe1a88ac441cf17ac20c2575f9b6c5c1c396c5a7915564fbedfb1c854
 DIST mg-20131118.tar.gz 144002 SHA256 b99fe10cb8473e035ff43bf3fbf94a24035e4ebb89484d48e5b33075d22d79f3 SHA512 36451ee813ac1d01df7648f4c7aff6bef5d62c2d9c57033ccecaccf1904fa1f4071cefbe9b5c55bbebcb104ee8497cc6163d3bb4f552ce223bd441bf6613d149 WHIRLPOOL f91468b062db3372969f6d5da048d8636251509650b289cd5bb2225173f08d315c5170e4634660fcc5276f5a9eafdee835a2b5f30341523ea11902d66c0ff266
 DIST mg-20140220.tar.gz 142401 SHA256 8d8f3c250c40af318a888e6825bb234e7e605bf0576ca4a6885bb25d41241117 SHA512 a9bc66aec20784ab0e00be4078a6d099fd1e47b32a601e4b7b33f3e79beaa609090acd56f912036db9a3033d86b8e2aed4d0023939f1a378a0e302b6ed47a7f5 WHIRLPOOL fd2a629d8e7e97064d5f65e2dd4ead32cd39b9cef36bf36c0f936ed43648c42aea8c6a4442d70d9606ccfdc5e5ffce3ebd3bcba1d081b88b44970e2d7ffe691b
 EBUILD mg-20110905-r1.ebuild 1219 SHA256 242469a115a7a3e9b8cad1aeeb430246f8a6fedfbe3b48f6502b3d61c6ee330e SHA512 93b4b738b468bc163f1ae5a617b4d8e76e55b83af697834cee539fdb864317b75627feb2fda55be0092d457dfb2e7e64cc630667086abef61b593dff04d69cb9 WHIRLPOOL b3ed099897c61d3b412a1f3d5105ce6b0e57ccf199d08b675e7256e72f79aa0fe3563e816e10d90afd1d0c88d0fea0bd644da3167e78a6e41fc7b543b17a9b71
 EBUILD mg-20131118.ebuild 1297 SHA256 b5a523fa0dd6246aadc5862619d0dd7f20a135f5a2d4b390145f21d1683bef95 SHA512 5ecf269d05b17180be3436a19932ed6f3e1acaf7973377d3b82a766fe360d7e8726daeb2b78c717540ccbeeda0d434624727fc9e1c7ea443dea86d95d832b818 WHIRLPOOL a261b88ef55d2ba3512b8b46b83f8e74817fd4169b430ab23beb01f2b6a0f5a45156b60839330404a04be903ddeb57490f01f33c138f0893b63cf6c3f28aadc8
-EBUILD mg-20140220.ebuild 1340 SHA256 7c81fa7ccc5e12eb868acec69d078ae8338ad393ef1f0c2dd60ff0dd256c85b6 SHA512 61221d1b2987b17b4c0e3e7c1d5d5ab2229af8dfb9019eb040380f831a253827c5d27ee2cd9fc2e24f7d3ce7069ea6f9cc2520f06331d9d1d62b34fd91caf96c WHIRLPOOL ad9b61a9ac6923fdedb1b71120c1e7f79a206e4e3d307717f06f30e258742b3f389ba3ab344441d9747ff7ec1839535d5a69c0017f18c582deccc3413c42a9ca
-MISC ChangeLog 8328 SHA256 a3ff3dac16b7549cb259b49a455541bf1e266db3c948cda9317f1198b8480a2a SHA512 5d90e9bcb05db32235a3892164b65a7170c732c574ecb213377cbed36d3e6977c2b396373d55841f9aa2116adafb8efe05cb777ed8ae1894315f94514e84a580 WHIRLPOOL feaeb559e51e58dd79286d069573e00eb253633508b4b868c456c0a9859729b3febe3b2ca1d4946452a52effdba1834fa07808781584b8999bd41a71a8920993
+EBUILD mg-20140220.ebuild 1674 SHA256 b3b3ac415bab9ad0bb387e92c211d004697068a121c16f5b0554813af7f3e8d4 SHA512 afd70c75ce60f640d85f56fa2be23f92794e367aa09e5f2d980e6d81b3ba2f40d95076882b420d813eb6c9d71607b4a8f1dd0ac5ba0384e876b7dfb0d1fc0ce0 WHIRLPOOL 388ee6e77486808e7c4bb986088ff927d86b9780c7b96b38da19ad818e6905952e39545e95674e9e494ced9be8dbb97200a509c0e780cf1de721c6e62f2a9228
+MISC ChangeLog 8551 SHA256 885481b598e0609dd44e373a9986beb2e936c8abb31d5b57041a5bcd8bd38dfd SHA512 83569a9ebee71196156eacfc5649a5d0622a843493b2074d0ba11fcb0205707811cd2f1db7fd424c4010e0ddb6011244dc6c0dcfbdc75556ab012cf02f921743 WHIRLPOOL 0e68f3a84b086ceae5cdf9e41497dbe9362a52570e9a99d17719bd1093c1229c46f7998ae62ac64d99ad7d8e8fab30a89a1de69e13a413aecac57200a93c1644
 MISC metadata.xml 291 SHA256 65d24d4c0b435503345283db1c00cc7161174eddecc4d737cbf50d924145ca6c SHA512 2ba87a6af0cc36ed2e49ded86f81a6e30b2b9ca9e73949860db9f30bac95ad7374fe1e0c5e712f3c427a8a562ceb57c9693aea967f7c134d5858aca4ec704ba2 WHIRLPOOL 604f60f36640570753ef76af4f260e3103dc8cdfbb8dc00d585d864a6ce8fc3f573a95340720d00c9ebfccc817c13065419090aad6c281a96106b423bd88bd38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJTE1G0AAoJEJQzkH1pP7W4NioL/0VUL3BuXqU/YGK0JHze1YJV
-ZpKDIfKIJ5RK8MNlZy8qOTGMx/zbyBIf2H7ZVogrBVxR8maDBAOT+T68QSJlC/T1
-pMqIdiCLQKIpZxAjiEBWU/ZtYLfB2iYb/E8skIoEXz4OyonhYWMZgJA9Iz/8cs27
-2Y9Q6h1vz9ajE1db0OGm6Ywc7J6rRj5H8Hila0LPI1eI11EzJqfcVH3Rii2Tu3CU
-zkcdzVtN8NSSB883CdGF3Ie5bdxHSBtk98amXsU164AiDzSHCZ4EcORsOCnVw/tN
-iT2Wl6GX2YQBy8OfRzsZMoXoQwnXH+6Z2L7qoWHasO6scPmD0gLHw2yLipYsVsu1
-Ivcrb21gMLZJgiyTUqhl0RhDSVne4IlLYdlHtq/Yyv79/jsyUFdxZ6MOyTMRfkeV
-il/a8AI4rBdoNpehmjS1UXym86Te0aF5VjZajRO4D6xW8+e72rrTHS8dRzUhndW+
-uK5chIH6OtlOw9sR5Lk1Bd4b0T+LXtphT89mFk2Qew==
-=EOQs
+iQGcBAEBCAAGBQJTFPo/AAoJEJQzkH1pP7W4gMQL/jCPTuawAfcnI44NPmTmFRtz
+offR8Redv7FPJEUw9EbqgI6P+X4rLtrcNfC3O++cGWYr9nLSdRqDW6kJfBfEq17T
+MgdQZB8a3uW1HQt1dujpyn5TXEkye082FRlueJktZuoNlRmIuIfEpGikOeBfl4Uz
+BRGJQCR0SRRxl8ca+FY/GNI2dEVPhujPWfdVPYT31Fv5Kxp/l+G5dr7Hm9GWOjqa
+aOtBbY2toOu5esXw3t2cA+t0qv/QABtTkxA+1FvzWNg8DdEXVm7lLc5nuQpTm94r
+gbMvR3DvGbFK9EG0YvKFZOKiNtOMaLOMxBMB/XQVUN2GkS6bFD+0mOtG+4rgRWKk
+CrU3DKT/rdJ7Ftbxv7mkmsb9LSkYKhDpmoDrZ0e5ngSp1ONzO8RWrMmrt7WhMfGw
+jqPcSfadZQRXVHIVZhrJQSQtoBk0NXlBjreHOwBG/bSCz+evoVeB5Zm8WSO3Tob2
+c40OxWurmPi+8aaxBTHKPJXPM4XvLclfhZKtTjZnRQ==
+=YGQb
 -----END PGP SIGNATURE-----
diff --git a/app-editors/mg/files/mg-20140220-freebsd.patch b/app-editors/mg/files/mg-20140220-freebsd.patch
new file mode 100644
index 000000000000..c92c18cfbe7b
--- /dev/null
+++ b/app-editors/mg/files/mg-20140220-freebsd.patch
@@ -0,0 +1,26 @@
+--- mg-20140220-orig/sysdef.h
++++ mg-20140220/sysdef.h
+@@ -15,7 +15,7 @@
+ #  define __USE_GNU
+ #endif
+ 
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ #  define LOGIN_NAME_MAX _POSIX_LOGIN_NAME_MAX
+ #endif
+ 
+--- mg-20140220-orig/tags.c
++++ mg-20140220/tags.c
+@@ -16,8 +16,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#ifndef LIBBSD_OVERLAY
+-#include <util.h>
++#if defined(LIBBSD_OVERLAY) || defined(__FreeBSD__)
++#  include <libutil.h>
++#else
++#  include <util.h>
+ #endif
+ 
+ #include "def.h"
diff --git a/app-editors/mg/mg-20140220.ebuild b/app-editors/mg/mg-20140220.ebuild
index 274e1d4e3143..15c6847d307f 100644
--- a/app-editors/mg/mg-20140220.ebuild
+++ b/app-editors/mg/mg-20140220.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20140220.ebuild,v 1.3 2014/03/02 15:37:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20140220.ebuild,v 1.4 2014/03/03 21:49:00 ulm Exp $
 
 EAPI=5
 
@@ -12,15 +12,16 @@ SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="livecd"
 
-RDEPEND="dev-libs/libbsd
-	sys-libs/ncurses"
+RDEPEND="sys-libs/ncurses
+	!elibc_FreeBSD? ( dev-libs/libbsd )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-freebsd.patch"
 	epatch_user
 
 	# remove OpenBSD specific easter egg
@@ -29,16 +30,25 @@ src_prepare() {
 
 	# fix path to tutorial in man page
 	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
+
+	# remove pkg-config call; we pass flags and libs as parameters
+	sed -i -e '/pkg-config/d' GNUmakefile || die
 }
 
 src_compile() {
-	local pkgc=$(tc-getPKG_CONFIG)
+	local pc=$(tc-getPKG_CONFIG) extraflags extralibs
+
+	if use elibc_FreeBSD; then
+		extralibs="-lutil"
+	else
+		extraflags=$("${pc}" --cflags libbsd-overlay)
+		extralibs=$("${pc}" --libs libbsd-overlay)
+	fi
 
 	emake CC="$(tc-getCC)" \
-		CPPFLAGS="-DFKEYS -DREGEX -DXKEYS -D__dead=__dead2 $("${pkgc}" \
-			--cflags libbsd-overlay)" \
+		CPPFLAGS="-DFKEYS -DREGEX -DXKEYS -D__dead=__dead2 ${extraflags}" \
 		CFLAGS="${CFLAGS}" \
-		LIBS="$("${pkgc}" --libs ncurses libbsd-overlay)"
+		LIBS="$("${pc}" --libs ncurses) ${extralibs}"
 }
 
 src_install()  {