commit: 31c407d603b0071d7db3965b68405e34ff19761d Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Wed Jan 4 09:47:54 2017 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Wed Jan 4 09:47:54 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31c407d6
net-analyzer/cnet: Version bump. Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-analyzer/cnet/Manifest | 1 + net-analyzer/cnet/cnet-3.3.4.ebuild | 56 +++++++++ net-analyzer/cnet/files/cnet-3.3.4-gentoo.patch | 161 ++++++++++++++++++++++++ 3 files changed, 218 insertions(+) diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest index 9a8ae67..17bb933 100644 --- a/net-analyzer/cnet/Manifest +++ b/net-analyzer/cnet/Manifest @@ -1 +1,2 @@ DIST cnet-3.3.1.tgz 2684531 SHA256 244091f3254534850d58675e2826962757f5aed2dc43ed567c520db43664df4e SHA512 9b86a077d48086036fbcfa86ba202b49610e1e1eac55fd3076b24a7ca622a6fc9b34156477bcb25af15d06cf0813f12a7b3f4cb21f1eeb00fd2e010610797ce8 WHIRLPOOL 6af1eab1819572c2b480ceca5b0315fcb5fdd087592945c2c59d34b7fd7b0848eecbcc29c8d11b82c895bd686bcd86f3fcaa68efa3b1da84271e6b68dc2a0543 +DIST cnet-3.3.4.tgz 2687235 SHA256 0d694de4c81c08ef960b21c925f7de81ee56979bb97164311e2a16b41abf00af SHA512 51457541d1023e49bdad4df3502c51d11ea6d62e3e6ae857becfb60229626ba777226b2b42d313d95b982b2790c6b1f80b39e344d9d4bcd4c38ccc31b055d8f9 WHIRLPOOL 23362f4fbd771e9084d67f06ef52942ccc3d0976b089507e2fa95cbd247a18a1f90716fa53ffd4cd4d6c99a3281c4250c2d78268540f682ed72cc96c340e43f9 diff --git a/net-analyzer/cnet/cnet-3.3.4.ebuild b/net-analyzer/cnet/cnet-3.3.4.ebuild new file mode 100644 index 00000000..4424f3c --- /dev/null +++ b/net-analyzer/cnet/cnet-3.3.4.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit eutils multilib toolchain-funcs + +DESCRIPTION="Network simulation tool" +HOMEPAGE="http://www.csse.uwa.edu.au/cnet3/"; +SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +RDEPEND=" + >=dev-lang/tk-8.5 + dev-libs/elfutils + x11-libs/libX11 +" +DEPEND=" + ${RDEPEND} +" + +DOCS=( + 1st.README +) +PATCHES=( + "${FILESDIR}"/${PN}-3.3.4-gentoo.patch + "${FILESDIR}"/${PN}-3.3.1-tcl.patch +) + +src_prepare() { + # Set libdir properly + sed -i -e "/CNETPATH/s:local/lib:$(get_libdir):" src/preferences.h || die + sed -i -e "/^LIBDIR/s:lib:$(get_libdir):" Makefile || die + + default +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + C99="$(tc-getCC) -std=c99" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" +} + +src_install() { + default + + if use examples; then + dodoc -r examples + fi +} diff --git a/net-analyzer/cnet/files/cnet-3.3.4-gentoo.patch b/net-analyzer/cnet/files/cnet-3.3.4-gentoo.patch new file mode 100644 index 00000000..b68b6d1 --- /dev/null +++ b/net-analyzer/cnet/files/cnet-3.3.4-gentoo.patch @@ -0,0 +1,161 @@ +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,7 @@ + # Comment/uncomment the following 4 constants to suit your system: + # + # PREFIX defines the directory below which cnet will be installed. +-PREFIX = /usr/local ++PREFIX = /usr + #PREFIX = $(HOME) + # + # BINDIR defines the directory where the cnet binary will be installed. +@@ -16,26 +16,24 @@ + LIBDIR = $(PREFIX)/lib64/cnet + # + # WWWDIR defines the directory to hold cnet's web-based documentation +-WWWDIR = /home/httpd/html/cnet ++#WWWDIR = /home/httpd/html/cnet + #WWWDIR = $(HOME)/WWW/cnet + # + # --------------------------------------------------------------------- + # + it: +- make -C src +- make -C support ++ $(MAKE) -C src ++ $(MAKE) -C support + @ls -l bin/$(NAME) lib/*.a + + install: +- make +- @mkdir -p $(BINDIR) $(LIBDIR) +- @chmod 755 $(BINDIR) $(LIBDIR) +- @cp bin/$(NAME) $(BINDIR)/$(NAME) +- @chmod 755 $(BINDIR)/$(NAME) +- @rm -rf $(LIBDIR)/* +- @cp lib/* $(LIBDIR) +- @chmod 644 $(LIBDIR)/* +- @ls -l $(BINDIR)/$(NAME) $(LIBDIR)/*.a ++ @mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) ++ @chmod 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) ++ @cp bin/$(NAME) $(DESTDIR)$(BINDIR)/$(NAME) ++ @chmod 755 $(DESTDIR)$(BINDIR)/$(NAME) ++ @rm -rf $(DESTDIR)$(LIBDIR)/* ++ @cp lib/* $(DESTDIR)$(LIBDIR) ++ @chmod 644 $(DESTDIR)$(LIBDIR)/* + + AND = html/CLICK html/KEYBOARD html/STOPANDWAIT html/TICKTOCK + www: +--- a/src/Makefile.linux ++++ b/src/Makefile.linux +@@ -5,7 +5,7 @@ + # binutils 2.5.2, and + # libelf (0.6.4 onwards) + # +-WARNINGS = -Wall -Werror -Wshadow -Wpointer-arith -Wcast-qual \ ++WARNINGS = -Wall -Wshadow -Wpointer-arith -Wcast-qual \ + -Wcast-align -Wwrite-strings -Wconversion \ + -Wstrict-prototypes -Wredundant-decls -Winline \ + -Wcomments -Wtrigraphs -Wimport -Wundef +@@ -20,8 +20,8 @@ + XINCLUDES = -I/usr/include/tcl8.5 + XLIBS = -ltcl8.5 -ltk8.5 -lX11 + # +-C99 = gcc -std=c99 -Wall -Werror -pedantic +-CFLAGS = -O3 -fPIC $(INCLUDES) $(XINCLUDES) ++C99 = $(CC) -std=c99 -Wall -pedantic ++CFLAGS += -fPIC $(INCLUDES) $(XINCLUDES) + # + LD = gcc -rdynamic + LIBDIRS = $(XLIBDIRS) +--- a/support/Makefile ++++ b/support/Makefile +@@ -7,21 +7,21 @@ + + it: + @if uname -s -r | grep -q "Linux" ; then \ +- make -f Makefile.linux ; fi ++ $(MAKE) -f Makefile.linux ; fi + @if uname -s -r | grep -q "Darwin" ; then \ +- make -f Makefile.macosx ; fi ++ $(MAKE) -f Makefile.macosx ; fi + @if uname -s -r | grep -q "SunOS 4" ; then \ +- make -f Makefile.sunos ; fi ++ $(MAKE) -f Makefile.sunos ; fi + @if uname -s -r | grep -q "SunOS 5" ; then \ +- make -f Makefile.solaris ; fi ++ $(MAKE) -f Makefile.solaris ; fi + @if uname -s -r | grep -q "OSF1" ; then \ +- make -f Makefile.osf1 ; fi ++ $(MAKE) -f Makefile.osf1 ; fi + @if uname -s -r | grep -q "IRIX" ; then \ +- make -f Makefile.irix5 ; fi ++ $(MAKE) -f Makefile.irix5 ; fi + @if uname -s -r | grep -q "FreeBSD" ; then \ +- make -f Makefile.freebsd ; fi ++ $(MAKE) -f Makefile.freebsd ; fi + @if uname -s -r | grep -q "NetBSD" ; then \ +- make -f Makefile.netbsd ; fi ++ $(MAKE) -f Makefile.netbsd ; fi + @cp -p cnetsupport.h ../lib + + # --------------------------------------------------------------------- +--- a/src/Makefile ++++ b/src/Makefile +@@ -8,21 +8,21 @@ + + it: + @if uname -s -r | grep -q "Linux" ; then \ +- make -f Makefile.linux $(NAME) ; fi ++ $(MAKE) -f Makefile.linux $(NAME) ; fi + @if uname -s -r | grep -q "Darwin" ; then \ +- make -f Makefile.macosx $(NAME) ; fi ++ $(MAKE) -f Makefile.macosx $(NAME) ; fi + @if uname -s -r | grep -q "SunOS 4" ; then \ +- make -f Makefile.sunos $(NAME) ; fi ++ $(MAKE) -f Makefile.sunos $(NAME) ; fi + @if uname -s -r | grep -q "SunOS 5" ; then \ +- make -f Makefile.solaris $(NAME) ; fi ++ $(MAKE) -f Makefile.solaris $(NAME) ; fi + @if uname -s -r | grep -q "OSF1" ; then \ +- make -f Makefile.osf1 $(NAME) ; fi ++ $(MAKE) -f Makefile.osf1 $(NAME) ; fi + @if uname -s -r | grep -q "IRIX" ; then \ +- make -f Makefile.irix5 $(NAME) ; fi ++ $(MAKE) -f Makefile.irix5 $(NAME) ; fi + @if uname -s -r | grep -q "FreeBSD" ; then \ +- make -f Makefile.freebsd $(NAME) ; fi ++ $(MAKE) -f Makefile.freebsd $(NAME) ; fi + @if uname -s -r | grep -q "NetBSD" ; then \ +- make -f Makefile.netbsd $(NAME) ; fi ++ $(MAKE) -f Makefile.netbsd $(NAME) ; fi + @cp -p $(NAME) ../bin + @cp -p cnet.h ../lib + +@@ -33,7 +33,7 @@ + @rm -rf HTML GPATH GRTAGS GSYMS GTAGS + + hide: +- make clean ++ $(MAKE) clean + echo '#if HIDE_GLOBAL_NAMES' > hidenames.h + sort < HIDENAMES | \ + awk '{ if($$0 !~ /#/) printf("#define\t%-36s\t__CN%03d\n", $$0,++n);}'\ +--- a/support/Makefile.common ++++ b/support/Makefile.common +@@ -1,13 +1,12 @@ + # +-C99 = gcc -std=c99 -Wall -Werror -pedantic -O3 -fPIC + + DOTH = cnetsupport.h + OBJ = hashtable.o haversine.o lexical.o md5.o queue.o vector.o + + $(NAME): $(OBJ) + @echo linking $(NAME) +- @ar rc $(NAME) $(OBJ) +- @ranlib $(NAME) ++ $(AR) rc $(NAME) $(OBJ) ++ $(RANLIB) $(NAME) + @cp -p $(NAME) ../lib + + %.o : %.c $(DOTH)
