Please list an http site first in MASTER_SITES, and have the first ftp site be upstream's main site (ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/) so that 'make peek-ftp' goes to the right place.
David Coppa <[email protected]> wrote: > >Hi! > >Update sysutils/lsof to the latest version. >Fix dead MASTER_SITES. >Regen distinfo. >Minor cleanups. > >Works for me on amd64. > >OK? > >Index: Makefile >=================================================================== >RCS file: /cvs/ports/sysutils/lsof/Makefile,v >retrieving revision 1.87 >diff -u -p -u -p -r1.87 Makefile >--- Makefile 11 Mar 2013 11:41:31 -0000 1.87 >+++ Makefile 22 May 2013 07:18:35 -0000 >@@ -2,17 +2,14 @@ > > COMMENT= list information about open files > >-VERSION= 4.83 >+VERSION= 4.87 > DISTNAME= lsof_${VERSION} > PKGNAME= ${DISTNAME:S/_/-/} >-REVISION= 8 > CATEGORIES= sysutils >-MASTER_SITES= >http://www.mirrorservice.org/sites/vic.cc.purdue.edu/pub/tools/unix/lsof/OLD/ >\ >- ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \ >- ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/ \ >- ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/OLD/ \ >+MASTER_SITES= ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ \ >+ ftp://sunsite.ualberta.ca/pub/Mirror/lsof/OLD/ \ > ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/ \ >- >http://www.mirrorservice.org/sites/vic.cc.purdue.edu/pub/tools/unix/lsof/ >+ ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/OLD/ > > HOMEPAGE= http://people.freebsd.org/~abe/ > >@@ -59,6 +56,6 @@ do-install: > ${INSTALL_PROGRAM} ${WRKBUILD}/lsof ${PREFIX}/sbin > ${INSTALL_MAN} ${WRKSRC}/lsof.8 ${PREFIX}/man/man8/lsof.8 > ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${PREFIX}/share/lsof >- @chmod 444 ${PREFIX}/share/lsof/00* >+ @chmod ${SHAREMODE} ${PREFIX}/share/lsof/00* > > .include <bsd.port.mk> >Index: distinfo >=================================================================== >RCS file: /cvs/ports/sysutils/lsof/distinfo,v >retrieving revision 1.17 >diff -u -p -u -p -r1.17 distinfo >--- distinfo 15 Mar 2012 21:36:44 -0000 1.17 >+++ distinfo 22 May 2013 07:18:35 -0000 >@@ -1,5 +1,2 @@ >-MD5 (lsof_4.83.tar.gz) = JDCJzPNnLGSzPsjJ7yoqSA== >-RMD160 (lsof_4.83.tar.gz) = l5spdSvbcAwWsXf60J2EWIchJAU= >-SHA1 (lsof_4.83.tar.gz) = qseRG+kAYkKs21GHEyV4Nk0wFH0= >-SHA256 (lsof_4.83.tar.gz) = >ZTRCEWhCpU1MHHCWqZSUKEWkxRvNDjq6BWete8WiyJk= >-SIZE (lsof_4.83.tar.gz) = 1060158 >+SHA256 (lsof_4.87.tar.gz) = >pxu3xV8R5CALe0wobz8hPSzl2gisbQwAo/JYv6ovByA= >+SIZE (lsof_4.87.tar.gz) = 1084323 >Index: patches/patch-Configure >=================================================================== >RCS file: /cvs/ports/sysutils/lsof/patches/patch-Configure,v >retrieving revision 1.34 >diff -u -p -u -p -r1.34 patch-Configure >--- patches/patch-Configure 15 Mar 2012 21:36:44 -0000 1.34 >+++ patches/patch-Configure 22 May 2013 07:18:35 -0000 >@@ -1,7 +1,7 @@ > $OpenBSD: patch-Configure,v 1.34 2012/03/15 21:36:44 sthen Exp $ >---- Configure.orig Mon Jan 18 19:01:14 2010 >-+++ Configure Tue Jul 19 09:19:48 2011 >-@@ -3787,13 +3787,30 @@ return(0); } >+--- Configure.orig Wed Jan 2 18:13:54 2013 >++++ Configure Tue May 21 18:26:15 2013 >+@@ -3865,13 +3865,30 @@ return(0); } > 3*) > LSOF_TSTBIGF=" " > LSOF_VERS=3090 >@@ -36,7 +36,7 @@ $OpenBSD: patch-Configure,v 1.34 2012/03 > ;; > esac # } > fi # } >-@@ -3801,7 +3818,7 @@ return(0); } >+@@ -3879,7 +3896,7 @@ return(0); } > # Test for legal OpenBSD version. > > case $LSOF_VERS in # { >@@ -45,7 +45,7 @@ $OpenBSD: patch-Configure,v 1.34 2012/03 > ;; > *) > echo "Unknown OpenBSD version: $LSOF_VERS" >-@@ -3863,11 +3880,6 @@ return(0); } >+@@ -3941,11 +3958,6 @@ return(0); } > LSOF_TMP1=1 > fi # } > fi # } >@@ -57,7 +57,7 @@ $OpenBSD: patch-Configure,v 1.34 2012/03 > if test -d ${OPENBSD_SYS}/isofs/cd9660 # { > then > LSOF_CFGF="$LSOF_CFGF -DHAS9660FS=1" >-@@ -4041,6 +4053,18 @@ return(0); } >+@@ -4119,6 +4131,18 @@ return(0); } > if test -r ${LSOF_INCLUDE}/sys/pipe.h # { > then > LSOF_CFGF="$LSOF_CFGF -DHAS_SYS_PIPEH" >Index: patches/patch-dialects_n+obsd_dlsof_h >=================================================================== >RCS file: >/cvs/ports/sysutils/lsof/patches/patch-dialects_n+obsd_dlsof_h,v >retrieving revision 1.4 >diff -u -p -u -p -r1.4 patch-dialects_n+obsd_dlsof_h >--- patches/patch-dialects_n+obsd_dlsof_h 15 Mar 2012 21:39:53 >-0000 1.4 >+++ patches/patch-dialects_n+obsd_dlsof_h 22 May 2013 07:18:35 -0000 >@@ -15,7 +15,7 @@ $OpenBSD: patch-dialects_n+obsd_dlsof_h, > # if defined(OPENBSDV) > -#define _UVM_UVM_FAULT_I_H_ 1 /* avoid OpenBSD's > - /* <uvm/uvm_fault_i.h */ >-+#define _UVM_UVM_FAULT_I_H_ 1 /* avoid OpenBSD's ><uvm/uvm_fault_i.h >*/ >++#define _UVM_UVM_FAULT_I_H_ 1 /* avoid OpenBSD's ><uvm/uvm_fault.h> */ > # endif /* defined(OPENBSDV) */ > #define FALSE 0 > #define TRUE 1 >Index: patches/patch-lsof_8 >=================================================================== >RCS file: /cvs/ports/sysutils/lsof/patches/patch-lsof_8,v >retrieving revision 1.5 >diff -u -p -u -p -r1.5 patch-lsof_8 >--- patches/patch-lsof_8 15 Mar 2012 21:36:44 -0000 1.5 >+++ patches/patch-lsof_8 22 May 2013 07:18:35 -0000 >@@ -1,7 +1,7 @@ > $OpenBSD: patch-lsof_8,v 1.5 2012/03/15 21:36:44 sthen Exp $ >---- lsof.8.orig Sun Jul 3 18:30:18 2011 >-+++ lsof.8 Sun Jul 3 18:30:45 2011 >-@@ -799,7 +799,8 @@ where: >+--- lsof.8.orig Wed Jan 2 18:52:04 2013 >++++ lsof.8 Tue May 21 18:26:15 2013 >+@@ -848,7 +848,8 @@ where: > applies to all IP versions. > .br > \fIprotocol\fP is a protocol name \- \fBTCP\fP, \fBUDP\fP
