  
  	case "$1" in bsdpan-*) return 3 ;; esac
  
-@@ -666,8 +680,11 @@
+@@ -666,8 +681,11 @@
  	o)	REPLACE_ORIGIN=oopt ;;
  	p)	fail 'The -p option has been deprecated' ;;
  	r)	PM_URB=ropt

 				fi
 				unset port_ver
 				continue
@@ -1364,10 +1455,18 @@
 
 			unset port_ver
 

 
 	# Tell safe_exit that we are done
 	pm_unlink ${DI_FILES}-e
@@ -1203,25 +1259,45 @@
 }
 
 ports_by_category () {
