| 1 |
commit: 31c407d603b0071d7db3965b68405e34ff19761d |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 4 09:47:54 2017 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 4 09:47:54 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31c407d6 |
| 7 |
|
| 8 |
net-analyzer/cnet: Version bump. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
net-analyzer/cnet/Manifest | 1 + |
| 13 |
net-analyzer/cnet/cnet-3.3.4.ebuild | 56 +++++++++ |
| 14 |
net-analyzer/cnet/files/cnet-3.3.4-gentoo.patch | 161 ++++++++++++++++++++++++ |
| 15 |
3 files changed, 218 insertions(+) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest |
| 18 |
index 9a8ae67..17bb933 100644 |
| 19 |
--- a/net-analyzer/cnet/Manifest |
| 20 |
+++ b/net-analyzer/cnet/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
DIST cnet-3.3.1.tgz 2684531 SHA256 244091f3254534850d58675e2826962757f5aed2dc43ed567c520db43664df4e SHA512 9b86a077d48086036fbcfa86ba202b49610e1e1eac55fd3076b24a7ca622a6fc9b34156477bcb25af15d06cf0813f12a7b3f4cb21f1eeb00fd2e010610797ce8 WHIRLPOOL 6af1eab1819572c2b480ceca5b0315fcb5fdd087592945c2c59d34b7fd7b0848eecbcc29c8d11b82c895bd686bcd86f3fcaa68efa3b1da84271e6b68dc2a0543 |
| 23 |
+DIST cnet-3.3.4.tgz 2687235 SHA256 0d694de4c81c08ef960b21c925f7de81ee56979bb97164311e2a16b41abf00af SHA512 51457541d1023e49bdad4df3502c51d11ea6d62e3e6ae857becfb60229626ba777226b2b42d313d95b982b2790c6b1f80b39e344d9d4bcd4c38ccc31b055d8f9 WHIRLPOOL 23362f4fbd771e9084d67f06ef52942ccc3d0976b089507e2fa95cbd247a18a1f90716fa53ffd4cd4d6c99a3281c4250c2d78268540f682ed72cc96c340e43f9 |
| 24 |
|
| 25 |
diff --git a/net-analyzer/cnet/cnet-3.3.4.ebuild b/net-analyzer/cnet/cnet-3.3.4.ebuild |
| 26 |
new file mode 100644 |
| 27 |
index 00000000..4424f3c |
| 28 |
--- /dev/null |
| 29 |
+++ b/net-analyzer/cnet/cnet-3.3.4.ebuild |
| 30 |
@@ -0,0 +1,56 @@ |
| 31 |
+# Copyright 1999-2017 Gentoo Foundation |
| 32 |
+# Distributed under the terms of the GNU General Public License v2 |
| 33 |
+# $Id$ |
| 34 |
+ |
| 35 |
+EAPI=6 |
| 36 |
+inherit eutils multilib toolchain-funcs |
| 37 |
+ |
| 38 |
+DESCRIPTION="Network simulation tool" |
| 39 |
+HOMEPAGE="http://www.csse.uwa.edu.au/cnet3/" |
| 40 |
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz" |
| 41 |
+ |
| 42 |
+LICENSE="GPL-2" |
| 43 |
+SLOT="0" |
| 44 |
+KEYWORDS="~amd64 ~x86" |
| 45 |
+IUSE="examples" |
| 46 |
+ |
| 47 |
+RDEPEND=" |
| 48 |
+ >=dev-lang/tk-8.5 |
| 49 |
+ dev-libs/elfutils |
| 50 |
+ x11-libs/libX11 |
| 51 |
+" |
| 52 |
+DEPEND=" |
| 53 |
+ ${RDEPEND} |
| 54 |
+" |
| 55 |
+ |
| 56 |
+DOCS=( |
| 57 |
+ 1st.README |
| 58 |
+) |
| 59 |
+PATCHES=( |
| 60 |
+ "${FILESDIR}"/${PN}-3.3.4-gentoo.patch |
| 61 |
+ "${FILESDIR}"/${PN}-3.3.1-tcl.patch |
| 62 |
+) |
| 63 |
+ |
| 64 |
+src_prepare() { |
| 65 |
+ # Set libdir properly |
| 66 |
+ sed -i -e "/CNETPATH/s:local/lib:$(get_libdir):" src/preferences.h || die |
| 67 |
+ sed -i -e "/^LIBDIR/s:lib:$(get_libdir):" Makefile || die |
| 68 |
+ |
| 69 |
+ default |
| 70 |
+} |
| 71 |
+ |
| 72 |
+src_compile() { |
| 73 |
+ emake \ |
| 74 |
+ CC="$(tc-getCC)" \ |
| 75 |
+ C99="$(tc-getCC) -std=c99" \ |
| 76 |
+ AR="$(tc-getAR)" \ |
| 77 |
+ RANLIB="$(tc-getRANLIB)" |
| 78 |
+} |
| 79 |
+ |
| 80 |
+src_install() { |
| 81 |
+ default |
| 82 |
+ |
| 83 |
+ if use examples; then |
| 84 |
+ dodoc -r examples |
| 85 |
+ fi |
| 86 |
+} |
| 87 |
|
| 88 |
diff --git a/net-analyzer/cnet/files/cnet-3.3.4-gentoo.patch b/net-analyzer/cnet/files/cnet-3.3.4-gentoo.patch |
| 89 |
new file mode 100644 |
| 90 |
index 00000000..b68b6d1 |
| 91 |
--- /dev/null |
| 92 |
+++ b/net-analyzer/cnet/files/cnet-3.3.4-gentoo.patch |
| 93 |
@@ -0,0 +1,161 @@ |
| 94 |
+--- a/Makefile |
| 95 |
++++ b/Makefile |
| 96 |
+@@ -6,7 +6,7 @@ |
| 97 |
+ # Comment/uncomment the following 4 constants to suit your system: |
| 98 |
+ # |
| 99 |
+ # PREFIX defines the directory below which cnet will be installed. |
| 100 |
+-PREFIX = /usr/local |
| 101 |
++PREFIX = /usr |
| 102 |
+ #PREFIX = $(HOME) |
| 103 |
+ # |
| 104 |
+ # BINDIR defines the directory where the cnet binary will be installed. |
| 105 |
+@@ -16,26 +16,24 @@ |
| 106 |
+ LIBDIR = $(PREFIX)/lib64/cnet |
| 107 |
+ # |
| 108 |
+ # WWWDIR defines the directory to hold cnet's web-based documentation |
| 109 |
+-WWWDIR = /home/httpd/html/cnet |
| 110 |
++#WWWDIR = /home/httpd/html/cnet |
| 111 |
+ #WWWDIR = $(HOME)/WWW/cnet |
| 112 |
+ # |
| 113 |
+ # --------------------------------------------------------------------- |
| 114 |
+ # |
| 115 |
+ it: |
| 116 |
+- make -C src |
| 117 |
+- make -C support |
| 118 |
++ $(MAKE) -C src |
| 119 |
++ $(MAKE) -C support |
| 120 |
+ @ls -l bin/$(NAME) lib/*.a |
| 121 |
+ |
| 122 |
+ install: |
| 123 |
+- make |
| 124 |
+- @mkdir -p $(BINDIR) $(LIBDIR) |
| 125 |
+- @chmod 755 $(BINDIR) $(LIBDIR) |
| 126 |
+- @cp bin/$(NAME) $(BINDIR)/$(NAME) |
| 127 |
+- @chmod 755 $(BINDIR)/$(NAME) |
| 128 |
+- @rm -rf $(LIBDIR)/* |
| 129 |
+- @cp lib/* $(LIBDIR) |
| 130 |
+- @chmod 644 $(LIBDIR)/* |
| 131 |
+- @ls -l $(BINDIR)/$(NAME) $(LIBDIR)/*.a |
| 132 |
++ @mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) |
| 133 |
++ @chmod 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) |
| 134 |
++ @cp bin/$(NAME) $(DESTDIR)$(BINDIR)/$(NAME) |
| 135 |
++ @chmod 755 $(DESTDIR)$(BINDIR)/$(NAME) |
| 136 |
++ @rm -rf $(DESTDIR)$(LIBDIR)/* |
| 137 |
++ @cp lib/* $(DESTDIR)$(LIBDIR) |
| 138 |
++ @chmod 644 $(DESTDIR)$(LIBDIR)/* |
| 139 |
+ |
| 140 |
+ AND = html/CLICK html/KEYBOARD html/STOPANDWAIT html/TICKTOCK |
| 141 |
+ www: |
| 142 |
+--- a/src/Makefile.linux |
| 143 |
++++ b/src/Makefile.linux |
| 144 |
+@@ -5,7 +5,7 @@ |
| 145 |
+ # binutils 2.5.2, and |
| 146 |
+ # libelf (0.6.4 onwards) |
| 147 |
+ # |
| 148 |
+-WARNINGS = -Wall -Werror -Wshadow -Wpointer-arith -Wcast-qual \ |
| 149 |
++WARNINGS = -Wall -Wshadow -Wpointer-arith -Wcast-qual \ |
| 150 |
+ -Wcast-align -Wwrite-strings -Wconversion \ |
| 151 |
+ -Wstrict-prototypes -Wredundant-decls -Winline \ |
| 152 |
+ -Wcomments -Wtrigraphs -Wimport -Wundef |
| 153 |
+@@ -20,8 +20,8 @@ |
| 154 |
+ XINCLUDES = -I/usr/include/tcl8.5 |
| 155 |
+ XLIBS = -ltcl8.5 -ltk8.5 -lX11 |
| 156 |
+ # |
| 157 |
+-C99 = gcc -std=c99 -Wall -Werror -pedantic |
| 158 |
+-CFLAGS = -O3 -fPIC $(INCLUDES) $(XINCLUDES) |
| 159 |
++C99 = $(CC) -std=c99 -Wall -pedantic |
| 160 |
++CFLAGS += -fPIC $(INCLUDES) $(XINCLUDES) |
| 161 |
+ # |
| 162 |
+ LD = gcc -rdynamic |
| 163 |
+ LIBDIRS = $(XLIBDIRS) |
| 164 |
+--- a/support/Makefile |
| 165 |
++++ b/support/Makefile |
| 166 |
+@@ -7,21 +7,21 @@ |
| 167 |
+ |
| 168 |
+ it: |
| 169 |
+ @if uname -s -r | grep -q "Linux" ; then \ |
| 170 |
+- make -f Makefile.linux ; fi |
| 171 |
++ $(MAKE) -f Makefile.linux ; fi |
| 172 |
+ @if uname -s -r | grep -q "Darwin" ; then \ |
| 173 |
+- make -f Makefile.macosx ; fi |
| 174 |
++ $(MAKE) -f Makefile.macosx ; fi |
| 175 |
+ @if uname -s -r | grep -q "SunOS 4" ; then \ |
| 176 |
+- make -f Makefile.sunos ; fi |
| 177 |
++ $(MAKE) -f Makefile.sunos ; fi |
| 178 |
+ @if uname -s -r | grep -q "SunOS 5" ; then \ |
| 179 |
+- make -f Makefile.solaris ; fi |
| 180 |
++ $(MAKE) -f Makefile.solaris ; fi |
| 181 |
+ @if uname -s -r | grep -q "OSF1" ; then \ |
| 182 |
+- make -f Makefile.osf1 ; fi |
| 183 |
++ $(MAKE) -f Makefile.osf1 ; fi |
| 184 |
+ @if uname -s -r | grep -q "IRIX" ; then \ |
| 185 |
+- make -f Makefile.irix5 ; fi |
| 186 |
++ $(MAKE) -f Makefile.irix5 ; fi |
| 187 |
+ @if uname -s -r | grep -q "FreeBSD" ; then \ |
| 188 |
+- make -f Makefile.freebsd ; fi |
| 189 |
++ $(MAKE) -f Makefile.freebsd ; fi |
| 190 |
+ @if uname -s -r | grep -q "NetBSD" ; then \ |
| 191 |
+- make -f Makefile.netbsd ; fi |
| 192 |
++ $(MAKE) -f Makefile.netbsd ; fi |
| 193 |
+ @cp -p cnetsupport.h ../lib |
| 194 |
+ |
| 195 |
+ # --------------------------------------------------------------------- |
| 196 |
+--- a/src/Makefile |
| 197 |
++++ b/src/Makefile |
| 198 |
+@@ -8,21 +8,21 @@ |
| 199 |
+ |
| 200 |
+ it: |
| 201 |
+ @if uname -s -r | grep -q "Linux" ; then \ |
| 202 |
+- make -f Makefile.linux $(NAME) ; fi |
| 203 |
++ $(MAKE) -f Makefile.linux $(NAME) ; fi |
| 204 |
+ @if uname -s -r | grep -q "Darwin" ; then \ |
| 205 |
+- make -f Makefile.macosx $(NAME) ; fi |
| 206 |
++ $(MAKE) -f Makefile.macosx $(NAME) ; fi |
| 207 |
+ @if uname -s -r | grep -q "SunOS 4" ; then \ |
| 208 |
+- make -f Makefile.sunos $(NAME) ; fi |
| 209 |
++ $(MAKE) -f Makefile.sunos $(NAME) ; fi |
| 210 |
+ @if uname -s -r | grep -q "SunOS 5" ; then \ |
| 211 |
+- make -f Makefile.solaris $(NAME) ; fi |
| 212 |
++ $(MAKE) -f Makefile.solaris $(NAME) ; fi |
| 213 |
+ @if uname -s -r | grep -q "OSF1" ; then \ |
| 214 |
+- make -f Makefile.osf1 $(NAME) ; fi |
| 215 |
++ $(MAKE) -f Makefile.osf1 $(NAME) ; fi |
| 216 |
+ @if uname -s -r | grep -q "IRIX" ; then \ |
| 217 |
+- make -f Makefile.irix5 $(NAME) ; fi |
| 218 |
++ $(MAKE) -f Makefile.irix5 $(NAME) ; fi |
| 219 |
+ @if uname -s -r | grep -q "FreeBSD" ; then \ |
| 220 |
+- make -f Makefile.freebsd $(NAME) ; fi |
| 221 |
++ $(MAKE) -f Makefile.freebsd $(NAME) ; fi |
| 222 |
+ @if uname -s -r | grep -q "NetBSD" ; then \ |
| 223 |
+- make -f Makefile.netbsd $(NAME) ; fi |
| 224 |
++ $(MAKE) -f Makefile.netbsd $(NAME) ; fi |
| 225 |
+ @cp -p $(NAME) ../bin |
| 226 |
+ @cp -p cnet.h ../lib |
| 227 |
+ |
| 228 |
+@@ -33,7 +33,7 @@ |
| 229 |
+ @rm -rf HTML GPATH GRTAGS GSYMS GTAGS |
| 230 |
+ |
| 231 |
+ hide: |
| 232 |
+- make clean |
| 233 |
++ $(MAKE) clean |
| 234 |
+ echo '#if HIDE_GLOBAL_NAMES' > hidenames.h |
| 235 |
+ sort < HIDENAMES | \ |
| 236 |
+ awk '{ if($$0 !~ /#/) printf("#define\t%-36s\t__CN%03d\n", $$0,++n);}'\ |
| 237 |
+--- a/support/Makefile.common |
| 238 |
++++ b/support/Makefile.common |
| 239 |
+@@ -1,13 +1,12 @@ |
| 240 |
+ # |
| 241 |
+-C99 = gcc -std=c99 -Wall -Werror -pedantic -O3 -fPIC |
| 242 |
+ |
| 243 |
+ DOTH = cnetsupport.h |
| 244 |
+ OBJ = hashtable.o haversine.o lexical.o md5.o queue.o vector.o |
| 245 |
+ |
| 246 |
+ $(NAME): $(OBJ) |
| 247 |
+ @echo linking $(NAME) |
| 248 |
+- @ar rc $(NAME) $(OBJ) |
| 249 |
+- @ranlib $(NAME) |
| 250 |
++ $(AR) rc $(NAME) $(OBJ) |
| 251 |
++ $(RANLIB) $(NAME) |
| 252 |
+ @cp -p $(NAME) ../lib |
| 253 |
+ |
| 254 |
+ %.o : %.c $(DOTH) |
Archives