Add ~x86-fbsd. Add patch to deal with FreeBSD. #326999

Package-Manager: portage-2.2.0_alpha89/cvs/FreeBSD i386

4 files changed, 80 insertions, 6 deletions

diff --git a/app-misc/datefudge/ChangeLog b/app-misc/datefudge/ChangeLog
index 49eabd9b8a62..aa4cf118dcec 100644
--- a/app-misc/datefudge/ChangeLog
+++ b/app-misc/datefudge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/datefudge
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/datefudge/ChangeLog,v 1.19 2012/03/06 14:27:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/datefudge/ChangeLog,v 1.20 2012/03/08 13:37:06 naota Exp $
+
+  08 Mar 2012; Naohiro Aota <naota@gentoo.org> +files/datefudge-1.17-bsd.patch,
+  datefudge-1.17.ebuild:
+  Add ~x86-fbsd. Add patch to deal with FreeBSD. #326999
 
   06 Mar 2012; Brent Baude <ranger@gentoo.org> datefudge-1.17.ebuild:
   Marking datefudge-1.17 ppc for bug 405123
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index 047991383e56..a89fc89e4963 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX datefudge-1.17-bsd.patch 2751 RMD160 29f6bed751dc1a6988545f1985c2e50fd84a0338 SHA1 15c09fd8d5805b13b4d3daf5732c5b51c414203d SHA256 8aa05941e1ad690dc2a8b0266fbd9b39d8e24c6d77c2b56fcd31e732e25dda80
 DIST datefudge_1.14.tar.gz 11174 RMD160 91e9158139bb7b35cb2a15c505bcaf603cd2480d SHA1 1119660220729edf0cb2dc560664cf37ae42198f SHA256 9c666b7b4b77258c48530f804c18d86e859e6437f80a3819a6713e942cb19267
 DIST datefudge_1.17.tar.gz 12606 RMD160 20b8d925d0914963de952aa1b2756bdd077c01e8 SHA1 c899963dffad19c5057d07a5a9c56924ca26272b SHA256 ff6c566ef6d587dce27396c15b178fafc3c3d8a0275dd6bbd5523b88badabec4
 EBUILD datefudge-1.14.ebuild 886 RMD160 65ed53af282b2afb5e07b22ef9421d7ba3d2bb92 SHA1 d13643369f77e72e1f8ab2b8eb32b22b342274bd SHA256 25812f86aa57aa02c75a565b6d042f5b7e3da20d1a810b7eaa116b23bf3fe59f
-EBUILD datefudge-1.17.ebuild 1015 RMD160 24aefef968a8a1e5599333e375ed802dd24797bd SHA1 d32a4a4ec9931292bd8c04deb0e8a11ce70107e4 SHA256 1b3601b264093903bdb441c18e3fa27f4b1f3953fef1763c86ba764f6445d473
-MISC ChangeLog 2359 RMD160 88d85d078ae1f5a1f6e625c60c57c5810af8e8ba SHA1 768414e4ff438eccbf398027d495549696b81272 SHA256 7625274f054d8522a02c323bcd2c9dce110e636260a273ce7f07fcc04f65bc27
+EBUILD datefudge-1.17.ebuild 1088 RMD160 0b4dd8a167cb1557c4f73d77b22efde5c4049b72 SHA1 58aab63989952a003a064eb3bb6d3aaad2f14b9a SHA256 b224cb62c97606ead5df794786d342373f0eb17e8ab75704b1d371b6d6b3c20c
+MISC ChangeLog 2521 RMD160 5a9fb8def7cd408189a5f0dc38e5b3d25d9ef30e SHA1 85b1c32ea30bf2361f64560bb337b0a4933b23e5 SHA256 8a38296549be483b5ddfc64f889d573aa1eae9cce577006d78055916136f5bde
 MISC metadata.xml 243 RMD160 3b16a7e4ab8cc92ef91f0b9ef376a945c09b4872 SHA1 65c18273b1ab11556665b354ef96fd3a18c2d014 SHA256 d3e33171a7887443d3fe1cdcda61f2bfd9373ce3b9a1cc79a9d5bafeb743a8e4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (FreeBSD)
+
+iEYEARECAAYFAk9YtggACgkQGpDnPLSHuMDVuACfTNAGpuglmWNMjHJ0fLUjDLmt
+pvQAn0vSyyFskYrimlcTbTFS8aPdy8/q
+=gAVz
+-----END PGP SIGNATURE-----
diff --git a/app-misc/datefudge/datefudge-1.17.ebuild b/app-misc/datefudge/datefudge-1.17.ebuild
index f1c759faec7e..029ef6a60815 100644
--- a/app-misc/datefudge/datefudge-1.17.ebuild
+++ b/app-misc/datefudge/datefudge-1.17.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/datefudge/datefudge-1.17.ebuild,v 1.6 2012/03/06 14:27:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/datefudge/datefudge-1.17.ebuild,v 1.7 2012/03/08 13:37:06 naota Exp $
 
 EAPI=4
