[pkgsrc/trunk]: pkgsrc/net/ettercap Move hacks to a separate hacks.mk file. ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/219fdbdbbc11
branches:  trunk
changeset: 485551:219fdbdbbc11
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Dec 15 17:13:17 2004 +0000

description:
Move hacks to a separate hacks.mk file.  Remove a section of patch-aa
that was an older workaround to the same GCC/alpha bug that is now
superseded by simply requiring gcc>=3.0.

diffstat:

 net/ettercap/Makefile         |   6 +-----
 net/ettercap/distinfo         |   4 ++--
 net/ettercap/hacks.mk         |  11 +++++++++++
 net/ettercap/patches/patch-aa |  19 +------------------
 4 files changed, 15 insertions(+), 25 deletions(-)

diffs (79 lines):

diff -r 53e8a8bf2c86 -r 219fdbdbbc11 net/ettercap/Makefile
--- a/net/ettercap/Makefile     Wed Dec 15 17:03:58 2004 +0000
+++ b/net/ettercap/Makefile     Wed Dec 15 17:13:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/12/15 16:17:59 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2004/12/15 17:13:17 jlam Exp $
 
 DISTNAME=              ettercap-0.6.b
 PKGREVISION=           2
@@ -26,10 +26,6 @@
 BUILD_DIRS=            ${WRKSRC} ${WRKSRC}/plugins
 INSTALL_DIRS=          ${WRKSRC} ${WRKSRC}/plugins
 
-.if ${MACHINE_ARCH} == "alpha"
-GCC_REQD+=             3.0
-.endif
-
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r 53e8a8bf2c86 -r 219fdbdbbc11 net/ettercap/distinfo
--- a/net/ettercap/distinfo     Wed Dec 15 17:03:58 2004 +0000
+++ b/net/ettercap/distinfo     Wed Dec 15 17:13:17 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2004/12/15 16:17:59 jlam Exp $
+$NetBSD: distinfo,v 1.13 2004/12/15 17:13:17 jlam Exp $
 
 SHA1 (ettercap-0.6.b.tar.gz) = 8cc1bbfe61e894620deef74cff0b8ca5a0b9e628
 Size (ettercap-0.6.b.tar.gz) = 689038 bytes
-SHA1 (patch-aa) = 4096f767a61e96788b7bee33f51948c9006cc665
+SHA1 (patch-aa) = 730e78b97746dc9f4fc4efca99bd3eaf124bf614
 SHA1 (patch-ab) = 107ef5dda9457313d7d939745a6a21dbe2b989ce
 SHA1 (patch-ac) = 6771b96f36fa9439b0edf79e632f0d2f1125eecd
 SHA1 (patch-ad) = c7f997876c5b76fff77f70280f5b5fe523778abf
diff -r 53e8a8bf2c86 -r 219fdbdbbc11 net/ettercap/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ettercap/hacks.mk     Wed Dec 15 17:13:17 2004 +0000
@@ -0,0 +1,11 @@
+# $NetBSD: hacks.mk,v 1.1 2004/12/15 17:13:17 jlam Exp $
+
+### [Wed Dec 15 12:06:48 EST 2004 : jlam]
+### On alpha, GCC-2.95.x gives a compiler error when building
+### src/ec_inet.c and src/ec_logtofile.c.  Simply require GCC>=3.0 to
+### avoid this problem.
+###
+.if ${MACHINE_ARCH} == "alpha"
+PKG_HACKS+=    gcc2-alpha-optimization
+GCC_REQD+=     3.0
+.endif
diff -r 53e8a8bf2c86 -r 219fdbdbbc11 net/ettercap/patches/patch-aa
--- a/net/ettercap/patches/patch-aa     Wed Dec 15 17:03:58 2004 +0000
+++ b/net/ettercap/patches/patch-aa     Wed Dec 15 17:13:17 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2003/02/09 23:15:55 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2004/12/15 17:13:17 jlam Exp $
 
 --- Makefile.in.orig   Wed Jan 22 10:00:38 2003
 +++ Makefile.in        Sun Feb  9 18:09:08 2003
@@ -9,20 +9,3 @@
 +COPTS    = -I. -Isrc/include -I${prefix}/include @COPTS@ @GTK_CFLAGS@
  
  PROG     = @PROG@
-@@ -262,2 +262,16 @@
- 
- # vim:ts=4:noexpandtab
-+
-+COMPILE=$(CC) $(ALLOPT) $(DEFS) -c -o 
-+COMPILE_NOOPT=${COMPILE:C/-O[0-9]*//g}
-+
-+.if (${MACHINE_ARCH} == "alpha")
-+# problem files for compiling with optimization
-+
-+./src/ec_inet.o: ./src/ec_inet.c
-+      ${COMPILE_NOOPT} ./src/ec_inet.o ./src/ec_inet.c
-+
-+./src/ec_logtofile.o: ./src/ec_logtofile.c
-+      ${COMPILE_NOOPT} ./src/ec_logtofile.o ./src/ec_logtofile.c
-+
-+.endif