From: "Jeroen Roovers (jer)" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/cnet/files: cnet-2.0.10-gentoo.patch
Date: Thu, 15 Jan 2009 05:02:55 +0000 [thread overview]
Message-ID: <E1LNKNb-0003mg-OW@stork.gentoo.org> (raw)
jer 09/01/15 05:02:55
Modified: cnet-2.0.10-gentoo.patch
Log:
New toolchain patch. New strip patch (bug #251974). Unify patches. Clean up ebuild.
(Portage version: 2.2_rc22/cvs/Linux 2.6.25-gentoo-r7-JeR i686)
Revision Changes Path
1.2 net-analyzer/cnet/files/cnet-2.0.10-gentoo.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cnet/files/cnet-2.0.10-gentoo.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cnet/files/cnet-2.0.10-gentoo.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cnet/files/cnet-2.0.10-gentoo.patch?r1=1.1&r2=1.2
Index: cnet-2.0.10-gentoo.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/cnet/files/cnet-2.0.10-gentoo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cnet-2.0.10-gentoo.patch 21 Apr 2006 01:00:59 -0000 1.1
+++ cnet-2.0.10-gentoo.patch 15 Jan 2009 05:02:55 -0000 1.2
@@ -1,6 +1,5 @@
-diff --exclude='*~' -Naur cnet-2.0.10.orig/Makefile cnet-2.0.10/Makefile
---- cnet-2.0.10.orig/Makefile 2006-04-20 21:54:40.000000000 -0300
-+++ cnet-2.0.10/Makefile 2006-04-20 21:54:54.000000000 -0300
+--- 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.
@@ -20,77 +19,30 @@
# ---------------------------------------------------------------------
-diff --exclude='*~' -Naur cnet-2.0.10.orig/Makefile.orig cnet-2.0.10/Makefile.orig
---- cnet-2.0.10.orig/Makefile.orig 1969-12-31 21:00:00.000000000 -0300
-+++ cnet-2.0.10/Makefile.orig 2006-03-06 16:03:14.000000000 -0300
-@@ -0,0 +1,46 @@
-+NAME = cnet
-+VERSION = 2.0.10
-+SHELL = /bin/sh
-+#
-+# Change the following 5 constants to suit your local site.
-+#
-+# It is presumed that BINDIR and MANDIR exist, so you may need
-+# to create them, and set their permissions, if necessary.
-+#
-+PREFIX = /usr/local
-+#
-+BINDIR = $(PREFIX)/bin
-+CNETDIR = $(PREFIX)/cnetlib
-+MANDIR = $(PREFIX)/man/man1
-+MANEXT = 1
-+MANFILE = $(MANDIR)/$(NAME).$(MANEXT)
-+WEBDIR = /home/httpd/html/cnet
-+
-+# ---------------------------------------------------------------------
-+
-+it:
-+ (cd src && make)
-+
-+install:
-+ (cd src && make)
-+ cp $(NAME) $(BINDIR)/$(NAME) && chmod 755 $(BINDIR)/$(NAME)
-+ mkdir -p $(CNETDIR) && chmod 755 $(CNETDIR)
-+ cp cnetlib/* $(CNETDIR) && chmod 644 $(CNETDIR)/*
-+ cp DOC/$(NAME).man $(MANFILE) && chmod 644 $(MANFILE)
-+
-+web:
-+ mkdir -p $(WEBDIR) && chmod 755 $(WEBDIR)
-+ mkdir -p $(WEBDIR)/images && chmod 755 $(WEBDIR)/images
-+ cp DOC/*.* $(WEBDIR)
-+ cp DOC/images/* $(WEBDIR)/images
-+ chmod 644 $(WEBDIR)/*.* $(WEBDIR)/images/*
-+
-+# ---------------------------------------------------------------------
-+
-+clean:
-+ (cd src && make clean)
-+ (cd DOC && make clean)
-+ (cd EXAMPLES && make clean)
-+
-+uninstall:
-+ rm -rf $(BINDIR)/$(NAME) $(MANFILE) $(CNETDIR) $(WEBDIR)
-diff --exclude='*~' -Naur cnet-2.0.10.orig/src/config.h cnet-2.0.10/src/config.h
---- cnet-2.0.10.orig/src/config.h 2006-04-20 21:54:40.000000000 -0300
-+++ cnet-2.0.10/src/config.h 2006-04-20 21:54:55.000000000 -0300
-@@ -169,7 +169,7 @@
- #if defined(USE_FREEBSD)
- #define CNETPATH "/usr/local/share/cnet:/usr/local/include:/usr/local/cnetlib"
- #else
--#define CNETPATH "/usr/local/cnetlib:/usr/lib/cnet:/cslinux/cnetlib"
-+#define CNETPATH "/usr/lib/cnetlib:/usr/lib/cnet:"
- #endif
-
-
-diff --exclude='*~' -Naur cnet-2.0.10.orig/src/Makefile.linux cnet-2.0.10/src/Makefile.linux
---- cnet-2.0.10.orig/src/Makefile.linux 2006-04-20 21:54:40.000000000 -0300
-+++ cnet-2.0.10/src/Makefile.linux 2006-04-20 21:54:55.000000000 -0300
-@@ -29,7 +29,7 @@
- ANSICC = gcc -ansi
+--- 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)
-+CFLAGS = -march=pentium3 -O3 -pipe -fPIC $(INCLUDES) $(XINCLUDES)
-
- LD = gcc -rdynamic
+-
+-LD = gcc -rdynamic
++LD = $(CC) -rdynamic
LIBDIRS = -L/usr/X11R6/lib $(XLIBDIRS) $(LIBELFDIR)
+ LIBS = -lelf -ldl -lm
+ STRIP = strip
reply other threads:[~2009-01-15 5:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1LNKNb-0003mg-OW@stork.gentoo.org \
--to=jer@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox