From 35c13b04746ecdc39237b69e17d5f1140d5c4c14 Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Mon, 18 May 2009 04:53:10 +0000
Subject: [PATCH] sys-fs/tux3progs: update makefile

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1225 6952d904-891a-0410-993b-d76249ca496b
---
 sys-fs/tux3progs/ChangeLog                    |  4 +
 sys-fs/tux3progs/Manifest                     |  5 +-
 .../files/tux3-dist-packager-2.patch          | 77 +++++++++++++++++++
 sys-fs/tux3progs/tux3progs-9999.ebuild        |  2 +-
 4 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 sys-fs/tux3progs/files/tux3-dist-packager-2.patch

diff --git a/sys-fs/tux3progs/ChangeLog b/sys-fs/tux3progs/ChangeLog
index 73385c4f..c46de115 100644
--- a/sys-fs/tux3progs/ChangeLog
+++ b/sys-fs/tux3progs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  +files/tux3-dist-packager-2.patch, tux3progs-9999.ebuild:
+  update makefile
+
   17 May 2009; Mario Fetka <mario.fetka@gmail.com> files/tux3-gcc44-1.patch:
   update gcc 4.4 patch
 
diff --git a/sys-fs/tux3progs/Manifest b/sys-fs/tux3progs/Manifest
index 45c589d2..a8955470 100644
--- a/sys-fs/tux3progs/Manifest
+++ b/sys-fs/tux3progs/Manifest
@@ -1,5 +1,6 @@
 AUX tux3-dist-packager-1.patch 2136 RMD160 19cdf75b888b2b4f843538742b770d7293576eb2 SHA1 4d4ccbba9aa3fd994472cfa2973f6980714a3060 SHA256 f86d2b17d7769136f212dd2479c1d978967deb88caac848a7da861beccccb8e5
+AUX tux3-dist-packager-2.patch 2316 RMD160 ed6e8918a9e2e2e6907046a92c7aba41f454bca1 SHA1 333e14cf86ca770fd41e7d01b021242ddc528901 SHA256 d901589ec8bd16eb85492aec5bf6309f381c68a5a6ab1b0cbe50c7e567343b0c
 AUX tux3-gcc44-1.patch 2569 RMD160 98b8df81f5a9809eefb04fad5d29aca000159d56 SHA1 a9d1d38af5bd1516426de2f3c6a902930851bcae SHA256 057783f2b3224f6307c4239d40654d9abe34986dd5527f282da9fdad61cd791c
