# ChangeLog for net-analyzer/cnet
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.17 2014/01/16 11:31:45 pinkbyte Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.18 2015/03/13 06:11:17 jer Exp $
+
+*cnet-3.3.1 (13 Mar 2015)
+
+ 13 Mar 2015; Jeroen Roovers <jer@gentoo.org> -cnet-2.0.10.ebuild,
+ -cnet-3.2.4.ebuild, +cnet-3.3.1.ebuild, -files/cnet-2.0.10-gentoo.patch,
+ -files/cnet-3.2.4-gentoo.patch, +files/cnet-3.3.1-gentoo.patch, metadata.xml:
+ Version bump. Remove fetch restriction.
*cnet-3.2.4 (16 Jan 2014)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX cnet-2.0.10-gentoo.patch 1489 SHA256 7deaa0aa194cc028f875ce4964aded2ac49681d33a3afabb96ad5e40b7184a9b SHA512 23ae62ed44bd98f3c9d07dcd6578ca9deeb412556da23ee49fdb7d215c250127d0ef9d793ca07e63ca6a2ec5bae2e3767d303a543fc6b194582dc1119ed29d31 WHIRLPOOL 0500af251bec7a45faa3f56b927f323c107f6a06d8bd8766395e7fe9d02e5bdd3c4b6528663a324b6af9a2279b8d12b84642e31fe721f6c4b514a9ded9e053c5
-AUX cnet-3.2.4-gentoo.patch 2413 SHA256 eefff3a707825a6685f026f44adc017b642a4767cce62b8f2f1f78a3c6aec6d0 SHA512 0d2ace465649d356514fc681c721d773a8357667683d93d0c7c02662f1b1f8178795d6f78382e4d3d296d1802ccba1aa52dce2da1d90a4d184c05d9b0051735a WHIRLPOOL 44a7335f8de790c912e9ebb4548b91d22ec66797c54554e155539ebf9e64c0346d9236e1d74b5fe59243dea13d72f332992c9678244ad41b7169eca69c0c55b7
-DIST cnet-2.0.10.tgz 1158887 SHA256 7b1e720179b7316d97b8b947155b261dda7ddfd01ff18fb04139c33f4a35bfcb
-DIST cnet-3.2.4.tgz 2891454 SHA256 b166747e62ac69733e5d2b8317580ff4a33fb9731426481f028f6a41991f2c33 SHA512 7e5f18d0ff04312a8259260b46433b59a7ff1ba5c84a89be94f8403b97853e23ca2d9a212774588cf1dbd0031a10daafd355c85fd13169a095ef8bf4a8e5c52b WHIRLPOOL e190163c52fb05754cfc6a9dc340983b98fba5a896e2ced888ffc7d748f6dff4ea1c59381c99aaea874559b019980a82f9b1dfc576c4aed24c33cb1adf50c70e
-EBUILD cnet-2.0.10.ebuild 1010 SHA256 1aa81c377a231321e335aed823545243ad3f8a700c3eef00b3ffc9f73911fa9d SHA512 3414c7bdec2ab33db55a881ccafc93e0688956e293cf0c055829012361712ecafe005a953a0ee79e7ca7af49467021716cfa70a01c99430680e0bc6580540196 WHIRLPOOL b010ba4527404b3823ec43472a0689affbf9c40fd262401300587fd2fe3ba2c170a189ae77f41208781d8bd929d711a33c137bf2b6155225205ca1728c9619a4
-EBUILD cnet-3.2.4.ebuild 1207 SHA256 bc0a7a8807c9b5249cf84cef790793b160aa7c612c1c33945fff5a205878d548 SHA512 8950497a01d46b7e6abe71bc75dd91fe5f566986506be8c6d2b5e095a1efd2f5e97b13cf98184b02a494f0741ed6e6951685aa9abbae37df343ed8975e6a8005 WHIRLPOOL ee6d8bc15b493fecb0bfb9024bf5b5122bddecbbd4db15a5e28908b03cb43113d79bc1b689540840490f3014f95c3ad2c0db76282ca0420fd100ade45bd6cf70
-MISC ChangeLog 2809 SHA256 e4e73f9c1abd78ba05043146cd1e19cf75133b5b215f8b743498f2a626bd2b7c SHA512 cafb557bdb40d83bfa4a312f7555b3be37d0ad9f1372a597f33f511ac89023cf99792d79bcbf797f5b19578120f2efeb63ce4b5cfea67d4d16c88b9c1a964816 WHIRLPOOL 359bc4bc2ab2f325785f45aad4fb2ce0c3226fa1a3e168f344a7d2e5f7a591467871a3e3de41264f5c5ee2cf3404cbe58b55eab9059656d87d92c57892286e2c
-MISC metadata.xml 218 SHA256 d3470d760c9c0bba1b56da4d676f0c3b97d523c57cb050c7baea8de94eed3ddd SHA512 f17165576bd977ff6ebf67ae26817eba51e6772187b12cae3ff0443cf6f3f84914340753f4cb72d5efffa55e8debc914039f44e63aa5c7a6cf6604dd52824ad9 WHIRLPOOL 9aabc7066f4872c8a0042ad27f8cc56b586b5eea5636855b36fb6f22bd3e1711136ef62aa990821e00b85f416b7604d7fb11000c7c588b3ee2435fee17c65cc9
+AUX cnet-3.3.1-gentoo.patch 4936 SHA256 c0d22f1d8466c56af3a2f23b6feedcb207faea43d61c208a048011e4fa459038 SHA512 a0d8e35e998befa7c145ce79e92f8725b6343269a84f8b34a4787cedcf4df8e9f7723c4e44223f556df99892ac0fbd313dcdae1f8e88e2b000cd1eb393fd2753 WHIRLPOOL 5f57d3dc7e887601a7a2c345aa08bb4a75c09c37028d0537b4d645e991f6c0883dfb39479a1f55c2daaf9fcb8d744b810b5343344b1243384d8a67766dbaccfe
+DIST cnet-3.3.1.tgz 2684531 SHA256 244091f3254534850d58675e2826962757f5aed2dc43ed567c520db43664df4e SHA512 9b86a077d48086036fbcfa86ba202b49610e1e1eac55fd3076b24a7ca622a6fc9b34156477bcb25af15d06cf0813f12a7b3f4cb21f1eeb00fd2e010610797ce8 WHIRLPOOL 6af1eab1819572c2b480ceca5b0315fcb5fdd087592945c2c59d34b7fd7b0848eecbcc29c8d11b82c895bd686bcd86f3fcaa68efa3b1da84271e6b68dc2a0543
+EBUILD cnet-3.3.1.ebuild 1038 SHA256 47d6b31240fca6a6a2218bc7bdf6e27418a0192d3561753f4267a1f65654b10c SHA512 abc798f300287972117046b1556769eb23bbce446d14ed8da25a9245cddd35d24e6a77ff53c21d4c9a95ea025fb5b56ed2e100c0bae9ea5b3b92cc934a208e80 WHIRLPOOL 79281512d89b7dfa7cd3c84361af4bf928c499aba8de75d8ddca3b2aee196c72e178dafb0ab9b3fbda5343fdd1119aacdd5b7b8dd6843d95e525fdc2747514dc
+MISC ChangeLog 3097 SHA256 db51077830ebaa585cc01b1d8d934ce896cf087bc021c3fbbb7492b09b01fdac SHA512 6bc4a64ae65af71f95dcc660d68d584a6d797c0ae0f085872132a1fb51e1f29dc5dc86c992badfe2521c8b274986cdf8ba889f353090626a40cbb63e90efbfb8 WHIRLPOOL cc7e7da90f3e81591bb1f03197c8e98eed4198ecd9cc379a1277ba197e9008767f87b2a2b69ee3799a093d03761365891d46db526a4369b027d5c8ea1319a0b0
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iQEcBAEBCAAGBQJS18MgAAoJECo/aRed9267iywIALD4Yu5M+QT5bv/zm4TMiSjL
-rL8kvpc2NeknbRUvJRjdYHM1KQENLhmGT7JBOi2QvZutTB2WkEq2EtAwjJDvHe09
-vk4xZcmKPzDG94nbe8YlIeqtfYVv/cHpkJc/elJQnwkTWzpiDYwSO/1AkLO3edVG
-Ccn47Au9JhWt1/IU+JVykLU1AXudC0YnkGIW6GPqjX/K9d7fycX+a9ED6olnbzuy
-PW1WKN3Aeb5QJQs1qykWwVZuBLmACPPD2rXM2jqch929Xc5xeET1tIxYYF76WEEM
-gHG6WO38yjt6fMSc6txrogMcIP4FA8YOPE98ZauYuE4gtAoMgtBBp+6QLsDi/fA=
-=7Ksp
+iEYEAREIAAYFAlUCf4YACgkQVWmRsqeSphP1+gCcCbJd2fIPr0c0uY6GkcDNA5jq
+AuYAn1ufH6bpOPzeHBTTTPI2TSLcajNP
+=NdSK
-----END PGP SIGNATURE-----
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/cnet-2.0.10.ebuild,v 1.4 2009/01/15 05:02:55 jer Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Network simulation tool"
-SRC_URI="http://www.csse.uwa.edu.au/cnet/${P}.tgz"
-HOMEPAGE="http://www.csse.uwa.edu.au/cnet"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=dev-lang/tk-8.3.4
- dev-libs/elfutils"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
- tc-export CC
- emake CFLAGS="${CFLAGS}" || die "make failed"
-}
-
-src_install() {
- # these directories aren't created during the make install
- # process, so we'll need to make them beforehand, or else
- # we'll have nowhere to put the files
- mkdir -p "${D}"/usr/{bin,lib,share}
- mkdir -p "${D}"/usr/share/man/man1
- # install with make now
- make PREFIX="${D}"/usr install || die
-
- #install examples
- docinto EXAMPLES
- dodoc EXAMPLES/*
-}
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/cnet-3.2.4.ebuild,v 1.1 2014/01/16 11:31:45 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/cnet-3.3.1.ebuild,v 1.1 2015/03/13 06:11:17 jer Exp $
EAPI=5
-
inherit eutils multilib toolchain-funcs
DESCRIPTION="Network simulation tool"
HOMEPAGE="http://www.csse.uwa.edu.au/cnet3/"
-SRC_URI="${P}.tgz"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples"
-DEPEND=">=dev-lang/tk-8.5
+DEPEND="
+ >=dev-lang/tk-8.5
dev-libs/elfutils
- x11-libs/libX11"
+ x11-libs/libX11
+"
RDEPEND="${DEPEND}"
-RESTRICT="fetch"
-
-pkg_nofetch() {
- einfo "Author demands to fill a download form to collect usage information:"
- einfo "${HOMEPAGE}/download.html"
- einfo "Please move downloaded file to ${DISTDIR}"
-}
-
src_prepare() {
- epatch "${FILESDIR}/${P}-gentoo.patch"
+ epatch "${FILESDIR}"/${PN}-3.3.1-gentoo.patch
# Set libdir properly
sed -i -e "/CNETPATH/s:local/lib:$(get_libdir):" src/preferences.h || die
+++ /dev/null
---- cnet-2.0.10/Makefile.orig 2006-03-06 20:03:14.000000000 +0100
-+++ cnet-2.0.10/Makefile 2009-01-15 05:51:23.000000000 +0100
-@@ -7,14 +7,14 @@
- # It is presumed that BINDIR and MANDIR exist, so you may need
- # to create them, and set their permissions, if necessary.
- #
--PREFIX = /usr/local
-+PREFIX = /usr/
- #
- BINDIR = $(PREFIX)/bin
--CNETDIR = $(PREFIX)/cnetlib
--MANDIR = $(PREFIX)/man/man1
-+CNETDIR = $(PREFIX)/lib/cnetlib
-+MANDIR = $(PREFIX)/share/man/man1
- MANEXT = 1
- MANFILE = $(MANDIR)/$(NAME).$(MANEXT)
--WEBDIR = /home/httpd/html/cnet
-+WEBDIR = $(CNETDIR)/html
-
- # ---------------------------------------------------------------------
-
---- cnet-2.0.10/src/Makefile.common.orig 2004-05-10 21:26:53.000000000 +0200
-+++ cnet-2.0.10/src/Makefile.common 2009-01-15 05:51:23.000000000 +0100
-@@ -18,7 +18,6 @@
-
- $(NAME): $(OBJ)
- $(LD) $(LDFLAGS) -o $(NAME) $(OBJ) $(LIBDIRS) $(XLIBS) $(LIBS)
-- @$(STRIP) $(NAME)
- @chmod 755 $(NAME)
-
-
---- cnet-2.0.10/src/Makefile.linux.orig 2004-05-10 21:27:19.000000000 +0200
-+++ cnet-2.0.10/src/Makefile.linux 2009-01-15 05:51:23.000000000 +0100
-@@ -26,12 +26,10 @@
-
- # Cannot use the -pedantic option if requiring 'long long' syntax.
- #ANSICC = gcc -ansi -pedantic
--ANSICC = gcc -ansi
-+ANSICC = $(CC) -ansi
- INCLUDES = $(LIBELFINC)
-
--CFLAGS = -O -Wall -fPIC $(INCLUDES) $(XINCLUDES)
--
--LD = gcc -rdynamic
-+LD = $(CC) -rdynamic
- LIBDIRS = -L/usr/X11R6/lib $(XLIBDIRS) $(LIBELFDIR)
- LIBS = -lelf -ldl -lm
- STRIP = strip
+++ /dev/null
---- cnet-3.2.4/Makefile.orig 2012-03-23 11:42:31.000000000 +0400
-+++ cnet-3.2.4/Makefile 2013-08-24 16:37:29.449886061 +0400
-@@ -6,7 +6,7 @@
- # Change 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,7 +16,6 @@
- LIBDIR = $(PREFIX)/lib/cnet
- #
- # WWWDIR defines the directory to hold cnet's web-based documentation
--WWWDIR = /home/httpd/html/cnet
- #WWWDIR = $(HOME)/WWW/cnet
- #
- # ---------------------------------------------------------------------
-@@ -26,15 +26,14 @@
- @ls -l $(NAME) *.a
-
- install:
-- make
-- @mkdir -p $(BINDIR) $(LIBDIR)
-- @chmod 755 $(BINDIR) $(LIBDIR)
-- @cp $(NAME) $(BINDIR)/$(NAME)
-- @chmod 755 $(BINDIR)/$(NAME)
-- @rm -rf $(LIBDIR)/*
-- @cp lib/* *.a $(LIBDIR)
-- @chmod 644 $(LIBDIR)/*
-- @ls -l $(BINDIR)/$(NAME) $(LIBDIR)/*.a
-+ @mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
-+ @chmod 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
-+ @cp $(NAME) $(DESTDIR)$(BINDIR)/$(NAME)
-+ @chmod 755 $(DESTDIR)$(BINDIR)/$(NAME)
-+ @rm -rf $(DESTDIR)$(LIBDIR)/*
-+ @cp lib/* *.a $(DESTDIR)$(LIBDIR)
-+ @chmod 644 $(DESTDIR)$(LIBDIR)/*
-+ @ls -l $(DESTDIR)$(BINDIR)/$(NAME) $(DESTDIR)$(LIBDIR)/*.a
-
- AND = html/CLICK html/KEYBOARD html/STOPANDWAIT html/TICKTOCK
- www:
---- cnet-3.2.4/src/Makefile.linux.orig 2012-03-23 11:42:33.000000000 +0400
-+++ cnet-3.2.4/src/Makefile.linux 2013-08-24 16:25:46.437455826 +0400
-@@ -20,10 +20,10 @@
- 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 -pedantic
-+CFLAGS += -fPIC $(INCLUDES) $(XINCLUDES)
- #
--LD = gcc -rdynamic
-+LD = $(CC) -rdynamic
- LIBDIRS = $(XLIBDIRS)
- LIBS = -lelf -ldl -lm
- STRIP = strip
---- cnet-3.2.4/support/Makefile.common.orig 2014-01-16 13:40:28.364197103 +0400
-+++ cnet-3.2.4/support/Makefile.common 2014-01-16 13:41:00.956198672 +0400
-@@ -1,13 +1,13 @@
- #
- CC = gcc
--CFLAGS = -O -std=c99 -pedantic -Wall -Werror -fPIC
-+CFLAGS += -O -std=c99 -pedantic -fPIC
-
- DOTH = cnetsupport.h
- OBJ = hashtable.o lexical.o md5.o queue.o vector.o
-
- $(NAME): $(OBJ)
-- ar rc $(NAME) $(OBJ)
-- ranlib $(NAME)
-+ $(AR) rc $(NAME) $(OBJ)
-+ $(RANLIB) $(NAME)
- @cp -p $(NAME) ..
-
- %.o : %.c $(DOTH)
--- /dev/null
+--- 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/support/Makefile.common
++++ b/support/Makefile.common
+@@ -1,13 +1,13 @@
+ #
+-CC = gcc
+-CFLAGS = -std=c99 -pedantic -Wall -Werror -O3 -fPIC
++#CC = gcc
++CFLAGS += -std=c99 -pedantic -Wall -fPIC
+
+ DOTH = cnetsupport.h
+ OBJ = hashtable.o haversine.o lexical.o md5.o queue.o vector.o
+
+ $(NAME): $(OBJ)
+- ar rc $(NAME) $(OBJ)
+- ranlib $(NAME)
++ $(AR) rc $(NAME) $(OBJ)
++ $(RANLIB) $(NAME)
+ @cp -p $(NAME) ../lib
+
+ %.o : %.c $(DOTH)
+--- 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);}'\
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>netmon</herd>
-<longdescription>Network simulation tool</longdescription>
</pkgmetadata>
projects / gentoo.git / commitdiff