From: Jeroen Roovers Date: Fri, 9 Apr 2010 04:52:09 +0000 (+0000) Subject: Clean up ebuild. Remove all "mktool" use. Respect LDFLAGS. Incidentally fix useless... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=49648d515db44a96d13e47d58d0f82bc8d60195c;p=gentoo.git Clean up ebuild. Remove all "mktool" use. Respect LDFLAGS. Incidentally fix useless compiler flags. Make (failing) Makefile commands explicit. Finish building or die (bug #313661). Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- diff --git a/net-misc/tcpsound/ChangeLog b/net-misc/tcpsound/ChangeLog index 052548118d8e..3896eef1a61d 100644 --- a/net-misc/tcpsound/ChangeLog +++ b/net-misc/tcpsound/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/tcpsound # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tcpsound/ChangeLog,v 1.5 2010/03/29 12:20:07 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tcpsound/ChangeLog,v 1.6 2010/04/09 04:52:09 jer Exp $ + + 09 Apr 2010; Jeroen Roovers tcpsound-0.3.1.ebuild, + -files/tcpsound-0.3.1-asneeded.patch, + +files/tcpsound-0.3.1-makefile.patch: + Clean up ebuild. Remove all "mktool" use. Respect LDFLAGS. Incidentally + fix useless compiler flags. Make (failing) Makefile commands explicit. + Finish building or die (bug #313661). 29 Mar 2010; Samuli Suominen tcpsound-0.3.1.ebuild, +files/tcpsound-0.3.1-asneeded.patch: diff --git a/net-misc/tcpsound/Manifest b/net-misc/tcpsound/Manifest index 2429bc86bef9..a11e4ca9903e 100644 --- a/net-misc/tcpsound/Manifest +++ b/net-misc/tcpsound/Manifest @@ -1,5 +1,5 @@ -AUX tcpsound-0.3.1-asneeded.patch 716 RMD160 c8d19fb41518c27bc129b7ef14d580a42a5da4e8 SHA1 a5cd80457fc80d11eb3cecdfdb6174ea48bfa890 SHA256 09e22716c9853e446981c111183f9b011caedc683f054feec769c13bc9e799b8 +AUX tcpsound-0.3.1-makefile.patch 1651 RMD160 0e0c9dfbdab20701dacee1b36637ebc6dfe13b42 SHA1 bdc06cb151ca84f736561820acb401e6c05ca943 SHA256 8613bae3ebeacb364676455bc2e4d56168649b29eed065865c8d21b7d9b31e7c DIST tcpsound-0.3.1.tar.gz 155357 RMD160 a0c2ce472d79835a412a1b7afc5b43c6282d1185 SHA1 195e9be515912d5d1358a447f07932cf4446a5c5 SHA256 358869ee017f9ccb62f8425bbc1ec70b65316b981dbf7a7b6b22042ae32b57c6 -EBUILD tcpsound-0.3.1.ebuild 1013 RMD160 3402a72f5bbf8aa1e9379991184328dd5954e046 SHA1 bbc2c229f5c898de4109638a778998fd52e4fd5a SHA256 49e693967ababf93fb436a507f831b6e67a0fc7767f124d2f93ef49d5a7ff0f1 -MISC ChangeLog 892 RMD160 f92bdf1308ec404f44daae80def6703ba0d51914 SHA1 a44138f77266832595e83d495101de82071b5c93 SHA256 e84c052b34127abe076c3d41e93a202ad33f942e7d1314924139c62e5b26b8f7 +EBUILD tcpsound-0.3.1.ebuild 999 RMD160 4c83ad694e4310d379058a94248e9fc86acb4d08 SHA1 5b654e18409d7ceeeda115dd662efa6fbdf01bf3 SHA256 433f5be2ac09407e7b3ef0b7d235e2fa2e334252326fd9736a1b7f04d688a199 +MISC ChangeLog 1224 RMD160 97820a6e67c47f42628590cc1280274d4588fe10 SHA1 7a9099d5a384a68b6e97eb6f0642f73fb59ee9a7 SHA256 427b07403d9d27a0c0fc6425fa70112f90e58818052dea67e72f9daa78ac2bee MISC metadata.xml 160 RMD160 2738573ec519cbef4b293bc132f7dd9d02291137 SHA1 29b8b234e0f3a475b50bd4df1ef8b4e5749823ce SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b diff --git a/net-misc/tcpsound/files/tcpsound-0.3.1-asneeded.patch b/net-misc/tcpsound/files/tcpsound-0.3.1-asneeded.patch deleted file mode 100644 index 76f4e2b4d01f..000000000000 --- a/net-misc/tcpsound/files/tcpsound-0.3.1-asneeded.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile -+++ Makefile -@@ -10,15 +10,16 @@ - MAN = tcpsound.1 - MANGZ = $(MAN:.1=.1.gz) - MKTOOL = ./mktool --CFLAGS = -c -v -g -W1 -I$(includedir) -L$(libdir) -lSDL -lmba -lpthread -+CFLAGS = -c -v -g -W1 -I$(includedir) -+LIBS = -L$(libdir) -lSDL -lmba -lpthread - CC = $(MKTOOL) - - .SUFFIXES: .1 .1.gz - - tcpsound: mktool src/tcpsound.c src/sound.h src/sound.c src/parse.h src/parse.c -- @$(CC) $(CFLAGS) src/sound.c src/parse.c src/tcpsound.c -o tcpsound -+ @$(CC) $(CFLAGS) src/sound.c src/parse.c src/tcpsound.c -o tcpsound $(LIBS) - play: mktool src/play.c -- @$(CC) $(CFLAGS) src/play.c -o play -+ @$(CC) $(CFLAGS) src/play.c -o play $(LIBS) - - mktool: - cc -g -o mktool mktool.c diff --git a/net-misc/tcpsound/files/tcpsound-0.3.1-makefile.patch b/net-misc/tcpsound/files/tcpsound-0.3.1-makefile.patch new file mode 100644 index 000000000000..2d05fbbfe9f1 --- /dev/null +++ b/net-misc/tcpsound/files/tcpsound-0.3.1-makefile.patch @@ -0,0 +1,52 @@ +--- Makefile.org 2005-09-05 09:26:34.000000000 +0200 ++++ Makefile 2010-04-09 06:42:41.000000000 +0200 +@@ -1,32 +1,35 @@ + # Makefile for tcpsound + +-prefix = /usr/local ++prefix = $(DESTDIR)/usr + + bindir = $(prefix)/bin +-wavdir = $(prefix)/share/sounds ++wavdir = $(prefix)/share/tcpsound + includedir = $(prefix)/include + libdir = $(prefix)/lib +-mandir = $(prefix)/man ++mandir = $(prefix)/man/man1 + MAN = tcpsound.1 + MANGZ = $(MAN:.1=.1.gz) +-MKTOOL = ./mktool +-CFLAGS = -c -v -g -W1 -I$(includedir) -L$(libdir) -lSDL -lmba -lpthread +-CC = $(MKTOOL) ++MKTOOL = install ++CFLAGS += -I$(includedir) ++LIBS = -L$(libdir) -lSDL -lmba -lpthread + + .SUFFIXES: .1 .1.gz + +-tcpsound: mktool src/tcpsound.c src/sound.h src/sound.c src/parse.h src/parse.c +- @$(CC) $(CFLAGS) src/sound.c src/parse.c src/tcpsound.c -o tcpsound +-play: mktool src/play.c +- @$(CC) $(CFLAGS) src/play.c -o play ++tcpsound: src/tcpsound.c src/sound.h src/sound.c src/parse.h src/parse.c ++ $(CC) $(LDFLAGS) $(CFLAGS) src/sound.c src/parse.c src/tcpsound.c -o tcpsound $(LIBS) ++play: src/play.c ++ $(CC) $(LDFLAGS) $(CFLAGS) src/play.c -o play $(LIBS) + + mktool: + cc -g -o mktool mktool.c + +-install: mktool +- $(MKTOOL) -i -m 0755 tcpsound $(bindir) +- $(MKTOOL) -i wavs/*.wav $(wavdir) +- -$(MKTOOL) -i docs/man/*.1.gz $(mandir)/man1 ++install: tcpsound ++ $(MKTOOL) -d $(bindir) ++ $(MKTOOL) -d $(wavdir) ++ $(MKTOOL) -d $(mandir) ++ $(MKTOOL) -m 0755 tcpsound $(bindir) ++ $(MKTOOL) -m 0644 wavs/*.wav $(wavdir) ++ -$(MKTOOL) -m 0644 docs/man/tcpsound.1.gz $(mandir) + @echo + @echo installation successful + uninstall: mktool diff --git a/net-misc/tcpsound/tcpsound-0.3.1.ebuild b/net-misc/tcpsound/tcpsound-0.3.1.ebuild index 7636235eaed5..c9c4846da2d3 100644 --- a/net-misc/tcpsound/tcpsound-0.3.1.ebuild +++ b/net-misc/tcpsound/tcpsound-0.3.1.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tcpsound/tcpsound-0.3.1.ebuild,v 1.4 2010/03/29 12:20:07 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tcpsound/tcpsound-0.3.1.ebuild,v 1.5 2010/04/09 04:52:09 jer Exp $ -inherit eutils +EAPI="2" + +inherit eutils toolchain-funcs DESCRIPTION="Play sounds in response to network traffic" HOMEPAGE="http://www.ioplex.com/~miallen/tcpsound/" @@ -17,13 +19,12 @@ DEPEND="net-analyzer/tcpdump media-libs/libsdl dev-libs/libmba" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-asneeded.patch +src_prepare() { + epatch "${FILESDIR}"/${P}-makefile.patch } src_compile() { + tc-export CC sed -i -e "s;/usr/share/sounds:/usr/local/share/sounds;/usr/share/tcpsound;g"\ "${S}"/src/tcpsound.c "${S}"/elaborate.conf @@ -34,9 +35,7 @@ src_compile() { src_install() { # Makefile expects /usr/bin to be there... - dodir /usr/bin - # einstall is required here - einstall || die + emake DESTDIR="${D}" install || die dodoc README.txt elaborate.conf }