diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index b68971a73f0..b7cac6211be 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.57 2005/12/20 08:13:46 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.58 2006/05/09 19:13:32 pedro Exp $ COMMENT= "list information about open files" -VERSION= 4.75 +VERSION= 4.77 DISTNAME= lsof_${VERSION} -PKGNAME= ${DISTNAME:S/_/-/}p0 +PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= sysutils MASTER_SITES= ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/ \ ftp://ftp.ayamura.org/pub/lsof/ \ @@ -40,7 +40,7 @@ WRKDIST= ${WRKDIR}/${DISTNAME}/${SRCBALL_NAME} post-extract: @(cd ${WRKDIST}/..; \ - EXPMD5=`/usr/bin/grep MD5 README.${DISTNAME} | \ + EXPMD5=`/usr/bin/grep "MD5 (" README.${DISTNAME} | \ /usr/bin/sed 's/^[ ]*//'` ; \ CALCMD5=`md5 ${SRCBALL_NAME}.tar` ; \ if [ "$${EXPMD5}"X != "$${CALCMD5}"X ]; then \ diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo index 479567ee7f4..ba41ffe5564 100644 --- a/sysutils/lsof/distinfo +++ b/sysutils/lsof/distinfo @@ -1,4 +1,4 @@ -MD5 (lsof_4.75.tar.gz) = ec4e62f1e70aaac52b58bdacf0cc9c05 -RMD160 (lsof_4.75.tar.gz) = 0b12aa6b98841026475b2bd219389f32d17de63e -SHA1 (lsof_4.75.tar.gz) = 714390a7bad628b7a746a79557ee16236663bc04 -SIZE (lsof_4.75.tar.gz) = 978144 +MD5 (lsof_4.77.tar.gz) = 02660e6df90ee9473dc38d1145af2a9a +RMD160 (lsof_4.77.tar.gz) = ff0302711bddc0f86ea5dc87e4533e45f2330c2a +SHA1 (lsof_4.77.tar.gz) = 4a237b74775c2367f3f453d78734ff38324caa2c +SIZE (lsof_4.77.tar.gz) = 983541 diff --git a/sysutils/lsof/patches/patch-Configure b/sysutils/lsof/patches/patch-Configure deleted file mode 100644 index 482df4c2fa0..00000000000 --- a/sysutils/lsof/patches/patch-Configure +++ /dev/null @@ -1,37 +0,0 @@ -$OpenBSD: patch-Configure,v 1.19 2005/12/20 08:13:46 pvalchev Exp $ ---- Configure.orig Mon May 16 19:06:05 2005 -+++ Configure Mon Dec 19 23:57:01 2005 -@@ -3357,16 +3357,20 @@ return(0); } - LSOF_TSTBIGF=" " - LSOF_VERS=3070 - ;; -+ 3.8*) -+ LSOF_TSTBIGF=" " -+ LSOF_VERS=3080 -+ ;; - 3*) - LSOF_TSTBIGF=" " -- LSOF_VERS=3070 -+ LSOF_VERS=3080 - echo "!!!WARNING!!! Unsupported OpenBSD 3.x version: $LSOF_VSTR" -- echo "!!!WARNING!!! Configuring for OpenBSD 3.7" -+ echo "!!!WARNING!!! Configuring for OpenBSD 3.8" - ;; - *) - echo "Unknown OpenBSD release: $LSOF_VSTR" -- echo Assuming OpenBSD 3.7 -- LSOF_VERS=3070 -+ echo Assuming OpenBSD 3.8 -+ LSOF_VERS=3080 - ;; - esac # } - fi # } -@@ -3374,7 +3378,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) -+ 1020|2050|2060|2070|2080|2090|3000|3010|3020|3030|3040|3050|3060|3070|3080) - ;; - *) - echo "Unknown OpenBSD version: $LSOF_VERS" diff --git a/sysutils/lsof/patches/patch-dialects_n+obsd_dnode_c b/sysutils/lsof/patches/patch-dialects_n+obsd_dnode_c deleted file mode 100644 index 24b3fe3cea9..00000000000 --- a/sysutils/lsof/patches/patch-dialects_n+obsd_dnode_c +++ /dev/null @@ -1,49 +0,0 @@ -$OpenBSD: patch-dialects_n+obsd_dnode_c,v 1.7 2005/12/20 08:13:46 pvalchev Exp $ ---- dialects/n+obsd/dnode.c.orig Thu Dec 30 11:42:30 2004 -+++ dialects/n+obsd/dnode.c Mon Dec 19 23:56:13 2005 -@@ -563,12 +563,12 @@ process_overlaid_node: - nty = EXT2NODE; - - # if defined(HASI_E2FS_PTR) -- if (i.i_din.e2fs_din -- && !kread((KA_T)i.i_din.e2fs_din, (char *)&ed, sizeof(ed))) -+ if (i.dinode_u.e2fs_din -+ && !kread((KA_T)i.dinode_u.e2fs_din, (char *)&ed, sizeof(ed))) - edp = &ed; - # else /* !defined(HASI_E2FS_PTR) */ - # if HASEXT2FS<2 -- edp = &i.i_din.e2fs_din; -+ edp = &i.dinode_u.e2fs_din; - # else /* HASEXT2FS>=2 */ - edp = &i.i_e2din; - # endif /* HASEXT2FS>=2 */ -@@ -588,16 +588,16 @@ process_overlaid_node: - && !kread((KA_T)i.i_ump, (char *)&um, sizeof(um))) { - if (um.um_fstype == UFS1) { - ffs = 1; -- if (i.i_din.ffs1_din -- && !kread((KA_T)i.i_din.ffs1_din, (char *)&u1, -+ if (i.dinode_u.ffs1_din -+ && !kread((KA_T)i.dinode_u.ffs1_din, (char *)&u1, - sizeof(u1))) - { - u1s = 1; - } - } else if (um.um_fstype == UFS2) { - ffs = 2; -- if (i.i_din.ffs2_din -- && !kread((KA_T)i.i_din.ffs2_din, (char *)&u2, -+ if (i.dinode_u.ffs2_din -+ && !kread((KA_T)i.dinode_u.ffs2_din, (char *)&u2, - sizeof(u2))) - { - u2s = 1; -@@ -719,7 +719,7 @@ process_overlaid_node: - } - # else /* !defined(HASI_E2FS_PTR) */ - # if HASEXT2FS<2 -- rdev = i.i_din.e2fs_din.e2di_rdev; -+ rdev = i.dinode_u.e2fs_din.e2di_rdev; - # else /* HASEXT2FS>=2 */ - rdev = i.i_e2din.e2di_rdev; - # endif /* HASEXT2FS>=2 */