-inherit multilib toolchain-funcs
+inherit multilib toolchain-funcs eutils
 
 DESCRIPTION="A program (and preload library) to fake system date"
 HOMEPAGE="http://packages.qa.debian.org/d/datefudge.html"
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
@@ -23,6 +23,7 @@ src_prepare() {
 	if use prefix; then
 		sed -i -e '/-o root -g root/d' Makefile || die
 	fi
+	use userland_BSD && epatch "${FILESDIR}"/${P}-bsd.patch
 }
 
 src_compile() {
diff --git a/app-misc/datefudge/files/datefudge-1.17-bsd.patch b/app-misc/datefudge/files/datefudge-1.17-bsd.patch
new file mode 100644
index 000000000000..2f2a7dac9be3
--- /dev/null
+++ b/app-misc/datefudge/files/datefudge-1.17-bsd.patch
@@ -0,0 +1,58 @@
+diff --git a/Makefile b/Makefile
+index b2f81bb..35da75e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,17 +12,17 @@ compile all: datefudge datefudge.so
+ 
+ install: datefudge datefudge.so datefudge.1
+ 	install -d $(DESTDIR)/usr/lib/datefudge/
+-	$(INSTALL_PROGRAM) -o root -g root -m 644 datefudge.so $(DESTDIR)/usr/lib/datefudge/datefudge.so
++	$(INSTALL_PROGRAM) -o root -g wheel -m 644 datefudge.so $(DESTDIR)/usr/lib/datefudge/datefudge.so
+ 	install -d $(DESTDIR)/usr/bin/
+-	$(INSTALL_PROGRAM) -o root -g root -m 755 datefudge $(DESTDIR)/usr/bin
++	$(INSTALL_PROGRAM) -o root -g wheel -m 755 datefudge $(DESTDIR)/usr/bin
+ 	install -d $(DESTDIR)/usr/share/man/man1
+-	install -o root -g root -m 644 datefudge.1 $(DESTDIR)/usr/share/man/man1
++	install -o root -g wheel -m 644 datefudge.1 $(DESTDIR)/usr/share/man/man1
+ 
+ datefudge: datefudge.sh
+ 	sed -e 's,@VERSION@,$(VERSION),g' < $< > $@
+ 
+ datefudge.so: datefudge.o
+-	$(CC) $(LDFLAGS) -o $@ -shared $< -ldl -lc
++	$(CC) $(LDFLAGS) -o $@ -shared $< -lc
+ 
+ datefudge.o: datefudge.c
+ 	$(CC) $(CFLAGS) -c -o $@ $<
+@@ -39,8 +39,8 @@ test: compile
+ 	export TZ=UTC								 ;\
+ 	ret1=1; ret2=1                                                           ;\
+ 	for i in 1 2; do                                                         \
+-	        export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00'  +%s`   ;\
+-	        dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date --date=12:15 +%F.%T` ;\
++	        export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s`   ;\
++	        dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date -v12H -v15M +%F.%T` ;\
+ 	        exp="1970-01-02.12:15:00"                                       ;\
+ 	        [ "$$dt" != "$$exp" ] || { echo "OK"; ret1=0; break; }          ;\
+ 	        echo "failed: expected: $$exp, actual: $$dt"                    ;\
+@@ -49,7 +49,7 @@ test: compile
+ 	echo -n "Running a simple perl localtime() test... "                    ;\
+ 	pscr='@t=localtime(time);$$t[5]+=1900;$$t[4]++;printf "%04d-%02d-%02d\n",$$t[5],$$t[4],$$t[3];';\
+ 	for i in 1 2; do                                                         \
+-	        export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00'  +%s`   ;\
++	        export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s`   ;\
+ 	        dt=`LD_PRELOAD=$(CURDIR)/datefudge.so perl -e "$$pscr"`         ;\
+ 	        exp="1970-01-02"                                                ;\
+ 	        [ "$$dt" != "$$exp" ] || { echo "OK"; ret2=0; break; }          ;\
+diff --git a/datefudge.c b/datefudge.c
+index 8c86652..fc7e3d6 100644
+--- a/datefudge.c
++++ b/datefudge.c
+@@ -14,7 +14,6 @@
+ #include <stdlib.h>
+ #include <dlfcn.h>
+ #include <assert.h>
+-#include <features.h>
+ #include <unistd.h>
+ #include <time.h>
+ #include <sys/time.h>