Annotation of pkgsrc/sysutils/lsof/patches/patch-ad, revision 1.3
1.3 ! atatat 1: $NetBSD$
1.1 atatat 2:
1.3 ! atatat 3: --- Configure.orig 2003-03-23 14:28:10.000000000 -0500
! 4: +++ Configure
! 5: @@ -169,9 +169,9 @@ then
! 6: LSOF_VSTR=""
! 7: fi # }
! 8:
! 9: -# Make sure the help file is removed before an abnormal exit.
! 10: +# Make sure temporary files are removed before an abnormal exit.
! 11:
! 12: -trap 'rm -f $LSOF_HLP ${LSOF_TMPC_BASE}*; exit 1' 1 2 3 15
! 13: +trap 'rm -f ${LSOF_HLP_BASE}* ${LSOF_TMPC_BASE}*; exit 1' 1 2 3 15
! 14:
! 15: rm -f $LSOF_HLP
! 16: cat > $LSOF_HLP << LSOF_HLP
! 17: @@ -230,11 +230,11 @@ do
! 18: echo "(cd ${LSOF_TSTSUBD}; make spotless)"
! 19: (cd ${LSOF_TSTSUBD}; make spotless)
! 20: else
! 21: - echo '(cd ${LSOF_TSTSUBD); rm *.o config.*)'
! 22: + echo '(cd ${LSOF_TSTSUBD}; rm *.o config.*)'
! 23: (cd ${LSOF_TSTSUBD}; rm *.o config.*)
! 24: fi # }
! 25: - rm -f $LSOF_F $LSOF_HLP $LSOF_MKFC ${LSOF_TMPC_BASE}*
! 26: - echo rm -f $LSOF_F $LSOF_HLP $LSOF_MKFC ${LSOF_TMPC_BASE}*
! 27: + rm -f $LSOF_F $LSOF_MKFC ${LSOF_TMPC_BASE}*
! 28: + echo rm -f $LSOF_F $LSOF_MKFC ${LSOF_TMPC_BASE}*
! 29: rm -rf AFSHeaders AFSVersion version.h
! 30: echo "rm -rf AFSHeaders AFSVersion version.h"
! 31: rm -f ${LSOF_HLP_BASE}* cd9660_node.h
! 32: @@ -2212,15 +2212,21 @@ kernel generation process.
! 33: if test $? -eq 0 # {
! 34: then
! 35: LSOF_CFGF="$LSOF_CFGF -DHASI_FFS"
! 36: + else
! 37: + grep -q i_ffs1_size ${LSOF_INCLUDE}/ufs/ufs/inode.h
! 38: + if test $? -eq 0 # {
! 39: + then
! 40: + LSOF_CFGF="$LSOF_CFGF -DHASI_FFS1"
! 41: + fi #}
! 42: fi # }
! 43: grep -q VT_EXT2FS ${LSOF_INCLUDE}/sys/vnode.h
! 44: if test $? -eq 0 # {
! 45: then
! 46: LSOF_CFGF="$LSOF_CFGF -DHASEXT2FS"
! 47: - grep -q i_e2fs_size ${LSOF_INCLUDE}/ufs/ufs/inode.h
! 48: + grep -q "*e2fs_din" ${LSOF_INCLUDE}/ufs/ufs/inode.h
! 49: if test $? -eq 0 # {
! 50: then
! 51: - LSOF_CFGF="$LSOF_CFGF -DHASI_E2FS"
! 52: + LSOF_CFGF="$LSOF_CFGF -DHASI_E2FS_PTR"
! 53: fi # }
! 54: fi # }
! 55: if test -r ${LSOF_INCLUDE}/nfs/nfsnode.h # {
! 56: @@ -2272,7 +2278,7 @@ kernel generation process.
! 57: if test -r ${LSOF_INCLUDE}/sys/mount.h # {
! 58: then
! 59:
! 60: - # Build the netexport.h header file for NetBSD from <sys/mount.h>.
! 61: + # Build the netexport.h header file for NetBSD.
! 62:
! 63: LSOF_TMP1=${LSOF_TMPC}.edscr
! 64: LSOF_TMP2=${LSOF_TMPC}.netcred
! 65: @@ -2447,23 +2453,10 @@ kernel generation process.
! 66: # If the OpenBSD version isn't pre-defined, determine it.
! 67:
! 68: case $LSOF_VSTR in # {
! 69: - 1.2*)
! 70: + 1*)
! 71: LSOF_VERS=1020
! 72: - ;;
! 73: - 2.0*)
! 74: - LSOF_VERS=2000
! 75: - ;;
! 76: - 2.1*)
! 77: - LSOF_VERS=2010
! 78: - ;;
! 79: - 2.2*)
! 80: - LSOF_VERS=2020
! 81: - ;;
! 82: - 2.3*)
! 83: - LSOF_VERS=2030
! 84: - ;;
! 85: - 2.4*)
! 86: - LSOF_VERS=2040
! 87: + echo "!!!WARNING!!! Unsupported OpenBSD 1.x version: $LSOF_VSTR"
! 88: + echo "!!!WARNING!!! Configuring for OpenBSD 1.2"
! 89: ;;
! 90: 2.5*)
! 91: LSOF_VERS=2050
! 92: @@ -2483,6 +2476,12 @@ kernel generation process.
! 93: LSOF_TSTBIGF=" "
! 94: LSOF_VERS=2090
! 95: ;;
! 96: + 2*)
! 97: + LSOF_TSTBIGF=" "
! 98: + LSOF_VERS=2090
! 99: + echo "!!!WARNING!!! Unsupported OpenBSD 2.x version: $LSOF_VSTR"
! 100: + echo "!!!WARNING!!! Configuring for OpenBSD 2.9"
! 101: + ;;
! 102: 3.0*)
! 103: LSOF_TSTBIGF=" "
! 104: LSOF_VERS=3000
! 105: @@ -2495,15 +2494,20 @@ kernel generation process.
! 106: LSOF_TSTBIGF=" "
! 107: LSOF_VERS=3020
! 108: ;;
! 109: + 3.3*)
! 110: + LSOF_TSTBIGF=" "
! 111: + LSOF_VERS=3030
! 112: + ;;
! 113: 3*)
! 114: - LSOF_VERS=3010
! 115: - echo "!!!WARNING!!! Unsupported OpenBSD version: $LSOF_VSTR"
! 116: - echo "!!!WARNING!!! Configuring for OpenBSD 3.1"
! 117: + LSOF_TSTBIGF=" "
! 118: + LSOF_VERS=3020
! 119: + echo "!!!WARNING!!! Unsupported OpenBSD 3.x version: $LSOF_VSTR"
! 120: + echo "!!!WARNING!!! Configuring for OpenBSD 3.2"
! 121: ;;
! 122: *)
! 123: echo "Unknown OpenBSD release: $LSOF_VSTR"
! 124: - echo Assuming OpenBSD 1.2
! 125: - LSOF_VERS=1020
! 126: + echo Assuming OpenBSD 3.2
! 127: + LSOF_VERS=3020
! 128: ;;
! 129: esac # }
! 130: fi # }
! 131: @@ -2511,7 +2515,7 @@ kernel generation process.
! 132: # Test for legal OpenBSD version.
! 133:
! 134: case $LSOF_VERS in # {
! 135: - 1020|2000|2010|2020|2030|2040|2050|2060|2070|2080|2090|3000|3010|3020)
! 136: + 1020|2050|2060|2070|2080|2090|3000|3010|3020|3030)
! 137: ;;
! 138: *)
! 139: echo "Unknown OpenBSD version: $LSOF_VERS"
! 140: @@ -2597,6 +2601,11 @@ kernel generation process.
! 141: if test $? -eq 0 # {
! 142: then
! 143: LSOF_CFGF="$LSOF_CFGF -DHASEXT2FS"
! 144: + grep -q "*e2fs_din" ${LSOF_INCLUDE}/ufs/ufs/inode.h
! 145: + if test $? -eq 0 # {
! 146: + then
! 147: + LSOF_CFGF="$LSOF_CFGF -DHASI_E2FS_PTR"
! 148: + fi # }
! 149: fi # }
! 150: grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h
! 151: if test $? -eq 0 # {
CVSweb <webmaster@jp.NetBSD.org>