-EBUILD tux3progs-9999.ebuild 741 RMD160 0f6bcc7cd4cbcd33a8f87fe9b3e0c47a584af999 SHA1 e8a0be46856a423c98ed7e0e03b9ed00548d4806 SHA256 10afd6f5f20853ae0925f288f26fda80b3d2f8858726b88cc6fe9cd1335d2d6b
-MISC ChangeLog 750 RMD160 a43d03595abee0f34362b1235d5fdf0d8463bac1 SHA1 6875c1efd0e3a452181e6b710c1a48c4385baac4 SHA256 1d3da44dd55139589adbca933274530ab78830db59f636df1975701f134469ce
+EBUILD tux3progs-9999.ebuild 741 RMD160 439ee3b5780861af7826386766335e3d6ea5dac3 SHA1 431c36f06dc9d764516c243406f5d0615a151d92 SHA256 85b2166005b6b0f74ca321c07b7140158eb5b979525d84207274f3d786d1af5f
+MISC ChangeLog 880 RMD160 885037a52d38a8fe6574a50d31c5a413536640ff SHA1 c96861e3c752aca86005074ef2208a1c2a9865aa SHA256 03a0585827139e25f145831d4c1cfac1ebc6cb85b934599ccb4045bb078e5a9a
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/sys-fs/tux3progs/files/tux3-dist-packager-2.patch b/sys-fs/tux3progs/files/tux3-dist-packager-2.patch
new file mode 100644
index 00000000..69ac5c2a
--- /dev/null
+++ b/sys-fs/tux3progs/files/tux3-dist-packager-2.patch
@@ -0,0 +1,77 @@
+Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
+Date: 2009-05-18
+Initial Package Version: changeset cb5655728089
+Origin: me
+Upstream Status: unknown
+Description: add install target and add LDFLAGS for overwrite
+ 
+diff -Naur tux3.orig/user/Makefile tux3/user/Makefile
+--- tux3.orig/user/Makefile	2009-05-17 20:13:43.438558904 +0000
++++ tux3/user/Makefile	2009-05-18 04:44:55.927761560 +0000
+@@ -11,20 +11,30 @@
+ CFLAGS += -Wno-unused-parameter -Wno-sign-compare -Wno-missing-field-initializers
+ CFLAGS += $(UCFLAGS)
+ 
++LDFLAGS =
++
+ CHECKER = sparse
+ CHECKFLAGS = -D__CHECKER__ -D__CHECK_ENDIAN__ -Wbitwise -Wno-transparent-union
+ CHECKFLAGS += -Wno-decl -Wno-declaration-after-statement
+ 
+ VG=valgrind --error-exitcode=200 --leak-check=full
++INSTALL = install
+ 
+ TESTDIR = .
++OWNER = root
++GROUP = root
++
++DISTDIR =
++PREFIX=/usr/local
++SBINDIR = $(PREFIX)/sbin
++LIBEXECDIR = $(PREFIX)/libexec/tux3
+ 
+ testbin = buffer balloc dleaf ileaf iattr xattr btree dir filemap inode commit
+ tux3bin = tux3 tux3graph
+-binaries = $(testbin) $(tux3bin) tux3fuse
++binaries = $(testbin) $(tux3bin)
+ 
+ ifeq ($(shell pkg-config fuse && echo found), found)
+-	binaries += tux3fuse
++	tux3bin += tux3fuse
+ endif
+ 
+ tuxdeps		= Makefile trace.h kernel/trace.h
+@@ -93,8 +103,8 @@
+ 	$(CHECKER) $(CFLAGS) -Dbuild_$(<:.c=) $(CHECKFLAGS) -c $<
+ endif
+ 
+-$(testbin) $(tux3bin):
+-	$(CC) $(CFLAGS) $^ -o $@
++$(testbin) tux3 tux3grath:
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ test_buffer: buffer
+ 	$(VG) ./buffer
+@@ -130,7 +140,7 @@
+ 	$(VG) ./commit foodev
+ 
+ tux3fuse: utility.o tux3fuse.o
+-	$(CC) $(CFLAGS) $$(pkg-config --cflags fuse) utility.o tux3fuse.c -lfuse -otux3fuse
++	$(CC) $(CFLAGS) $(LDFLAGS) $$(pkg-config --cflags fuse) utility.o tux3fuse.c -lfuse -otux3fuse
+ ifeq ($(CHECK),1)
+ 	$(CHECKER) $(CFLAGS) $(CHECKFLAGS) $$(pkg-config --cflags fuse) tux3fuse.c
+ endif
+@@ -160,3 +170,13 @@
+ 
+ distclean: clean
+ 	rm -f *.orig kernel/*.orig
++
++install: install-bin install-test
++
++install-bin:
++	$(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 -d $(DISTDIR)$(SBINDIR)
++	$(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 $(tux3bin) $(DISTDIR)$(SBINDIR)
++
++install-test: install-bin
++	$(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 -d $(DISTDIR)$(LIBEXECDIR)
++	$(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 $(testbin) $(DISTDIR)$(LIBEXECDIR)
diff --git a/sys-fs/tux3progs/tux3progs-9999.ebuild b/sys-fs/tux3progs/tux3progs-9999.ebuild
index 028237b1..1bd1e3a3 100644
--- a/sys-fs/tux3progs/tux3progs-9999.ebuild
+++ b/sys-fs/tux3progs/tux3progs-9999.ebuild
@@ -21,7 +21,7 @@ DEPEND=""
 S="${WORKDIR}/tux3/user"
 
 src_prepare() {
-	epatch "${FILESDIR}"/tux3-dist-packager-1.patch
+	epatch "${FILESDIR}"/tux3-dist-packager-2.patch
 	epatch "${FILESDIR}"/tux3-gcc44-1.patch
 }