From d1e0a422ac37f793c1ccaae96e8154e2cc683ccd Mon Sep 17 00:00:00 2001 From: okan Date: Thu, 28 Jan 2010 11:30:39 +0000 Subject: [PATCH] recognize 4.7; ok jasper@ --- sysutils/lsof/Makefile | 4 ++-- sysutils/lsof/patches/patch-Configure | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index a21adc39096..09a3ed9f593 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.67 2009/09/04 01:49:10 sthen Exp $ +# $OpenBSD: Makefile,v 1.68 2010/01/28 11:30:39 okan Exp $ COMMENT= list information about open files VERSION= 4.82 DISTNAME= lsof_${VERSION} -PKGNAME= ${DISTNAME:S/_/-/}p0 +PKGNAME= ${DISTNAME:S/_/-/}p1 CATEGORIES= sysutils MASTER_SITES= ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \ ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/ \ diff --git a/sysutils/lsof/patches/patch-Configure b/sysutils/lsof/patches/patch-Configure index 70f2722452e..411a95547f9 100644 --- a/sysutils/lsof/patches/patch-Configure +++ b/sysutils/lsof/patches/patch-Configure @@ -1,6 +1,6 @@ -$OpenBSD: patch-Configure,v 1.26 2009/06/21 13:24:02 sthen Exp $ +$OpenBSD: patch-Configure,v 1.27 2010/01/28 11:30:39 okan Exp $ --- Configure.orig Wed Mar 25 15:24:01 2009 -+++ Configure Sat Jun 20 20:39:42 2009 ++++ Configure Wed Jan 27 17:52:50 2010 @@ -3694,12 +3694,6 @@ return(0); } LSOF_TSTBIGF=" " LSOF_VERS=2090 @@ -14,7 +14,7 @@ $OpenBSD: patch-Configure,v 1.26 2009/06/21 13:24:02 sthen Exp $ 3.0*) LSOF_TSTBIGF=" " LSOF_VERS=3000 -@@ -3740,16 +3734,44 @@ return(0); } +@@ -3740,16 +3734,48 @@ return(0); } LSOF_TSTBIGF=" " LSOF_VERS=3090 ;; @@ -50,27 +50,31 @@ $OpenBSD: patch-Configure,v 1.26 2009/06/21 13:24:02 sthen Exp $ + LSOF_TSTBIGF=" " + LSOF_VERS=4060 + ;; ++ 4.7*) ++ LSOF_TSTBIGF=" " ++ LSOF_VERS=4070 ++ ;; + 4*) + LSOF_TSTBIGF=" " -+ LSOF_VERS=4060 ++ LSOF_VERS=4070 + echo "!!!WARNING!!! Unsupported OpenBSD 4.x version: $LSOF_VSTR" -+ echo "!!!WARNING!!! Configuring for OpenBSD 4.6" ++ echo "!!!WARNING!!! Configuring for OpenBSD 4.7" + ;; *) echo "Unknown OpenBSD release: $LSOF_VSTR" - echo Assuming OpenBSD 3.9 - LSOF_VERS=3090 -+ echo Assuming OpenBSD 4.6 -+ LSOF_VERS=4060 ++ echo Assuming OpenBSD 4.7 ++ LSOF_VERS=4070 ;; esac # } fi # } -@@ -3757,7 +3779,7 @@ return(0); } +@@ -3757,7 +3783,7 @@ return(0); } # Test for legal OpenBSD version. case $LSOF_VERS in # { - 1020|2050|2060|2070|2080|2090|3000|3010|3020|3030|3040|3050|3060|3070|3080|3090) -+ 1020|2050|2060|2070|2080|2090|3000|3010|3020|3030|3040|3050|3060|3070|3080|3090|4000|4010|4020|4030|4040|4050|4060) ++ 1020|2050|2060|2070|2080|2090|3000|3010|3020|3030|3040|3050|3060|3070|3080|3090|4000|4010|4020|4030|4040|4050|4060|4070) ;; *) echo "Unknown OpenBSD version: $LSOF_VERS"