some cleanup from new maintainer Okan Demirmen <okan at demirmen.com>

should improve situation on 64bit archs
This commit is contained in:
sturm 2005-01-29 20:15:32 +00:00
parent fa8985db98
commit 16466a62c7
3 changed files with 23 additions and 9 deletions

View File

@ -1,15 +1,17 @@
# $OpenBSD: Makefile,v 1.55 2005/01/25 22:24:01 dhartmei Exp $ # $OpenBSD: Makefile,v 1.56 2005/01/29 20:15:32 sturm Exp $
COMMENT= "scan ports and fingerprint stack of network hosts" COMMENT= "scan ports and fingerprint stack of network hosts"
DISTNAME= nmap-3.75 DISTNAME= nmap-3.75
PKGNAME= ${DISTNAME}p0 PKGNAME= ${DISTNAME}p1
CATEGORIES= net security CATEGORIES= net security
MASTER_SITES= ${HOMEPAGE}dist/ MASTER_SITES= ${HOMEPAGE}dist/
EXTRACT_SUFX= .tgz EXTRACT_SUFX= .tgz
HOMEPAGE= http://www.insecure.org/nmap/ HOMEPAGE= http://www.insecure.org/nmap/
MAINTAINER= Okan Demirmen <okan@demirmen.com>
# GPL # GPL
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
@ -21,9 +23,9 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-libpcap=/usr \ CONFIGURE_ARGS= --with-libpcap=/usr \
--with-libpcre=${LOCALBASE} \ --with-libpcre=${LOCALBASE} \
--with-openssl=/usr --with-openssl=/usr
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/libpcre \ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} \
${WRKSRC}/nsock/src \ ${WRKSRC}/nbase \
${WRKSRC}/libpcap-possiblymodified ${WRKSRC}/nsock/src
FLAVORS= no_x11 FLAVORS= no_x11
FLAVOR?= FLAVOR?=

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.6 2005/01/29 20:15:32 sturm Exp $
--- Makefile.in.orig Sat Jan 29 20:35:39 2005
+++ Makefile.in Sat Jan 29 20:36:12 2005
@@ -18,7 +18,7 @@ CXX = @CXX@
CCOPT =
LIBPCAPDIR = @libpcapdir@
LIBPCREDIR = @LIBPCREDIR@
-INCLS = -I$(LIBPCAPDIR)
+INCLS = -I.
DEFS = @DEFS@ -DNMAP_VERSION=\"$(NMAP_VERSION)\" -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
# For mtrace debugging -- see MTRACE define in main.cc for instructions
# Should only be enabled during debugging and not in any real release.

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libpcap_possiblymodified_pcap_bpf_h,v 1.2 2005/01/25 22:28:31 robert Exp $ $OpenBSD: patch-libpcap_possiblymodified_pcap_bpf_h,v 1.3 2005/01/29 20:15:32 sturm Exp $
--- libpcap-possiblymodified/pcap-bpf.h.orig Tue Jan 25 22:38:15 2005 --- libpcap-possiblymodified/pcap-bpf.h.orig Sun Aug 1 07:34:47 2004
+++ libpcap-possiblymodified/pcap-bpf.h Tue Jan 25 22:39:42 2005 +++ libpcap-possiblymodified/pcap-bpf.h Sat Jan 29 20:35:07 2005
@@ -239,8 +239,9 @@ @@ -239,8 +239,9 @@ struct bpf_version {
* define it as 108 here. If OpenBSD picks up this file, it should * define it as 108 here. If OpenBSD picks up this file, it should
* define DLT_LOOP as 12 in its version, as per the comment above - * define DLT_LOOP as 12 in its version, as per the comment above -
* and should not use 108 as a DLT_ value. * and should not use 108 as a DLT_ value.