diff options
| author | Tom McLaughlin <tmclaugh@FreeBSD.org> | 2010-01-24 23:39:07 +0000 |
|---|---|---|
| committer | Tom McLaughlin <tmclaugh@FreeBSD.org> | 2010-01-24 23:39:07 +0000 |
| commit | 2e70bd30ed58f324a82a38ff3b99d70f488677bf (patch) | |
| tree | c879469cfdd0a2f4ed28146fa9b40084c902d34e | |
| parent | - Add CONFLICT with virtualbox-ose. (diff) | |
Correct pcap.h detection and additionally unbreak on 8.x.
Notes
Notes:
svn path=/head/; revision=248494
| -rw-r--r-- | net/py-pypcap/Makefile | 10 | ||||
| -rw-r--r-- | net/py-pypcap/files/patch-setup.py | 19 |
2 files changed, 21 insertions, 8 deletions
diff --git a/net/py-pypcap/Makefile b/net/py-pypcap/Makefile index 32d75666fd0e..d896011886a0 100644 --- a/net/py-pypcap/Makefile +++ b/net/py-pypcap/Makefile @@ -7,7 +7,7 @@ PORTNAME= pypcap PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net python MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -27,10 +27,4 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/pcap.so post-patch: ${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/pcap.c -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 800074 -BROKEN= does not build -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/py-pypcap/files/patch-setup.py b/net/py-pypcap/files/patch-setup.py new file mode 100644 index 000000000000..a79f84986b3a --- /dev/null +++ b/net/py-pypcap/files/patch-setup.py @@ -0,0 +1,19 @@ +--- setup.py.orig 2005-10-16 19:07:03.000000000 -0400 ++++ setup.py 2010-01-24 18:26:59.356418232 -0500 +@@ -25,7 +25,7 @@ + d = {} + if os.path.exists(os.path.join(cfg['include_dirs'][0], 'pcap-int.h')): + d['HAVE_PCAP_INT_H'] = 1 +- buf = open(os.path.join(cfg['include_dirs'][0], 'pcap.h')).read() ++ buf = open(os.path.join(cfg['include_dirs'][1], 'pcap.h')).read() + if buf.find('pcap_file(') != -1: + d['HAVE_PCAP_FILE'] = 1 + if buf.find('pcap_compile_nopcap(') != -1: +@@ -46,6 +46,7 @@ + incdirs = [ os.path.join(d, sd) ] + if os.path.exists(os.path.join(d, sd, 'pcap.h')): + cfg['include_dirs'] = [ os.path.join(d, sd) ] ++ cfg['include_dirs'].append(os.path.join(d, 'include/pcap')) + for sd in ('lib', ''): + for lib in (('pcap', 'libpcap.a'), + ('pcap', 'libpcap.dylib'), |