Tue Jun 29 07:41:26 2010 UTC ()
Add workaround for strance detection of yacc&lex.
It expected that ${YACC} and ${LEX} point to its name, not full path.


(obache)
diff -r1.48 -r1.49 pkgsrc/net/wireshark/Makefile
cvs diff -r1.48 -r1.49 pkgsrc/net/wireshark/Makefile (expand / switch to unified diff)

--- pkgsrc/net/wireshark/Makefile 2010/06/27 11:20:18 1.48
+++ pkgsrc/net/wireshark/Makefile 2010/06/29 07:41:26 1.49
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.48 2010/06/27 11:20:18 obache Exp $ 1# $NetBSD: Makefile,v 1.49 2010/06/29 07:41:26 obache Exp $
2 2
3DISTNAME= wireshark-1.2.9 3DISTNAME= wireshark-1.2.9
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://www.wireshark.org/download/src/ \ 6MASTER_SITES= http://www.wireshark.org/download/src/ \
7 ${MASTER_SITE_SOURCEFORGE:=wireshark/} 7 ${MASTER_SITE_SOURCEFORGE:=wireshark/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10OWNER= tron@NetBSD.org 10OWNER= tron@NetBSD.org
11HOMEPAGE= http://www.wireshark.org/ 11HOMEPAGE= http://www.wireshark.org/
12COMMENT= Network protocol analyzer 12COMMENT= Network protocol analyzer
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -20,26 +20,28 @@ USE_LANGUAGES= c c++ @@ -20,26 +20,28 @@ USE_LANGUAGES= c c++
20USE_TOOLS+= gmake perl pkg-config yacc lex 20USE_TOOLS+= gmake perl pkg-config yacc lex
21 21
22USE_LIBTOOL= YES 22USE_LIBTOOL= YES
23SHLIBTOOL_OVERRIDE= # empty 23SHLIBTOOL_OVERRIDE= # empty
24CHECK_PORTABILITY_SKIP+= packaging/macosx/*/* 24CHECK_PORTABILITY_SKIP+= packaging/macosx/*/*
25 25
26GNU_CONFIGURE= YES 26GNU_CONFIGURE= YES
27CONFIGURE_ARGS+= --enable-static=no 27CONFIGURE_ARGS+= --enable-static=no
28CONFIGURE_ARGS+= --enable-threads 28CONFIGURE_ARGS+= --enable-threads
29CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 29CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
30CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} 30CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap}
31CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 31CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
32CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} 32CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre}
 33CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc}
 34CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex}
33 35
34PTHREAD_OPTS+= require 36PTHREAD_OPTS+= require
35 37
36.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
37.include "options.mk" 39.include "options.mk"
38 40
39.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*) 41.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*)
40USE_BUILTIN.libpcap= no 42USE_BUILTIN.libpcap= no
41.endif 43.endif
42 44
43# wireshark no longer builds with NetBSD 3.x provided zlib 45# wireshark no longer builds with NetBSD 3.x provided zlib
44BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1 46BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1
45 47